Image- and compat-related fixes.

* src/guile/skribilo/utils/images.scm: Autoload `parameters' on
  `*verbose*' too.

* src/guile/skribilo/lib.scm (skribe-read): Moved to...

* src/guile/skribilo/utils/compat.scm: ... here.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-48

3 files changed, 11 insertions, 15 deletions

diff --git a/src/guile/skribilo/lib.scm b/src/guile/skribilo/lib.scm
index e6d0264..f08a36e 100644
--- a/src/guile/skribilo/lib.scm
+++ b/src/guile/skribilo/lib.scm
@@ -26,7 +26,6 @@
            skribe-type-error
            skribe-warning skribe-warning/ast
            skribe-message
-	   skribe-read
 
 	   %procedure-arity)
 
@@ -248,16 +247,7 @@
 	(Loop (cdr l))))))
 
 
-;;;
-;;; Various things.
-;;;
-
-
-(define* (skribe-read #:optional (port (current-input-port)))
-  (%skribe-reader port))
-
 (define (%procedure-arity proc)
-    (car (procedure-property proc 'arity)))
-
+  (car (procedure-property proc 'arity)))
 
 ;;; lib.scm ends here
diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm
index d4a4367..24ce784 100644
--- a/src/guile/skribilo/utils/compat.scm
+++ b/src/guile/skribilo/utils/compat.scm
@@ -31,8 +31,9 @@
   :use-module (ice-9 optargs)
   :autoload   (skribilo ast) (ast?)
   :autoload   (skribilo condition) (file-search-error? &file-search-error)
+  :autoload   (skribilo reader) (make-reader)
   :use-module (skribilo debug)
-  :re-export (file-size)
+  :re-export (file-size)  ;; re-exported from `(skribilo utils files)'
   :replace (gensym))
 
 ;;; Author:  Ludovic Courtès
@@ -167,6 +168,13 @@
 (define-public skribe-eval         evaluate-document)
 (define-public skribe-eval-port    evaluate-document-from-port)
 
+(set! %skribe-reader #f)
+(define* (skribe-read #:optional (port (current-input-port)))
+  (if (not %skribe-reader)
+      (set! %skribe-reader (make-reader 'skribe)))
+  (%skribe-reader port))
+
+
 
 ;;;
 ;;; Debugging facilities.
@@ -265,6 +273,4 @@
 (define (date)
   (s19:date->string (s19:current-date) "~c"))
 
-
-
 ;;; compat.scm ends here
diff --git a/src/guile/skribilo/utils/images.scm b/src/guile/skribilo/utils/images.scm
index f65d036..2d163bc 100644
--- a/src/guile/skribilo/utils/images.scm
+++ b/src/guile/skribilo/utils/images.scm
@@ -24,7 +24,7 @@
 	   *fig-convert-program* *bitmap-convert-program*)
 
   :autoload (skribilo utils files) (file-suffix file-prefix)
-  :autoload (skribilo parameters)  (*image-path*)
+  :autoload (skribilo parameters)  (*image-path* *verbose*)
   :autoload   (skribilo condition) (&file-search-error)
   :autoload   (srfi srfi-34) (raise)
   :use-module (srfi srfi-35)