X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Ffootnote-auto-numbering-vertical-order.ly;h=61c156b3ffd5676708b6945b7ecced62e58017fb;hb=2eb22fd223cd56a2dd90eda1499dadbcbfa5fad5;hp=549075b3682118f6fdc1ab712e78809582d0f35f;hpb=c924aab690820bb69bec043608b4a7b46023bafb;p=lilypond.git

diff --git a/input/regression/footnote-auto-numbering-vertical-order.ly b/input/regression/footnote-auto-numbering-vertical-order.ly
index 549075b368..61c156b3ff 100644
--- a/input/regression/footnote-auto-numbering-vertical-order.ly
+++ b/input/regression/footnote-auto-numbering-vertical-order.ly
@@ -1,4 +1,4 @@
-\version "2.15.39"
+\version "2.17.6"
 \header {
   texidoc = "This regtest makes sure that footnote numbers are laid out
 in the correct vertical order.
@@ -30,66 +30,60 @@ in the correct vertical order.
     <<
       \new Staff \relative c' {
         d4 e
-        \once \override FootnoteItem #'numbering-assertion-function =
+        \once \override FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 0))
-        < f  a\footnote #'(1 . -1) \markup { n } c >
-        \once \override FootnoteSpanner #'numbering-assertion-function =
+        < f \footnote #'(1 . -1) \markup { n } a c >
+        \once \override FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 2 4)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \markup { p }
-        a8\< [ b c d ] a4 b c\f |
+        a8-\footnote #'(1 . 1) \markup { p } \<
+	-\footnote #'(1 . 1) \markup { o } [ b c d ] a4 b c\f |
         d a b c |\break
         d,4 e
-        \once \override FootnoteItem #'numbering-assertion-function =
+        \once \override FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 6))
-        < f  a\footnote #'(1 . -1) \markup { n } c >
-        \once \override FootnoteSpanner #'numbering-assertion-function =
+        < f \footnote #'(1 . -1) \markup { n } a c >
+        \once \override FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 8 10)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \markup { p }
-        a8\< [ b c d ] a4 b c |
+        a8-\footnote #'(1 . 1) \markup { p } \<
+	-\footnote #'(1 . 1) \markup { o } [ b c d ] a4 b c |
         d a b c\f |\pageBreak
         d,4 e
-        \once \override FootnoteItem #'numbering-assertion-function =
+        \once \override FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 12))
-        < f  a\footnote #'(1 . -1) \markup { n } c >
-        \once \override FootnoteSpanner #'numbering-assertion-function =
+        < f  \footnote #'(1 . -1) \markup { n } a c >
+        \once \override FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 14 16)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \markup { p }
-        a8\< [ b c d ] a4 b c |
+        a8-\footnote #'(1 . 1) \markup { p } \<
+	-\single\footnote #'(1 . 1) \markup { o } Beam [ b c d ] a4 b c |
         d a b c\! |\break
       }
       \new Staff \relative c' {
         d4 e
-        \once \override FootnoteItem #'numbering-assertion-function =
+        \once \override FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 1))
-        < f  a\footnote #'(1 . -1) \markup { n } c >
-        \once \override FootnoteSpanner #'numbering-assertion-function =
+        < f \footnote #'(1 . -1) \markup { n } a c >
+        \once \override FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 3 5)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \markup { p }
-        a8\< [ b c d ] a4 b c\f |
+        a8-\single\footnote #'(1 . 1) \markup { p } Hairpin \<
+	-\footnote #'(1 . 1) \markup { o } [ b c d ] a4 b c\f |
         d a b c |\break
         d,4 e
-        \once \override FootnoteItem #'numbering-assertion-function =
+        \once \override FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 7))
-        < f  a\footnote #'(1 . -1) \markup { n } c >
-        \once \override FootnoteSpanner #'numbering-assertion-function =
+        < f \footnote #'(1 . -1) \markup { n } a c >
+        \once \override FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 9 11)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \markup { p }
-        a8\< [ b c d ] a4 b c |
+        a8-\footnote #'(1 . 1) \markup { p } \<
+	-\footnote #'(1 . 1) \markup { o } [ b c d ] a4 b c |
         d a b c\f |\pageBreak
         d,4 e
-        \once \override FootnoteItem #'numbering-assertion-function =
+        \once \override FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 13))
-        < f  a\footnote #'(1 . -1) \markup { n } c >
-        \once \override FootnoteSpanner #'numbering-assertion-function =
+        < f \footnote #'(1 . -1) \markup { n } a c >
+        \once \override FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 15 17)
-        <>\footnote #'(1 . 1) #'Beam \markup { o }
-        <>\footnote #'(1 . 1) #'Hairpin \markup { p }
-        a8\< [ b c d ] a4 b c |
+        a8-\single\footnote #'(1 . 1) \markup { p } Hairpin \<
+	-\footnote #'(1 . 1) \markup { o } [ b c d ] a4 b c |
         d a b c\! |\break
       }
     >>