Merge from lcourtes@laas.fr--2005-mobile

Patches applied:

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2  (patch 27-28)

   - Merge from lcourtes@laas.fr--2004-libre
   - More fixes in the hope to get the manual compiled.

git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-31

3 files changed, 15 insertions, 10 deletions

diff --git a/doc/user/bib.skb b/doc/user/bib.skb
index c5357af..83e6360 100644
--- a/doc/user/bib.skb
+++ b/doc/user/bib.skb
@@ -9,7 +9,7 @@
 ;*    The Skribe index                                                 */
 ;*=====================================================================*/
 
-(bibliography "user/src/bib1.sbib")
+(bibliography "src/bib1.sbib")
 
 ;*---------------------------------------------------------------------*/
 ;*    Index                                                            */
@@ -51,8 +51,8 @@ if its argument is a bibliography table as returned by
 	       :see-also '(make-bib-table default-bib-table bibliography the-bibliography)
 	       :force-engines *api-engines*
 	       :common-args '()
-               :skribe-source? #f
-	       :source "skribilo/biblio.scm")
+	       :source #f ;;"skribilo/biblio.scm"
+               :def '(define-markup (bib-table? obj) ...))
    
    (p [The function ,(code "default-bib-table") returns a global, pre-existing
 bibliography-table:])
@@ -61,8 +61,8 @@ bibliography-table:])
 	       :see-also '(bib-table? make-bib-table bibliography the-bibliography)
 	       :force-engines *api-engines*
 	       :common-args '()
-               :skribe-source? #f
-	       :source "skribilo/biblio.scm")
+               :source #f
+               :def '(define-markup (default-bib-table) ...))
    
    (p [The function ,(code "make-bib-table") constructs a new 
 bibliography-table:])
@@ -71,8 +71,8 @@ bibliography-table:])
 	       :see-also '(bib-table? default-bib-table bibliography the-bibliography)
 	       :force-engines *api-engines*
 	       :common-args '()
-               :skribe-source? #f
-	       :source "skribilo/biblio.scm"))
+	       :source #f
+               :def '(define-markup (make-bib-table ident) ...)))
    
 ;*---------------------------------------------------------------------*/
 ;*    bibliography ... @label bibliography@                            */
@@ -84,7 +84,7 @@ into the Skribe memory. An ,(emph "entry") is either a list
 representing one entry (such as an article or book reference) or a
 string which denotes a file name that contains several
 entries. All the entries loaded in memory are available for the function
-,(ref :ident "ref" :node "references"). A bibliography database must be loaded
+,(ref :ident "ref" :text "references"). A bibliography database must be loaded
 ,(emph "before") any reference is introduced. It is advised to place
 the ,(code "bibliography") Skribe function call before the call to the
 ,(markup-ref "document") function call.])
@@ -217,7 +217,8 @@ entries identifier. The last one sorts according to entries date.])
 
 (example-produce 
  (example :legend "Sorting bibliography entries" 
-	  (prgm :file "src/common/bib.scm" :definition 'bib-sort/idents)))))
+	  (prgm :file "skribilo/skribe/bib.scm"
+	        :definition 'bib-sort/idents)))))
 
 ;*---------------------------------------------------------------------*/
 ;*    skribebibtex                                                     */
diff --git a/doc/user/footnote.skb b/doc/user/footnote.skb
index 96101f3..43d6c3f 100644
--- a/doc/user/footnote.skb
+++ b/doc/user/footnote.skb
@@ -18,7 +18,10 @@
 the reference to the footnote.])
 
 (doc-markup 'footnote
-	    `((:number [The number of the footnote.])
+	    `((:label [This may be either a boolean (i.e., ,(code "#f")
+or ,(code "#t")) indicating whether a footnote label should
+automatically be produced, a string specifying a label to use (e.g.,
+,(code ["*"])), or a number.])
 	      (#!rest text... [The text of the footnote.]))
 	    :see-also '(document chapter section))
 
diff --git a/doc/user/table.skb b/doc/user/table.skb
index c726d44..a3cd75b 100644
--- a/doc/user/table.skb
+++ b/doc/user/table.skb
@@ -66,6 +66,7 @@ attribute is only supported by HTML engines supporting
 	      (:valign [The vertical alignment of the cell. The value can
 		        be ,(code "top"), ,(code "center"), ,(code "bottom").])
               (:colspan [The number of columns that the cell expands to.])
+	      (:rowspan [The number of columns that the cell spans over.])
 	      (#!rest node [The value of the cell.]))
 	    :writer-id 'tc
 	    :ignore-args '(m)