Merge branch 'master' into translation

[lilypond.git] / input / regression / footnote.ly

diff --git a/input/regression/footnote.ly b/input/regression/footnote.ly
index a2b1c658034654c93efb5a85e77b2e2bdd00595d..037635965e7902e0e3926cd7b62c9268e537b6cf 100644 (file)
--- a/input/regression/footnote.ly
+++ b/input/regression/footnote.ly
@@ -1,12 +1,8 @@
-\version "2.14.0"
+\version "2.15.39"
 \header {
   texidoc = "Lilypond does footnotes."
 }
 
-\paper {
-  footnote-auto-numbering = ##f
-}
-
 #(set-default-paper-size "a6")
 \book {
 
@@ -19,7 +15,7 @@
 \markup { h i }
 
 \relative c' {
-\footnoteGrob #'NoteHead #'(1 . -1) \markup { \tiny 4 } \markup { 4. j }
+<>\footnote \markup { \tiny 4 } #'(1 . -1) #'NoteHead \markup { 4. j }
 a b c d }
 
 \pageBreak
@@ -30,8 +26,8 @@ a b c d }
 
 \relative c' {
   d4 e
-  < f  a-\footnote #'(1 . -1) \markup { \tiny 6 } \markup { 6. n } c >
-  \footnoteGrob #'Beam #'(1 . 1) \markup { \tiny 7 } \markup { 7. o }
-  \footnoteGrob #'Hairpin #'(1 . 1) \markup { \tiny 8 } \markup { 8. p }
+  < f  a\footnote \markup { \tiny 6 } #'(1 . -1) \markup { 6. n } c >
+  <>\footnote \markup { \tiny 7 } #'(1 . 1) #'Beam \markup { 7. o }
+  <>\footnote \markup { \tiny 8 } #'(1 . 1) #'Hairpin \markup { 8. p }
   a8\< [ b c d\f ] r2. |
 }}