about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtes2006-11-03 13:39:21 +0000
committerLudovic Courtes2006-11-03 13:39:21 +0000
commitcce35418258e91134b2dea729a65a76c9f431640 (patch)
tree61c47a497d7fc42b07164472586d700b23d63a7c
parent856e8c5498a765c650dbc0ae6a519d2f11f3636a (diff)
downloadskribilo-cce35418258e91134b2dea729a65a76c9f431640.tar.gz
skribilo-cce35418258e91134b2dea729a65a76c9f431640.tar.lz
skribilo-cce35418258e91134b2dea729a65a76c9f431640.zip
(skribilo documentation manual): Use `evaluate-document' instead of `skribe-eval'.
* doc/modules/skribilo/documentation/manual.scm: Use `(skribilo
  evaluator)' and use `evaluate-document' instead of `skribe-eval'.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--engine-classes--1.2--patch-3
-rw-r--r--doc/modules/skribilo/documentation/manual.scm25
1 files changed, 13 insertions, 12 deletions
diff --git a/doc/modules/skribilo/documentation/manual.scm b/doc/modules/skribilo/documentation/manual.scm
index 23ae61b..97501d8 100644
--- a/doc/modules/skribilo/documentation/manual.scm
+++ b/doc/modules/skribilo/documentation/manual.scm
@@ -26,6 +26,7 @@
   :use-module (skribilo lib) ;; `define-markup'
   :use-module (skribilo resolve)
   :use-module (skribilo output)
+  :use-module (skribilo evaluator)
   :use-module (skribilo utils keywords)
   :use-module (skribilo utils syntax) ;; `when'
 
@@ -58,13 +59,13 @@
 		 (let ((ident (markup-ident n))
 		       (number (markup-option n :number))
 		       (legend (markup-option n :legend)))
-		    (skribe-eval (mark ident) e)
-		    (skribe-eval (center
-				  (markup-body n)
-				  (if number
-				      (bold (format #f "Ex. ~a: " number)))
-				  legend)
-				 e)))))
+		    (evaluate-document (mark ident) e)
+		    (evaluate-document
+                     (center (markup-body n)
+                             (if number
+                                 (bold (format #f "Ex. ~a: " number)))
+                             legend)
+                     e)))))
 
 ;*---------------------------------------------------------------------*/
 ;*    html-browsing-extra ...                                          */
@@ -289,19 +290,19 @@
 		     (pref (eq? (engine-custom e 'index-page-ref) #t))
 		     (loc (ast-loc n))
 		     ;; FIXME: Since we don't support
-		     ;; `:&skribe-eval-location', we could set up a
-		     ;; `parameterize' thing around `skribe-eval' to provide
+		     ;; `:&evaluate-document-location', we could set up a
+		     ;; `parameterize' thing around `evaluate-document' to provide
 		     ;; it with the right location information.
 		     (t (cond
 			   ((null? ie)
 			    "")
 			   ((or (not (integer? nc)) (= nc 1))
-			    (table :width 100. ;;:&skribe-eval-location loc
+			    (table :width 100. ;;:&evaluate-document-location loc
 			       (make-column ie pref)))
 			   (else
-			    (table :width 100. ;;:&skribe-eval-location loc
+			    (table :width 100. ;;:&evaluate-document-location loc
 			       (make-sub-tables ie nc pref))))))
-		 (output (skribe-eval t e) e))))
+		 (evaluate-document t e))))
 
 ;*---------------------------------------------------------------------*/
 ;*    compiler-command ...                                             */