slide: Implemented `slide-topic' and `slide-subtopic'.

* src/guile/skribilo/package/slide.scm: Don't autoload `(skribilo engine
  html)'.  Moved `when-engine-is-loaded' clauses to the bottom.  Move
  base-engine writers to `slide/base.scm'.
  (slide-topic): New markup.
  (slide-subtopic): New markup.

* src/guile/skribilo/package/slide/Makefile.am (dist_guilemodule_DATA):
  Added `base.scm'.

* src/guile/skribilo/package/slide/html.scm (slide-topic): New writer.

* src/guile/skribilo/package/slide/lout.scm: Added topic/subtopic-related
  customs.

* src/guile/skribilo/package/slide/base.scm: New file.

This list might be incomplete or outdated if editing the log
message was not invoked from an up-to-date changes buffer!

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

1 files changed, 46 insertions, 51 deletions

diff --git a/src/guile/skribilo/package/slide.scm b/src/guile/skribilo/package/slide.scm
index 8c4582c..5a5f73d 100644
--- a/src/guile/skribilo/package/slide.scm
+++ b/src/guile/skribilo/package/slide.scm
@@ -20,8 +20,7 @@
 ;;; USA.
 
 
-(define-skribe-module (skribilo package slide)
-  :autoload (skribilo engine html) (html-width html-title-authors))
+(define-skribe-module (skribilo package slide))
 
 
 ;*---------------------------------------------------------------------*/
@@ -37,23 +36,6 @@
 (define %slide-the-counter 0)
 
 ;*---------------------------------------------------------------------*/
-;*    %slide-initialize! ...                                           */
-;*---------------------------------------------------------------------*/
-(format (current-error-port) "Slides initializing...~%")
-
-;; Register specific implementations for lazy loading.
-(when-engine-is-loaded 'latex
-  (lambda ()
-    (resolve-module '(skribilo package slide latex))))
-(when-engine-is-loaded 'html
-  (lambda ()
-    (resolve-module '(skribilo package slide html))))
-(when-engine-is-loaded 'lout
-  (lambda ()
-    (resolve-module '(skribilo package slide lout))))
-
-
-;*---------------------------------------------------------------------*/
 ;*    slide ...                                                        */
 ;*---------------------------------------------------------------------*/
 (define-markup (slide #!rest opt
@@ -229,38 +211,6 @@
 		    ,@(the-options opt :color :scolor)))
 	 (body body))))
 
-;*---------------------------------------------------------------------*/
-;*    base                                                             */
-;*---------------------------------------------------------------------*/
-(let ((be (find-engine 'base)))
-   (skribe-message "Base slides setup...\n")
-   ;; slide-pause
-   (markup-writer 'slide-pause be
-      :action #f)
-   ;; slide-vspace
-   (markup-writer 'slide-vspace be
-      :options '()
-      :action #f)
-   ;; slide-embed
-   (markup-writer 'slide-embed be
-      :options '(:alt :geometry-opt)
-      :action (lambda (n e)
-		 (output (markup-option n :alt) e)))
-   ;; slide-record
-   (markup-writer 'slide-record be
-      :options '(:tag :play)
-      :action (lambda (n e)
-		 (output (markup-body n) e)))
-   ;; slide-play
-   (markup-writer 'slide-play be
-      :options '(:tag :color)
-      :action (lambda (n e)
-		 (output (markup-option n :alt) e)))
-   ;; slide-play*
-   (markup-writer 'slide-play* be
-      :options '(:tag :color :scolor)
-      :action (lambda (n e)
-		 (output (markup-option n :alt) e))))
 
 
 ;*---------------------------------------------------------------------*/
@@ -271,3 +221,48 @@
 		      (and (is-markup? n 'slide)
 			   (markup-option n :number)))
 		   %slide-the-slides)))
+
+;*---------------------------------------------------------------------*/
+;*    slide-topic ...                                                  */
+;*---------------------------------------------------------------------*/
+(define-markup (slide-topic #!rest opt
+			    #!key (outline? #t) (title "") (ident #f))
+   (new container
+      (markup 'slide-topic)
+      (ident (or ident (symbol->string (gensym 'slide-topic))))
+      (options (the-options opt))
+      (body (the-body opt))))
+
+;*---------------------------------------------------------------------*/
+;*    slide-subtopic ...                                               */
+;*---------------------------------------------------------------------*/
+(define-markup (slide-subtopic #!rest opt
+			       #!key (outline? #f) (title "") (ident #f))
+   (new container
+      (markup 'slide-subtopic)
+      (ident (or ident (symbol->string (gensym 'slide-subtopic))))
+      (options (the-options opt))
+      (body (the-body opt))))
+
+
+
+;;;
+;;; Initialization.
+;;;
+
+(format (current-error-port) "Slides initializing...~%")
+
+;; Register specific implementations for lazy loading.
+(when-engine-is-loaded 'base
+  (lambda ()
+    (resolve-module '(skribilo package slide base))))
+(when-engine-is-loaded 'latex
+  (lambda ()
+    (resolve-module '(skribilo package slide latex))))
+(when-engine-is-loaded 'html
+  (lambda ()
+    (resolve-module '(skribilo package slide html))))
+(when-engine-is-loaded 'lout
+  (lambda ()
+    (resolve-module '(skribilo package slide lout))))
+