From 569391b672f12a742a61f3575ca09660098d7514 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Mon, 3 Mar 2008 15:44:35 +0100
Subject: slide: Determine what to include in the outline slide based on
 `:toc'.

* NEWS: Update.

* doc/user/slide.skb: Update.

* src/guile/skribilo/package/slide.scm (slide-topic, slide-subtopic):
  Add `toc' option.

* src/guile/skribilo/package/slide/base.scm (make-subtopic-list): Filter
  topic nodes whose `:toc' is true.
---
 src/guile/skribilo/package/slide.scm      | 6 ++++--
 src/guile/skribilo/package/slide/base.scm | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/guile')

diff --git a/src/guile/skribilo/package/slide.scm b/src/guile/skribilo/package/slide.scm
index 86cfb90..050ed6a 100644
--- a/src/guile/skribilo/package/slide.scm
+++ b/src/guile/skribilo/package/slide.scm
@@ -252,7 +252,7 @@
 ;*    slide-topic ...                                                  */
 ;*---------------------------------------------------------------------*/
 (define-markup (slide-topic :rest opt
-			    :key title (outline? #t) (unfold? #t)
+			    :key title (outline? #t) (unfold? #t) (toc #t)
                             (ident #f) (class #f))
    (new container
       (markup 'slide-topic)
@@ -262,6 +262,7 @@
       (loc   &invocation-location)
       (options `((:outline? ,outline?)
                  (:unfold?  ,unfold?)
+                 (:toc      ,toc)
                  ,@(the-options opt :outline? :unfold? :class)))
       (body (the-body opt))))
 
@@ -269,7 +270,7 @@
 ;*    slide-subtopic ...                                               */
 ;*---------------------------------------------------------------------*/
 (define-markup (slide-subtopic :rest opt
-			       :key title (outline? #f) (unfold? #f)
+			       :key title (outline? #f) (unfold? #f) (toc #t)
                                (ident #f) (class #f))
    (new container
       (markup 'slide-subtopic)
@@ -279,6 +280,7 @@
       (loc   &invocation-location)
       (options `((:outline? ,outline?)
                  (:unfold?  ,unfold?)
+                 (:toc      ,toc)
                  ,@(the-options opt :outline? :class)))
       (body (the-body opt))))
 
diff --git a/src/guile/skribilo/package/slide/base.scm b/src/guile/skribilo/package/slide/base.scm
index 45657c5..cb50ca1 100644
--- a/src/guile/skribilo/package/slide/base.scm
+++ b/src/guile/skribilo/package/slide/base.scm
@@ -104,7 +104,8 @@
                         (filter (lambda (n)
                                   (and (markup? n)
                                        (member (markup-markup n)
-                                               subtopic-types)))
+                                               subtopic-types)
+                                       (markup-option n :toc)))
                                 (markup-body node))))))))
 
 (define (make-topic-list current-topic recurse? make-entry-proc)
-- 
cgit v1.2.3