Merge branch 'release/unstable'

diff --git a/VERSION b/VERSION
index 0827b98bc010d5f8af0e678796275b64bc3508c9..cc895541aca245c50ac9f30c2188527a49227cef 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=15
-PATCH_LEVEL=8
+PATCH_LEVEL=9
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.14.2
-VERSION_DEVEL=2.15.7
+VERSION_DEVEL=2.15.8

diff --git a/input/regression/footnote-auto-numbering-page-reset.ly b/input/regression/footnote-auto-numbering-page-reset.ly
index 06a347ebdad08ff72bb90787252d826d303162c1..dc3fa468b5c10de78b3391929d478e847ae9f8e2 100644 (file)
--- 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 {

diff --git a/input/regression/footnote-auto-numbering.ly b/input/regression/footnote-auto-numbering.ly
index fe4babe1a013ee17d0703a8648cc0cc05e1c19aa..3c0b410956082d0ec5d38d124c942d6e14c37123 100644 (file)
--- 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 {

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 3535a0a6a7b0dc5a03188dca78078e178ede3f16..2278f85a266387dbedef8a3d3192917b2193d126 100644 (file)
--- 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 =

diff --git a/scm/lily-library.scm b/scm/lily-library.scm
index 34c9cb3820096c04603fd358393651bb165491e1..ede65ff5e2a54b88d303e0a2429e3980384c7022 100644 (file)
--- 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