From 6e9dcc724e8a882d309075c0fd13f148112480a7 Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Fri, 3 Nov 2006 14:21:03 +0000
Subject: Small fixes here and there.

* src/guile/skribilo/output.scm (out): Use `engine-filter' rather than
  `slot-ref'.

* src/guile/skribilo/package/eq.scm (eq): When using an external
  renderer, instantiate its class and pass it to `output' (used to pass
  the class itself to `output').

* src/guile/skribilo/package/slide.scm: Autoload `utils keywords'.

* src/guile/skribilo/verify.scm: Cleaned up dependency list.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--engine-classes--1.2--patch-9
---
 src/guile/skribilo/output.scm        |  5 +++--
 src/guile/skribilo/package/eq.scm    |  4 +++-
 src/guile/skribilo/package/slide.scm |  2 ++
 src/guile/skribilo/verify.scm        | 13 ++++++++-----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/guile/skribilo/output.scm b/src/guile/skribilo/output.scm
index 27906ec..a056c55 100644
--- a/src/guile/skribilo/output.scm
+++ b/src/guile/skribilo/output.scm
@@ -21,9 +21,10 @@
 
 
 (define-module (skribilo output)
-  :autoload   (skribilo engine) (engine-ident processor-get-engine)
   :autoload   (skribilo writer) (writer? writer-ident lookup-markup-writer)
   :autoload   (skribilo location) (location?)
+  :autoload   (skribilo engine) (engine-class engine-ident engine-filter)
+
   :use-module (skribilo ast)
   :use-module (skribilo debug)
   :use-module (skribilo utils syntax)
@@ -146,7 +147,7 @@
 
 
 (define-method (out (node <string>) e)
-  (let ((f (slot-ref e 'filter)))
+  (let ((f (engine-filter e)))
     (if (procedure? f)
 	(display (f node))
 	(display node))))
diff --git a/src/guile/skribilo/package/eq.scm b/src/guile/skribilo/package/eq.scm
index eec84d6..e09dec6 100644
--- a/src/guile/skribilo/package/eq.scm
+++ b/src/guile/skribilo/package/eq.scm
@@ -276,7 +276,9 @@ a symbol representing the mathematical operator denoted by @var{m} (e.g.,
 			 (let ((lout-code
 				(with-output-to-string
 				  (lambda ()
-				    (output node (lookup-engine-class 'lout))))))
+				    (output node
+                                            (make-engine
+                                             (lookup-engine-class 'lout)))))))
 			   (output (lout-illustration
 				    :ident (markup-ident node)
 				    lout-code)
diff --git a/src/guile/skribilo/package/slide.scm b/src/guile/skribilo/package/slide.scm
index e25e222..68d2ba6 100644
--- a/src/guile/skribilo/package/slide.scm
+++ b/src/guile/skribilo/package/slide.scm
@@ -30,6 +30,8 @@
   :use-module (skribilo evaluator) ;; `*load-options*'
   :use-module (skribilo package base)
 
+  :autoload   (skribilo utils keywords) (the-options the-body)
+
   :use-module (srfi srfi-1)
   :use-module (ice-9 optargs))
 
diff --git a/src/guile/skribilo/verify.scm b/src/guile/skribilo/verify.scm
index 6b67156..60ef519 100644
--- a/src/guile/skribilo/verify.scm
+++ b/src/guile/skribilo/verify.scm
@@ -20,16 +20,19 @@
 ;;; USA.
 
 (define-module (skribilo verify)
-  :autoload (skribilo engine) (engine-ident processor-get-engine)
+  :autoload (skribilo engine) (engine-ident engine-class processor-get-engine)
   :autoload (skribilo writer) (writer? writer-options lookup-markup-writer)
   :autoload (skribilo lib)    (skribe-warning/ast skribe-warning
 			       skribe-error)
+
+  :use-module (skribilo debug)
+  :use-module (skribilo ast)
+  :use-module (oop goops)
+
+  :use-module (skribilo utils syntax)
+
   :export (verify))
 
-(use-modules (skribilo debug)
-	     (skribilo ast)
-	     (skribilo utils syntax)
-	     (oop goops))
 
 (fluid-set! current-reader %skribilo-module-reader)
 
-- 
cgit v1.2.3