summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès2009-03-05 00:44:18 +0100
committerLudovic Courtès2009-03-05 00:44:18 +0100
commit744b6b673e0d946fe9c8a56f8d948891f89e79f2 (patch)
tree6c35a35e4af87b9587c029bb6f101072f7a67541
parentd4c65f804a72192ab27d276f2ac52ee7ae7a7751 (diff)
downloadskribilo-744b6b673e0d946fe9c8a56f8d948891f89e79f2.tar.gz
skribilo-744b6b673e0d946fe9c8a56f8d948891f89e79f2.tar.lz
skribilo-744b6b673e0d946fe9c8a56f8d948891f89e79f2.zip
Remove circular dependency between `writer' and `output'.
* src/guile/skribilo/writer.scm (markup-writer): Don't explicitly depend
  on `output' since this creates a circular dependency.
-rw-r--r--src/guile/skribilo/writer.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/guile/skribilo/writer.scm b/src/guile/skribilo/writer.scm
index c57f3a8..2c2233c 100644
--- a/src/guile/skribilo/writer.scm
+++ b/src/guile/skribilo/writer.scm
@@ -34,7 +34,6 @@
   :use-module (srfi srfi-35)
   :use-module (skribilo condition)
   :use-module (skribilo debug)
-  :use-module (skribilo output)
   :use-module (skribilo ast)
 
   :use-module (oop goops)
@@ -162,7 +161,9 @@
       (else
        (let ((m  (make-writer-predicate markup predicate class))
 	     (ac (if (eq? action 'unspecified)
-		     (lambda (n e) (output (markup-body n) e))
+		     (lambda (n e)
+                       ((@ (skribilo output) output)
+                        (markup-body n) e))
 		     action)))
 	 (engine-add-writer! e markup m predicate
 			     options before ac after class validate))))))