Have `*document-reader*' default to `#f'.

* src/guile/skribilo/biblio.scm (parse-bib): Use `*document-reader*',
  not `%default-reader'.

* src/guile/skribilo/reader.scm (%default-reader): Remove.  This removes
  a cyclic dependency between `(skribilo reader)' and `(skribilo reader
  skribe)'.
  (*document-reader*): Default to `#f'.

* src/guile/skribilo/utils/compat.scm (%skribe-reader): Define, not
  `set!'.

* src/guile/skribilo/utils/syntax.scm (%skribe-reader): Remove.  This
  removes the dependency on `(skribilo reader)'.

4 files changed, 10 insertions, 16 deletions

diff --git a/src/guile/skribilo/biblio.scm b/src/guile/skribilo/biblio.scm
index 0f5cfce..c5cdc83 100644
--- a/src/guile/skribilo/biblio.scm
+++ b/src/guile/skribilo/biblio.scm
@@ -1,8 +1,8 @@
 ;;; biblio.scm  --  Bibliography functions.
 ;;;
+;;; Copyright 2005, 2006, 2007, 2009  Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright 2001, 2002, 2003, 2004  Manuel Serrano
 ;;; Copyright 2003, 2004  Erick Gallesio - I3S-CNRS/ESSI <eg@essi.fr>
-;;; Copyright 2005, 2006, 2007  Ludovic Courtès <ludovic.courtes@laas.fr>
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
   :use-module (srfi srfi-39)
   :use-module (skribilo condition)
 
-  :autoload   (skribilo reader)       (%default-reader)
+  :autoload   (skribilo reader)       (*document-reader*)
   :autoload   (skribilo parameters)   (*bib-path*)
   :autoload   (skribilo ast)          (<markup> <handle> is-markup?)
   :autoload   (skribilo lib)          (skribe-warning)
@@ -195,7 +195,7 @@
 ;;;
 
 (define (parse-bib table port)
-  (let ((read %default-reader)) ;; FIXME: We should use a fluid
+  (let ((read (*document-reader*)))
     (if (not (bib-table? table))
         (raise (condition
                 (&invalid-argument-error (proc-name "parse-bib")
diff --git a/src/guile/skribilo/reader.scm b/src/guile/skribilo/reader.scm
index d9abd1f..6bdb274 100644
--- a/src/guile/skribilo/reader.scm
+++ b/src/guile/skribilo/reader.scm
@@ -1,6 +1,6 @@
 ;;; reader.scm  --  Skribilo's front-end (aka. reader) interface.
 ;;;
-;;; Copyright 2005  Ludovic Courtès <ludovic.courtes@laas.fr>
+;;; Copyright 2005, 2009  Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
   :autoload   (srfi srfi-34) (raise)
   :use-module (srfi srfi-35)
   :export (%make-reader lookup-reader make-reader
-	   %default-reader *document-reader*
+	   *document-reader*
 
 	   &reader-search-error reader-search-error?
 	   reader-search-error:reader)
@@ -95,12 +95,10 @@ raised."
          (make (reader:make spec)))
     (make)))
 
-(define %default-reader (make-reader 'skribe))
-
 
 ;;; Current document reader.
 
-(define *document-reader* (make-parameter %default-reader))
+(define *document-reader* (make-parameter #f))
 
 
 ;;; reader.scm ends here
diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm
index 8af3240..df84904 100644
--- a/src/guile/skribilo/utils/compat.scm
+++ b/src/guile/skribilo/utils/compat.scm
@@ -1,6 +1,6 @@
 ;;; compat.scm  --  Skribe compatibility module.
 ;;;
-;;; Copyright 2005, 2006, 2007  Ludovic Courtès  <ludovic.courtes@laas.fr>
+;;; Copyright 2005, 2006, 2007, 2009  Ludovic Courtès  <ludo@gnu.org>
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -185,7 +185,7 @@
 (define-public skribe-eval         evaluate-document)
 (define-public skribe-eval-port    evaluate-document-from-port)
 
-(set! %skribe-reader #f)
+(define %skribe-reader #f)
 (define*-public (skribe-read #:optional (port (current-input-port)))
   (if (not %skribe-reader)
       (set! %skribe-reader (make-reader 'skribe)))
diff --git a/src/guile/skribilo/utils/syntax.scm b/src/guile/skribilo/utils/syntax.scm
index 3c58fb8..b905871 100644
--- a/src/guile/skribilo/utils/syntax.scm
+++ b/src/guile/skribilo/utils/syntax.scm
@@ -1,6 +1,6 @@
 ;;; syntax.scm  --  Syntactic candy for Skribilo modules.
 ;;;
-;;; Copyright 2005, 2006, 2007, 2008  Ludovic Courtès <ludo@gnu.org>
+;;; Copyright 2005, 2006, 2007, 2008, 2009  Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -19,11 +19,10 @@
 ;;; USA.
 
 (define-module (skribilo utils syntax)
-  :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 (%skribilo-module-reader
            _ N_)
   :export-syntax (unwind-protect unless when))
 
@@ -59,9 +58,6 @@
              (list 'reader/record-positions)
              '())))
 
-(define %skribe-reader
-  ;; The Skribe syntax reader.
-  (make-reader 'skribe))
 
 
 (define-macro (unwind-protect expr1 expr2)