FIXED: Filter commands located in filter directories local to the source

document where not being found. Reported here
http://groups.google.com/group/asciidoc/browse_thread/thread/1b445ca971174666
by Svenn Are Bjerkem.

1 files changed, 10 insertions, 6 deletions

diff --git a/asciidoc.py b/asciidoc.py
index 6489d83..57753c4 100755
--- a/asciidoc.py
+++ b/asciidoc.py
@@ -679,13 +679,17 @@ def filter_lines(filter_cmd, lines, attrs={}):
     if not os.path.dirname(cmd):
         # Filter command has no directory path so search filter directories.
         filtername = attrs.get('style')
-        if USER_DIR:
-            found = findfilter(filtername, USER_DIR, cmd)
+        d = document.attributes.get('docdir')
+        if d:
+            found = findfilter(filtername, d, cmd)
         if not found:
-            if localapp():
-                found = findfilter(filtername, APP_DIR, cmd)
-            else:
-                found = findfilter(filtername, CONF_DIR, cmd)
+            if USER_DIR:
+                found = findfilter(filtername, USER_DIR, cmd)
+            if not found:
+                if localapp():
+                    found = findfilter(filtername, APP_DIR, cmd)
+                else:
+                    found = findfilter(filtername, CONF_DIR, cmd)
     else:
         if os.path.isfile(cmd):
             found = cmd