Fixed `ref' and bibliography-related things.

* src/guile/skribilo.scm (main): Handle `--warning'.

* src/guile/skribilo/biblio.scm: Export `skribe-open-bib-file' and
  `parse-bib'.
  (parse-bib): Use `%default-reader'.

* src/guile/skribilo/evaluator.scm (%evaluate): Cleaned up.
  (skribe-eval-port): Likewise.

* src/guile/skribilo/module.scm (load-file-with-read): Removed.
  (load-skribilo-file): Removed.
  (load-skribilo-modules): Removed.

* src/guile/skribilo/package/slide.scm (ref): Temporarily commented out.

* src/guile/skribilo/skribe/bib.scm: Use `(skribilo biblio)'.

git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-15

1 files changed, 4 insertions, 6 deletions

diff --git a/src/guile/skribilo/evaluator.scm b/src/guile/skribilo/evaluator.scm
index 73f7db0..e4ef208 100644
--- a/src/guile/skribilo/evaluator.scm
+++ b/src/guile/skribilo/evaluator.scm
@@ -55,15 +55,15 @@
 ;;;
 (define (%evaluate expr)
   (let ((result (eval expr (current-module))))
-    (if (or (ast? result) (markup? result))
+
+    (if (ast? result)
 	(let ((file (source-property expr 'filename))
 	      (line (source-property expr 'line))
 	      (column (source-property expr 'column)))
-; 	  (format #t "~%* source props for `~a': ~a~%"
-; 		  result (source-properties expr))
 	  (slot-set! result 'loc
 		     (make <location>
 		       :file file :line line :pos column))))
+
     result))
 
 
@@ -93,9 +93,7 @@
      (let ((e (if (symbol? engine) (find-engine engine) engine)))
        (debug-item "e=" e)
        (if (not (engine? e))
-	   (begin
-	     (format #t "engine: ~a~%" e)
-	     (skribe-error 'skribe-eval-port "cannot find engine" engine))
+	   (skribe-error 'skribe-eval-port "cannot find engine" engine)
 	   (let loop ((exp (reader port)))
 	     (with-debug 10 'skribe-eval-port
 		(debug-item "exp=" exp))