Merge from skribilo@sv.gnu.org--2006

Patches applied:

 * lcourtes@laas.fr--2005-libre/skribilo--engine-classes--1.2  (patch 5, 11)

   - `slide' package: use the native APIs.
   - evaluator: Made safer with respect to module excursions.

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2  (patch 92-99)

   - Merge from skribilo@sv.gnu.org--2006/skribilo--devo--1.2
   - evaluator: Made safer with respect to module excursions.
   - `slide' package: use the native APIs.
   - evaluator: Slight module-related cleanups.
   - skribe-load: Better modulogy.
   - `base' engine: Use the native Skribilo APIs.

 * lcourtes@laas.fr--2005-mobile/skribilo--engine-classes--1.2  (patch 7)

   - evaluator: Made safer with respect to module excursions.

 * skribilo@sv.gnu.org--2006/skribilo--devo--1.2  (patch 34-59)

   - lout & latex engines: Fixed the output of `&prog-line'.
   - eq/lout: Properly handle `div-style' and `mul-style'.
   - Fixed `publisher' in default biblio entry style.
   - lout engine: Fixed automatic `url-ref' breaking wrt. spacing.
   - LaTeX engine: Added support for classes without `chapter'.
   - Updated the LaTeX engine doc, mention `class-has-chapters?'.
   - `lncs' package: Use the native APIs.
   - `lncs' package: Fixed `abstract' for LaTeX.
   - `lncs' package: Use a native LaTeX/BibTeX bibliography.
   - `latex' engine: Removed stupid uses of `bold'.
   - `lncs' package: Changed the default bibliography sort, udpated the doc.
   - `latex' engine: Support `a' with grave accent.
   - `lncs' package: Tiny fix.
   - `latex' engine: Fixed `ref' with both `:handle' and `:text'.
   - Added basic GNU Gettext support.
   - Fixed biblio template output.
   - Rewrote the bib entry template evaluator, added support for `if'.
   - Cleaned up the default bibliography template.
   - biblio: Use SRFI-3[45] conditions instead of `skribe-error'.
   - Internationalized `(skribilo condition)'.
   - Updated (French) translation.
   - evaluator: Made safer with respect to module excursions.
   - `slide' package: use the native APIs.
   - evaluator: Slight module-related cleanups.
   - skribe-load: Better modulogy.
   - `base' engine: Use the native Skribilo APIs.

git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-18

1 files changed, 21 insertions, 5 deletions

diff --git a/src/guile/skribilo/package/slide.scm b/src/guile/skribilo/package/slide.scm
index 898f105..cbcae0b 100644
--- a/src/guile/skribilo/package/slide.scm
+++ b/src/guile/skribilo/package/slide.scm
@@ -20,13 +20,29 @@
 ;;; USA.
 
 
-(define-skribe-module (skribilo package slide))
+(define-module (skribilo package slide)
+  :use-module (skribilo reader)
+  :use-module (skribilo utils syntax)
 
+  :use-module (skribilo lib)
+  :use-module (skribilo ast)
+  :use-module (skribilo engine)
+  :use-module (skribilo evaluator) ;; `*load-options*'
+  :use-module (skribilo package base)
 
+  :autoload   (skribilo utils keywords) (the-options the-body)
+
+  :use-module (srfi srfi-1)
+  :use-module (ice-9 optargs))
+
+(fluid-set! current-reader (make-reader 'skribe))
+
+
+
 ;*---------------------------------------------------------------------*/
 ;*    slide-options                                                    */
 ;*---------------------------------------------------------------------*/
-(define-public &slide-load-options (skribe-load-options))
+(define-public &slide-load-options (*load-options*))
 
 
 ;*---------------------------------------------------------------------*/
@@ -49,7 +65,7 @@
    (let ((s (new container
 	       (markup 'slide)
 	       (ident (if (not ident)
-			  (symbol->string (gensym 'slide))
+			  (symbol->string (gensym "slide"))
 			  ident))
 	       (class class)
 	       (required-options '(:title :number :toc))
@@ -232,7 +248,7 @@
    (new container
       (markup 'slide-topic)
       (required-options '(:title :outline?))
-      (ident (or ident (symbol->string (gensym 'slide-topic))))
+      (ident (or ident (symbol->string (gensym "slide-topic"))))
       (class class)
       (options `((:outline? ,outline?)
                  ,@(the-options opt :outline? :class)))
@@ -247,7 +263,7 @@
    (new container
       (markup 'slide-subtopic)
       (required-options '(:title :outline?))
-      (ident (or ident (symbol->string (gensym 'slide-subtopic))))
+      (ident (or ident (symbol->string (gensym "slide-subtopic"))))
       (class class)
       (options `((:outline? ,outline?)
                  ,@(the-options opt :outline? :class)))