Introduced SRFI-3[45] conditions; cleaned up `evaluator.scm'.

* src/guile/skribilo/condition.scm: New.

* src/guile/skribilo/Makefile.am (dist_guilemodule_DATA): Added
  `condition.scm'.

* src/guile/skribilo/evaluator.scm (skribe-eval): Renamed to
  `evaluate-document'.
  (skribe-eval-port): Renamed to `evaluate-document-from-port'.
  (skribe-load-options): Renamed to `*load-options*', a fluid.
  (skribe-load): Renamed to `load-document'.  Use SRFI-34 `raise' when a
  file is not found.
  (skribe-include): Renamed to `include-document'.  Use `raise'.

* src/guile/skribilo/utils/compat.scm (%skribe-known-files): New.
  (skribe-load): New.
  (skribe-include): New.
  (skribe-load-options): New.
  (skribe-eval): New.
  (skribe-eval-port): New.

* src/skribilo.in: Invoke `call-with-skribilo-error-catch'.  Added a
  copyright notice.

* src/guile/skribilo.scm (doskribe): Use `evaluate-document-from-port',
  not `skribe-eval-port'.

* configure.ac: Look for `(srfi srfi-35)'.

* AUTHORS: Mention that most of the code comes from the STkLos
  implementation.

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

1 files changed, 36 insertions, 0 deletions

diff --git a/src/guile/skribilo/utils/compat.scm b/src/guile/skribilo/utils/compat.scm
index d9a63d6..b6e6420 100644
--- a/src/guile/skribilo/utils/compat.scm
+++ b/src/guile/skribilo/utils/compat.scm
@@ -20,10 +20,23 @@
 
 
 (define-module (skribilo utils compat)
+  :use-module (skribilo utils syntax)
   :use-module (skribilo parameters)
+  :use-module (skribilo evaluator)
   :use-module (srfi srfi-1)
+  :use-module (ice-9 optargs)
   :replace (gensym))
 
+;;; Author:  Ludovic Courtès
+;;;
+;;; Commentary:
+;;;
+;;; This module defines symbols for compatibility with Skribe 1.2.
+;;;
+;;; Code:
+
+(fluid-set! current-reader %skribilo-module-reader)
+
 
 ;;;
 ;;; gensym
@@ -90,6 +103,29 @@
 
 
 ;;;
+;;; Evaluator.
+;;;
+
+(define %skribe-known-files
+  ;; Like of Skribe package files and their equivalent Skribilo module.
+  '(("web-book.skr" . (skribilo packages web-book))))
+
+(define*-public (skribe-load file :rest args)
+  (let ((mod (assoc-ref %skribe-known-files file)))
+    (if mod
+	(set-module-uses! (current-module)
+			  (cons mod (module-uses (current-module))))
+	(apply load-document file args))))
+
+(define-public skribe-include      include-document)
+(define-public skribe-load-options *load-options*)
+
+(define-public skribe-eval         evaluate-document)
+(define-public skribe-eval-port    evaluate-document-from-port)
+
+
+
+;;;
 ;;; Compatibility with Bigloo.
 ;;;