From d4360259d60722eaa175a483f792fce7b8c66d97 Mon Sep 17 00:00:00 2001
From: Ludovic Court`es
Date: Wed, 11 Oct 2006 07:43:47 +0000
Subject: slide: Propagate the `outline?' parameter in `slide-(sub)?topic'.

* src/guile/skribilo/package/slide.scm (slide-topic): Propagate the
  `outline?' parameter as an option.
  (slide-subtopic): Likewise.

git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-1
---
 doc/user/src/Makefile.am    | 11 +++++++++++
 doc/user/src/api14.skb      |  2 +-
 doc/user/src/api16.skb      | 10 +++++-----
 doc/user/src/api2.skb       |  2 +-
 doc/user/src/api20-html.skb |  2 ++
 doc/user/src/api20-lout.skb |  2 ++
 doc/user/src/api20.skb      |  2 --
 doc/user/src/bib1.sbib      |  2 ++
 doc/user/src/eq1.skb        |  6 ++++++
 doc/user/src/eq2.skb        |  3 +++
 doc/user/src/links1.skb     |  2 +-
 doc/user/src/pie1.skb       | 13 +++++++++++++
 doc/user/src/pie2.skb       | 14 ++++++++++++++
 doc/user/src/slides.skb     | 34 ++++++++++++++++++++--------------
 doc/user/src/start3.skb     |  4 ++--
 doc/user/src/start4.skb     |  8 ++++----
 doc/user/src/start5.skb     |  2 +-
 17 files changed, 88 insertions(+), 31 deletions(-)
 create mode 100644 doc/user/src/Makefile.am
 create mode 100644 doc/user/src/api20-html.skb
 create mode 100644 doc/user/src/api20-lout.skb
 delete mode 100644 doc/user/src/api20.skb
 create mode 100644 doc/user/src/eq1.skb
 create mode 100644 doc/user/src/eq2.skb
 create mode 100644 doc/user/src/pie1.skb
 create mode 100644 doc/user/src/pie2.skb

(limited to 'doc/user/src')

diff --git a/doc/user/src/Makefile.am b/doc/user/src/Makefile.am
new file mode 100644
index 0000000..6c61a1f
--- /dev/null
+++ b/doc/user/src/Makefile.am
@@ -0,0 +1,11 @@
+EXTRA_DIST = api1.skb api10.skb api11.skb api12.skb api13.skb	\
+  api14.skb api15.skb api16.skb api17.skb api18.skb		\
+  api19.skb api2.skb api20-html.skb api20-lout.skb api3.skb	\
+  api4.skb api5.skb api6.skb api7.skb api8.skb			\
+  api9.skb bib1.sbib bib2.skb bib3.skb bib4.skb			\
+  bib5.skb bib6.skb eq1.skb eq2.skb index1.skb			\
+  index2.skb index3.skb links1.skb links2.skb pie1.skb pie2.skb	\
+  prgm1.skb prgm2.skb prgm3.skb slides.skb			\
+  start1.skb start2.skb start3.skb start4.skb start5.skb
+
+## arch-tag: 9614a784-cac2-4399-bd61-18c9172f48a8
diff --git a/doc/user/src/api14.skb b/doc/user/src/api14.skb
index a3ede40..e9dd370 100644
--- a/doc/user/src/api14.skb
+++ b/doc/user/src/api14.skb
@@ -6,4 +6,4 @@
 
 (center 
  (figure :legend "The great Penguin" 
-	 (image :file "linux.gif")))
+	 (image :file "linux.png")))
diff --git a/doc/user/src/api16.skb b/doc/user/src/api16.skb
index a9d5705..6be4283 100644
--- a/doc/user/src/api16.skb
+++ b/doc/user/src/api16.skb
@@ -1,5 +1,5 @@
-(image :file "linux.gif" "A first image")
-(image :height 50 :file "linux.gif" "A smaller one")
-(image :file "bsd.gif" "A second image")
-(image :width 50 :file "bsd.gif")
-(image :width 200 :height 40 :file "bsd.gif")
+(image :file "linux.png" "A first image")
+(image :height 50 :file "linux.png" "A smaller one")
+(image :file "bsd.png" "A second image")
+(image :width 50 :file "bsd.png")
+(image :width 200 :height 40 :file "bsd.png")
diff --git a/doc/user/src/api2.skb b/doc/user/src/api2.skb
index 2c20965..4a89705 100644
--- a/doc/user/src/api2.skb
+++ b/doc/user/src/api2.skb
@@ -1,4 +1,4 @@
-(document :title "This is a Scribe document"
+(document :title "This is a Skribilo document"
           :author (list (author :name "Foo" :email (mailto "foo@nowhere.org"))
 			(author :name "Bar" :email (mailto "bar@anywhere.org"))
 			(author :name "Gee" :email (mailto "gee@nowhere.org")))
diff --git a/doc/user/src/api20-html.skb b/doc/user/src/api20-html.skb
new file mode 100644
index 0000000..686efcb
--- /dev/null
+++ b/doc/user/src/api20-html.skb
@@ -0,0 +1,2 @@
+[A simple ,(! "string"). A more annoying one ,(! "<strong>string</strong>"). 
+A last one with arguments ,(! "<u>$1 $2</u>" (bold 1) (it 2)).]
diff --git a/doc/user/src/api20-lout.skb b/doc/user/src/api20-lout.skb
new file mode 100644
index 0000000..89fb961
--- /dev/null
+++ b/doc/user/src/api20-lout.skb
@@ -0,0 +1,2 @@
+[A simple ,(! "string"). A more annoying one ,(! "@B { string }"). 
+A last one with arguments ,(! "@Underline { $1 $2 }" (bold 1) (it 2)).]
diff --git a/doc/user/src/api20.skb b/doc/user/src/api20.skb
deleted file mode 100644
index 686efcb..0000000
--- a/doc/user/src/api20.skb
+++ /dev/null
@@ -1,2 +0,0 @@
-[A simple ,(! "string"). A more annoying one ,(! "<strong>string</strong>"). 
-A last one with arguments ,(! "<u>$1 $2</u>" (bold 1) (it 2)).]
diff --git a/doc/user/src/bib1.sbib b/doc/user/src/bib1.sbib
index 3f1c04f..6afff71 100644
--- a/doc/user/src/bib1.sbib
+++ b/doc/user/src/bib1.sbib
@@ -12,6 +12,8 @@
    (year "1991"))
 
 (misc bigloo
+   (author "Manuel Serrano")
+   (year "2006")
    (url "http://www.inria.fr/mimosa/fp/Bigloo"))
 
 (misc scheme:r4rs
diff --git a/doc/user/src/eq1.skb b/doc/user/src/eq1.skb
new file mode 100644
index 0000000..bbd0742
--- /dev/null
+++ b/doc/user/src/eq1.skb
@@ -0,0 +1,6 @@
+;; The golden ratio, phi.
+(eq (eq:= (symbol "phi")
+	  (eq:/ (eq:+ 1 (eq:sqrt 5))
+	        2)))
+
+
diff --git a/doc/user/src/eq2.skb b/doc/user/src/eq2.skb
new file mode 100644
index 0000000..199fd7d
--- /dev/null
+++ b/doc/user/src/eq2.skb
@@ -0,0 +1,3 @@
+;; The golden ratio, phi.
+(eq '(= phi (/ (+ 1 (sqrt 5)) 2)))
+
diff --git a/doc/user/src/links1.skb b/doc/user/src/links1.skb
index e0ce61c..e0b393b 100644
--- a/doc/user/src/links1.skb
+++ b/doc/user/src/links1.skb
@@ -1,6 +1,6 @@
 [This hyperlink points to the ,(ref :figure "The great Penguin" :text "figure")
 of the chapter ,(ref :chapter "Standard Markups") (or also, the
-,(ref :ident "Standard Markups" :text "chapter") about markups). 
+,(ref :ident "std-markups" :text "chapter") about markups). 
 In the second example of reference, no ,(code ":text") option is specified: 
 ,(ref :figure "The great Penguin"). One may use the ,(param ":ident")
 field when specified such as: ,(ref :ident "fig1") or ,(ref :figure "fig1").
diff --git a/doc/user/src/pie1.skb b/doc/user/src/pie1.skb
new file mode 100644
index 0000000..0d0fd0b
--- /dev/null
+++ b/doc/user/src/pie1.skb
@@ -0,0 +1,13 @@
+;; A sad pie chart.
+;;
+
+(pie :title [Casualties in the Israel-Lebanon 2006 Conflict (source:
+English Wikipedia page, 2006-07-23)]
+     :total 450 ;; to show the uncertainty on figures
+     :ident "pie-lebanon-2006"
+     :labels 'outside :fingers? #t
+
+  (slice :weight   8 :color "black" [Hezbollah militants])
+  (slice :weight  42 :color "blue"  [soldiers])
+  (slice :weight 317 :color "red" :detach? #t
+	[civilians (,(sliceweight :percentage? #t)%)]))
diff --git a/doc/user/src/pie2.skb b/doc/user/src/pie2.skb
new file mode 100644
index 0000000..84b5394
--- /dev/null
+++ b/doc/user/src/pie2.skb
@@ -0,0 +1,14 @@
+;; Another sad pie chart.
+;;
+
+(pie :title [Casualties of the Conflict in Iraq since 2003 (source:
+English Wikipedia page, 2006-07-23)]
+     :ident "pie-iraq-2006"
+     :fingers? #f
+     :labels 'inside
+     :initial-angle 45
+     :radius 2
+
+  (slice :weight 100000 :color "red" :detach? #t
+	[civilians (,(sliceweight :percentage? #t)%)])
+  (slice :weight (+ 2555 229) :color #xeeeeee  [soldiers]))
diff --git a/doc/user/src/slides.skb b/doc/user/src/slides.skb
index ac584d1..e5e6896 100644
--- a/doc/user/src/slides.skb
+++ b/doc/user/src/slides.skb
@@ -6,22 +6,28 @@
 	      :address (ref :url "http://www.inria.fr/mimosa/Manuel.Serrano"))
 
    (if (engine-format? "html")
-       (slide :title "Table of contents" :number #f :toc #f
-	  (toc :chapter #f :section #f :subsection #f :subsubsection #f
-	       :slide #t)))
+       (slide :title "Table of Contents" :number #f :toc #f
+	  (toc :chapter #f :section #f :subsection #f :subsubsection #f)))
+;;;	       :slide #t)))
+  
+   (slide :title "Introduction" :vspace 0.3
+      
+      (p [This is a simple slide, not grouped in any topic.]))
 
-   (slide :title "X11 client" :toc #t :vspace 0.3
+   (slide-topic :title "Interactive Features" :outline? #t
 
-      (itemize
-	 (item "xlock")
-	 (item "xeyes")
-	 (item "xterm")))
+     (slide :title "X11 client" :toc #t :vspace 0.3
 
-   (slide :title "Xclock" :toc #t :vspace 0.3
+	(itemize
+	   (item "xlock")
+	   (item "xeyes")
+	   (item "xterm")))
 
-      (center (sf (underline "The Unix xclock client")))
-      (slide-vspace 0.3)
+     (slide :title "Xclock" :toc #t :vspace 0.3
 
-      (slide-pause)
-      (slide-embed :command "xlock"
-		   :alt (frame "Can't run embedded application"))))
+	(center (sf (underline "The Unix xclock client")))
+	(slide-vspace 0.3)
+
+	(slide-pause)
+	(slide-embed :command "xlock"
+		     :alt (frame "Can't run embedded application")))))
diff --git a/doc/user/src/start3.skb b/doc/user/src/start3.skb
index 0705966..65fa738 100644
--- a/doc/user/src/start3.skb
+++ b/doc/user/src/start3.skb
@@ -1,9 +1,9 @@
 (document :title [Hello World!] 
 
-(section :title [A first Section] [
+(chapter :title [A first Section] [
  This is a ,(bold [very]) ,(it [simple]) ,(color :fg [red] [text]).])
 
-(section :title [A second Section] [
+(chapter :title [A second Section] [
  That section contains an ,(bold itemize) construction:
  ,(itemize (item [first item])
            (item [second item])
diff --git a/doc/user/src/start4.skb b/doc/user/src/start4.skb
index 3311925..31fba0c 100644
--- a/doc/user/src/start4.skb
+++ b/doc/user/src/start4.skb
@@ -1,13 +1,13 @@
-(document :title [Various links] [
+(document :title [Various links]
 
-(section :title "A Section" [
+  (chapter :title "A Section" [
 The first link points to an external web page. Here we point to a
 ,(ref :url [http://slashdot.org/] [Slashdot])
 web page. The second one points to the second
 ,(ref :section [A second Section] [Section])
 of that document.])
 
-(section :title [A second Section] [
+  (chapter :title [A second Section] [
 The last links points to the first
 ,(ref :scribe [user.scr] :figure [A simple web page] [Figure])
-of the Scribe User Manual.])])
+of the Scribe User Manual.]))
diff --git a/doc/user/src/start5.skb b/doc/user/src/start5.skb
index 9e6b877..6977608 100644
--- a/doc/user/src/start5.skb
+++ b/doc/user/src/start5.skb
@@ -6,4 +6,4 @@
 	       (itemize 
 		(map (lambda (x)
 			(item (it (markup-option x :title))))
-		     sects)))))
\ No newline at end of file
+		     sects)))))
-- 
cgit v1.2.3