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, 28 insertions, 1 deletions

diff --git a/src/skribilo.in b/src/skribilo.in
index 4b77c5e..952784a 100755
--- a/src/skribilo.in
+++ b/src/skribilo.in
@@ -1,7 +1,34 @@
 #!/bin/sh
+
+# Copyright 2005,2006  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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+
 # The `skribilo' executable.
 
 main='(module-ref (resolve-module '\''(skribilo)) '\'main')'
 exec ${GUILE-@GUILE@} --debug \
-                      -c "(catch #t (lambda () (apply $main (cdr (command-line)))) (lambda (key . args) (format (current-error-port) \"exception \`~a' raised~%\" key) (exit 1)))" "$@"
+                      -c "
+(use-modules (skribilo condition))
+(catch #t (lambda ()
+            (call-with-skribilo-error-catch
+	      (lambda ()
+	        (apply $main (cdr (command-line))))))
+	  (lambda (key . args)
+	    (format (current-error-port) \"exception \`~a' raised~%\" key)
+	    (exit 1)))"  "$@"