Merge from lcourtes@laas.fr--2004-libre

Patches applied:

 * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2  (patch 17-24)

   - Merge from lcourtes@laas.fr--2005-mobile
   - Cleaned up the use of a Skribe-compatible `gensym'.
   - Cleaning the compatibility module and other annoyances.
   - Syntax highlighting and `image'-related fixes.
   - Made compatible with the new `current-reader' as a fluid.

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

16 files changed, 62 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index be46ac3..da22457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,44 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2006-01-14 12:33:12 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-21
+
+    Summary:
+      Merge from lcourtes@laas.fr--2004-libre
+    Revision:
+      skribilo--devel--1.2--patch-21
+
+    Patches applied:
+    
+     * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2  (patch 17-24)
+    
+       - Merge from lcourtes@laas.fr--2005-mobile
+       - Cleaned up the use of a Skribe-compatible `gensym'.
+       - Cleaning the compatibility module and other annoyances.
+       - Syntax highlighting and `image'-related fixes.
+       - Made compatible with the new `current-reader' as a fluid.
+
+    modified files:
+     ChangeLog src/guile/skribilo.scm src/guile/skribilo/ast.scm
+     src/guile/skribilo/biblio.scm src/guile/skribilo/debug.scm
+     src/guile/skribilo/engine.scm src/guile/skribilo/evaluator.scm
+     src/guile/skribilo/lib.scm src/guile/skribilo/location.scm
+     src/guile/skribilo/module.scm src/guile/skribilo/output.scm
+     src/guile/skribilo/resolve.scm src/guile/skribilo/source.scm
+     src/guile/skribilo/utils/syntax.scm
+     src/guile/skribilo/verify.scm src/guile/skribilo/writer.scm
+
+    new patches:
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-17
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-18
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-19
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-20
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-21
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-22
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-23
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-24
+
+
 2006-01-10 23:40:38 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-20
 
     Summary:
diff --git a/src/guile/skribilo.scm b/src/guile/skribilo.scm
index bf849ab..be914fb 100644
--- a/src/guile/skribilo.scm
+++ b/src/guile/skribilo.scm
@@ -51,7 +51,7 @@ exec ${GUILE-guile} --debug -l $0 -c "(apply $main (cdr (command-line)))" "$@"
 
 
 ;; Install the Skribilo module syntax reader.
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 (if (not (keyword? :kw))
     (error "guile-reader sucks"))
diff --git a/src/guile/skribilo/ast.scm b/src/guile/skribilo/ast.scm
index b1c9a14..ab56442 100644
--- a/src/guile/skribilo/ast.scm
+++ b/src/guile/skribilo/ast.scm
@@ -55,7 +55,7 @@
 ;;;
 ;;; Code:
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 (define *node-table* (make-hash-table))
 					; Used to stores the nodes of  an AST.
diff --git a/src/guile/skribilo/biblio.scm b/src/guile/skribilo/biblio.scm
index cbb9202..2ea35bc 100644
--- a/src/guile/skribilo/biblio.scm
+++ b/src/guile/skribilo/biblio.scm
@@ -32,7 +32,7 @@
 	   bib-add! bib-duplicate
 	   skribe-open-bib-file parse-bib))
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 ;; FIXME: Should be a fluid?
diff --git a/src/guile/skribilo/debug.scm b/src/guile/skribilo/debug.scm
index 953997e..1cac749 100644
--- a/src/guile/skribilo/debug.scm
+++ b/src/guile/skribilo/debug.scm
@@ -26,7 +26,7 @@
   :use-module (skribilo utils syntax)
   :use-module (srfi srfi-17))
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 ;;; FIXME: Use SRFI-39 fluids.
diff --git a/src/guile/skribilo/engine.scm b/src/guile/skribilo/engine.scm
index 1c36e52..7c1348b 100644
--- a/src/guile/skribilo/engine.scm
+++ b/src/guile/skribilo/engine.scm
@@ -44,7 +44,7 @@
 	   push-default-engine pop-default-engine))
 
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 ;;;
diff --git a/src/guile/skribilo/evaluator.scm b/src/guile/skribilo/evaluator.scm
index 5af52aa..c1b378d 100644
--- a/src/guile/skribilo/evaluator.scm
+++ b/src/guile/skribilo/evaluator.scm
@@ -44,7 +44,7 @@
 	     (srfi srfi-1))
 
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 (define *skribe-loaded* '())		;; List of already loaded files
diff --git a/src/guile/skribilo/lib.scm b/src/guile/skribilo/lib.scm
index fc00896..e6d0264 100644
--- a/src/guile/skribilo/lib.scm
+++ b/src/guile/skribilo/lib.scm
@@ -48,7 +48,7 @@
   :use-module (ice-9 optargs))
 
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 ;;;
diff --git a/src/guile/skribilo/location.scm b/src/guile/skribilo/location.scm
index 516d8ad..c663605 100644
--- a/src/guile/skribilo/location.scm
+++ b/src/guile/skribilo/location.scm
@@ -33,7 +33,7 @@
 ;;;
 ;;; Code:
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 ;;;
diff --git a/src/guile/skribilo/module.scm b/src/guile/skribilo/module.scm
index 34641c9..3ec0e7f 100644
--- a/src/guile/skribilo/module.scm
+++ b/src/guile/skribilo/module.scm
@@ -21,12 +21,11 @@
 (define-module (skribilo module)
   :autoload   (skribilo reader) (make-reader)
   :use-module (skribilo debug)
-  :use-module (system reader confinement) ;; `set-current-reader'
   :use-module (srfi srfi-1)
   :use-module (ice-9 optargs)
   :use-module (skribilo utils syntax))
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 ;;; Author:  Ludovic Courtès
 ;;;
@@ -92,7 +91,6 @@
   `(begin
      (define-module ,name
        :use-module ((skribilo reader) :select (%default-reader))
-       :use-module (system reader confinement)
        :use-module (srfi srfi-1)
        ,@(append-map (lambda (mod)
 		       (list :autoload (car mod) (cdr mod)))
@@ -112,9 +110,10 @@
 				%skribe-core-modules)))
 
      ;; Change the current reader to a Skribe-compatible reader.  If this
-     ;; primitive is not provided by Guile, it should be provided by the
-     ;; `confinement' module (version 0.2 and later).
-     (set-current-reader %default-reader)))
+     ;; primitive is not provided by Guile (i.e., version <= 1.7.2), then it
+     ;; should be provided by `guile-reader' (version >= 0.3) as a core
+     ;; binding and installed by `(skribilo utils syntax)'.
+     (fluid-set! current-reader %default-reader)))
 
 
 ;; Make it available to the top-level module.
diff --git a/src/guile/skribilo/output.scm b/src/guile/skribilo/output.scm
index 28e99a8..6920056 100644
--- a/src/guile/skribilo/output.scm
+++ b/src/guile/skribilo/output.scm
@@ -30,7 +30,7 @@
   :use-module (skribilo utils syntax)
   :use-module (oop goops))
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 (define-generic out)
diff --git a/src/guile/skribilo/resolve.scm b/src/guile/skribilo/resolve.scm
index 9ddbc32..c100b62 100644
--- a/src/guile/skribilo/resolve.scm
+++ b/src/guile/skribilo/resolve.scm
@@ -31,7 +31,7 @@
   :export (resolve! resolve-search-parent resolve-children resolve-children*
 	   find1 resolve-counter resolve-parent resolve-ident))
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 (define *unresolved* (make-parameter #f))
diff --git a/src/guile/skribilo/source.scm b/src/guile/skribilo/source.scm
index 75e886e..3eb7d65 100644
--- a/src/guile/skribilo/source.scm
+++ b/src/guile/skribilo/source.scm
@@ -30,7 +30,7 @@
   :use-module (ice-9 rdelim))
 
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 ;;;
diff --git a/src/guile/skribilo/utils/syntax.scm b/src/guile/skribilo/utils/syntax.scm
index 24e8efa..f7a5990 100644
--- a/src/guile/skribilo/utils/syntax.scm
+++ b/src/guile/skribilo/utils/syntax.scm
@@ -19,11 +19,12 @@
 ;;; USA.
 
 (define-module (skribilo utils syntax)
-  #:use-module (skribilo reader)
-  #:use-module (system reader library)
-  #:use-module (system reader confinement)
-  #:export (%skribe-reader %skribilo-module-reader)
-  #:export-syntax (unwind-protect unless when))
+  :use-module (skribilo reader)
+  :use-module (system reader library)
+  :use-module (system reader compat) ;; make sure `current-reader' exists
+  :use-module (system reader confinement)
+  :export (%skribe-reader %skribilo-module-reader)
+  :export-syntax (unwind-protect unless when))
 
 ;;; Author:  Ludovic Courtès
 ;;;
diff --git a/src/guile/skribilo/verify.scm b/src/guile/skribilo/verify.scm
index f407c87..960ca6b 100644
--- a/src/guile/skribilo/verify.scm
+++ b/src/guile/skribilo/verify.scm
@@ -32,7 +32,7 @@
 	     (skribilo utils syntax)
 	     (oop goops))
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)
 
 
 
diff --git a/src/guile/skribilo/writer.scm b/src/guile/skribilo/writer.scm
index db36509..fe7781c 100644
--- a/src/guile/skribilo/writer.scm
+++ b/src/guile/skribilo/writer.scm
@@ -45,7 +45,7 @@
 	     (ice-9 optargs))
 
 
-(set-current-reader %skribilo-module-reader)
+(fluid-set! current-reader %skribilo-module-reader)