aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtes2005-12-06 23:25:19 +0000
committerLudovic Courtes2005-12-06 23:25:19 +0000
commit9529f21f3cd6d7b54e48cec155c39ca964023531 (patch)
treef082e31886a75149d7c610937a668e0e73c61ddd
parent714296f422f9789081b8216aca0c2e4be0668efc (diff)
parent6527e65a24da1d211f44b9f068d6f7ded77c6637 (diff)
downloadskribilo-9529f21f3cd6d7b54e48cec155c39ca964023531.tar.gz
skribilo-9529f21f3cd6d7b54e48cec155c39ca964023531.tar.lz
skribilo-9529f21f3cd6d7b54e48cec155c39ca964023531.zip
Merge from lcourtes@laas.fr--2005-mobile
Patches applied: * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2 (patch 17) - Fixed the handling of `footnote''s `:label' by the Lout/HTML engines. git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-20
-rw-r--r--ChangeLog17
-rw-r--r--src/guile/skribilo/engine/html.scm4
-rw-r--r--src/guile/skribilo/engine/lout.scm6
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)