From e9c75da91462305b1449d0d95af6f67ae51e941b Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Tue, 6 Feb 2007 22:54:27 +0000
Subject: `slide' package: use the native APIs.
Patches applied:
* lcourtes@laas.fr--2005-libre/skribilo--engine-classes--1.2 (patch 5)
- `slide' package: use the native APIs.
git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-56
---
ChangeLog | 21 +++++++++++++++++++++
src/guile/skribilo/package/slide.scm | 26 +++++++++++++++++++++-----
2 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a0c288b..4f0624c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,27 @@
# arch-tag: automatic-ChangeLog--skribilo@sv.gnu.org--2006/skribilo--devo--1.2
#
+2007-02-06 22:54:27 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-56
+
+ Summary:
+ `slide' package: use the native APIs.
+ Revision:
+ skribilo--devo--1.2--patch-56
+
+ Patches applied:
+
+ * lcourtes@laas.fr--2005-libre/skribilo--engine-classes--1.2 (patch 5)
+
+ - `slide' package: use the native APIs.
+
+ modified files:
+ ChangeLog src/guile/skribilo/package/slide.scm
+
+ new patches:
+ lcourtes@laas.fr--2005-libre/skribilo--engine-classes--1.2--patch-5
+ lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-96
+
+
2007-02-06 22:53:16 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-55
Summary:
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)))
--
cgit v1.2.3