Reviewers: ,
Message:
Hey all,
These incorporate several comments from Neil regarding automatic
footnotes. Sorry for having missed them before, Neil!
Cheers,
MS
Description:
Incorporates suggestions from Neil into footnotes.
Please review this at http://codereview.appspot.com/4798063/
Affected files:
M input/regression/footnote-auto-numbering-page-reset.ly
M input/regression/footnote-auto-numbering.ly
M ly/music-functions-init.ly
M scm/lily-library.scm
Index: input/regression/footnote-auto-numbering-page-reset.ly
diff --git a/input/regression/footnote-auto-numbering-page-reset.ly
b/input/regression/footnote-auto-numbering-page-reset.ly
index
06a347ebdad08ff72bb90787252d826d303162c1..dc3fa468b5c10de78b3391929d478e847ae9f8e2
100644
--- a/input/regression/footnote-auto-numbering-page-reset.ly
+++ b/input/regression/footnote-auto-numbering-page-reset.ly
@@ -1,6 +1,11 @@
\version "2.15.7"
\header {
- texidoc = "Lilypond does footnotes."
+ texidoc = "This is an example of automatic footnote numbering
+where the number is reset on each page. It uses the symbol-footnotes
+numbering function, which assigns the symbols *, †, ‡, § and ¶ to
+successive footnotes, doubling up on the symbol after five footnotes
+have been reached.
+"
}
\paper {
Index: input/regression/footnote-auto-numbering.ly
diff --git a/input/regression/footnote-auto-numbering.ly
b/input/regression/footnote-auto-numbering.ly
index
fe4babe1a013ee17d0703a8648cc0cc05e1c19aa..3c0b410956082d0ec5d38d124c942d6e14c37123
100644
--- a/input/regression/footnote-auto-numbering.ly
+++ b/input/regression/footnote-auto-numbering.ly
@@ -1,6 +1,10 @@
\version "2.15.7"
\header {
- texidoc = "Lilypond does footnotes."
+ texidoc = "This is an example of automatic footnote numbering
+where the number is not reset on each page. It uses the default
+numbering function, which assigns numbers starting at 1 to successive
+footnotes.
+"
}
\paper {
Index: ly/music-functions-init.ly
diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index
3535a0a6a7b0dc5a03188dca78078e178ede3f16..2278f85a266387dbedef8a3d3192917b2193d126
100644
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -361,7 +361,7 @@ the number appears at @var{offset}. Note that, for
this to take effect,
auto-numbering must be turned on in the paper block. Otherwise, no
number will appear. Use like @code{\\once})")
#{
- \footnoteGrob $grob-name $offset \markup { "" } $footnote
+ \footnoteGrob $grob-name $offset \markup { \null } $footnote
#})
footnote =
@@ -389,7 +389,7 @@ Otherwise, no number will appear. Use like
@code{\\tweak})")
(make-music 'FootnoteEvent
'X-offset (car offset)
'Y-offset (cdr offset)
- 'text (markup "")
+ 'text (make-null-markup)
'footnote-text footnote))
grace =
Index: scm/lily-library.scm
diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index
34c9cb3820096c04603fd358393651bb165491e1..ede65ff5e2a54b88d303e0a2429e3980384c7022
100644
--- a/scm/lily-library.scm
+++ b/scm/lily-library.scm
@@ -746,23 +746,6 @@ Handy for debugging, possibly turned off."
(reverse matches))
-(define-public (random-string pool n)
- "Produces a random lowercase string of length n"
- (define (helper alphabet out num)
- (let ((rand (random (string-length pool))))
- (if (< num 1)
- out
- (helper alphabet
- (string-concatenate `(,out
- ,(substring alphabet
- rand
- (+ 1 rand))))
- (- num 1)))))
- (helper pool "" n))
-
-(define-public (random-lowercase-string n)
- (random-string "abcdefghijklmnopqrstuvwxyz" n))
-
;;;;;;;;;;;;;;;;
;; other
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
