From 6527e65a24da1d211f44b9f068d6f7ded77c6637 Mon Sep 17 00:00:00 2001
From: Ludovic Courtes
Date: Tue, 6 Dec 2005 23:22:51 +0000
Subject: Fixed the handling of `footnote''s `:label' by the Lout/HTML engines.

* src/guile/skribilo/engine/lout.scm (footnote): Take the `:label' option
  into account.

* src/guile/skribilo/engine/html.scm (footnote): Likewise.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-17
---
 ChangeLog                          | 17 +++++++++++++++++
 src/guile/skribilo/engine/html.scm |  4 ++--
 src/guile/skribilo/engine/lout.scm |  6 +++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e168292..e941de2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2005-12-06 23:22:51 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-17
+
+    Summary:
+      Fixed the handling of `footnote''s `:label' by the Lout/HTML engines.
+    Revision:
+      skribilo--devel--1.2--patch-17
+
+    * src/guile/skribilo/engine/lout.scm (footnote): Take the `:label' option
+      into account.
+    
+    * src/guile/skribilo/engine/html.scm (footnote): Likewise.
+
+    modified files:
+     ChangeLog src/guile/skribilo/engine/html.scm
+     src/guile/skribilo/engine/lout.scm
+
+
 2005-12-04 21:20:44 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-16
 
     Summary:
diff --git a/src/guile/skribilo/engine/html.scm b/src/guile/skribilo/engine/html.scm
index b5c7a55..a376713 100644
--- a/src/guile/skribilo/engine/html.scm
+++ b/src/guile/skribilo/engine/html.scm
@@ -1422,11 +1422,11 @@
 ;*    footnote ...                                                     */
 ;*---------------------------------------------------------------------*/
 (markup-writer 'footnote
-   :options '(:number)
+   :options '(:label)
    :action (lambda (n e)
 	      (printf "<a href=\"#footnote-~a\"><sup><small>~a</small></sup></a>"
 		      (string-canonicalize (container-ident n))
-		      (markup-option n :number))))
+		      (markup-option n :label))))
 
 ;*---------------------------------------------------------------------*/
 ;*    linebreak ...                                                    */
diff --git a/src/guile/skribilo/engine/lout.scm b/src/guile/skribilo/engine/lout.scm
index 1ae5cd0..72a8338 100644
--- a/src/guile/skribilo/engine/lout.scm
+++ b/src/guile/skribilo/engine/lout.scm
@@ -1500,12 +1500,12 @@
 (markup-writer 'footnote
    :options '(:label)
    :before (lambda (n e)
-	     (let ((number (markup-option n :number))
+	     (let ((label (markup-option n :label))
 		   (use-number?
 		    (engine-custom e 'use-skribe-footnote-numbers?)))
-	       (if use-number?
+	       (if (or (and (number? label) use-number?) label)
 		   (printf "{ @FootNote @Label { ~a } { "
-			   (if number number ""))
+			   (if label label ""))
 		   (printf "{ @FootNote ~a{ "
 			   (if (not number) "@Label { } " "")))))
    :after (lambda (n e)
-- 
cgit v1.2.3