diff options
| author | Ludovic Court`es | 2006-09-27 15:45:04 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2006-09-27 15:45:04 +0000 |
| commit | d36f9ffd927818493230c82efc20c29a50b9afa5 (patch) | |
| tree | e68c286348a6925b4f8e4c47d8af46c96ce23e49 | |
| parent | 76074a64af9da255cdfb4b6ff59c786b444fbc18 (diff) | |
| download | skribilo-d36f9ffd927818493230c82efc20c29a50b9afa5.tar.gz skribilo-d36f9ffd927818493230c82efc20c29a50b9afa5.tar.lz skribilo-d36f9ffd927818493230c82efc20c29a50b9afa5.zip | |
`slide' package: use the native APIs.
* src/guile/skribilo/package/slide.scm: Use the native APIs rather than
`define-skribe-module'.
(&slide-load-options): Use `*load-options*'.
git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--engine-classes--1.2--patch-5
| -rw-r--r-- | src/guile/skribilo/package/slide.scm | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/guile/skribilo/package/slide.scm b/src/guile/skribilo/package/slide.scm index 12955ce..e25e222 100644 --- a/src/guile/skribilo/package/slide.scm +++ b/src/guile/skribilo/package/slide.scm @@ -20,13 +20,27 @@ ;;; 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) + :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 +63,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)) @@ -231,7 +245,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")))) (options (the-options opt)) (body (the-body opt)))) @@ -244,7 +258,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")))) (options (the-options opt)) (body (the-body opt)))) |