lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fix regtests about Footnote (issue 549320043 by address@hidden)


From: thomasmorley65
Subject: Fix regtests about Footnote (issue 549320043 by address@hidden)
Date: Sat, 14 Dec 2019 03:44:34 -0800

Reviewers: ,

Description:
Fix regtests about Footnote

Several regtest about FootnoteItem/Spanner contained overrides
without specifying the context.
Footnote_engraver lives in Score-context, though.  Thus the
Score-context is added to the overrides in:
input/regression/footnote-auto-numbering-vertical-order.ly
input/regression/footnote-auto-numbering.ly
input/regression/footnote-spanner.ly
input/regression/in-note.ly
Regtest-diffs are expected.

Please review this at https://codereview.appspot.com/549320043/

Affected files (+17, -17 lines):
  M input/regression/footnote-auto-numbering.ly
  M input/regression/footnote-auto-numbering-vertical-order.ly
  M input/regression/footnote-spanner.ly
  M input/regression/in-note.ly


Index: input/regression/footnote-auto-numbering-vertical-order.ly
diff --git a/input/regression/footnote-auto-numbering-vertical-order.ly b/input/regression/footnote-auto-numbering-vertical-order.ly index a7c86686eafeb6330b3e2588b8bb06eb5d38805f..780d8f2c3c22d8c2220577f3c047861ffad02436 100644
--- a/input/regression/footnote-auto-numbering-vertical-order.ly
+++ b/input/regression/footnote-auto-numbering-vertical-order.ly
@@ -30,28 +30,28 @@ in the correct vertical order.
     <<
       \new Staff \relative {
         d'4 e
-        \once \override FootnoteItem.numbering-assertion-function =
+        \once \override Score.FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 0))
         < f \footnote #'(1 . -1) \markup { n } a c >
-        \once \override FootnoteSpanner.numbering-assertion-function =
+ \once \override Score.FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 2 4)
         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 Score.FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 6))
         < f \footnote #'(1 . -1) \markup { n } a c >
-        \once \override FootnoteSpanner.numbering-assertion-function =
+ \once \override Score.FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 8 10)
         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 Score.FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 12))
         < f  \footnote #'(1 . -1) \markup { n } a c >
-        \once \override FootnoteSpanner.numbering-assertion-function =
+ \once \override Score.FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 14 16)
         a8-\footnote #'(1 . 1) \markup { p } \<
        -\single\footnote #'(1 . 1) \markup { o } Beam [ b c d ] a4 b c |
@@ -59,28 +59,28 @@ in the correct vertical order.
       }
       \new Staff \relative {
         d'4 e
-        \once \override FootnoteItem.numbering-assertion-function =
+        \once \override Score.FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 1))
         < f \footnote #'(1 . -1) \markup { n } a c >
-        \once \override FootnoteSpanner.numbering-assertion-function =
+ \once \override Score.FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 3 5)
         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 Score.FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 7))
         < f \footnote #'(1 . -1) \markup { n } a c >
-        \once \override FootnoteSpanner.numbering-assertion-function =
+ \once \override Score.FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 9 11)
         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 Score.FootnoteItem.numbering-assertion-function =
           #(lambda (grob) (make-footnote-numbering-assertion-function 13))
         < f \footnote #'(1 . -1) \markup { n } a c >
-        \once \override FootnoteSpanner.numbering-assertion-function =
+ \once \override Score.FootnoteSpanner.numbering-assertion-function =
           #(simultaneous-footnote-numbering-assertion-function 15 17)
         a8-\single\footnote #'(1 . 1) \markup { p } Hairpin \<
        -\footnote #'(1 . 1) \markup { o } [ b c d ] a4 b c |
Index: input/regression/footnote-auto-numbering.ly
diff --git a/input/regression/footnote-auto-numbering.ly b/input/regression/footnote-auto-numbering.ly index 6de6c843e13c81e42a011a952f0c84d9926cb96f..ca4072908d263cc05d1c78206b29defd0b9038d7 100644
--- a/input/regression/footnote-auto-numbering.ly
+++ b/input/regression/footnote-auto-numbering.ly
@@ -38,7 +38,7 @@ footnotes.
 \markup { h i }

 \relative c' {
-  \once \override FootnoteItem.numbering-assertion-function =
+  \once \override Score.FootnoteItem.numbering-assertion-function =
     #(lambda (grob) (make-footnote-numbering-assertion-function 3))
   \footnote #'(1 . -1) \markup { j } NoteHead
   a b c d
@@ -52,10 +52,10 @@ footnotes.

 \relative {
   d'4 e
-  \once \override FootnoteItem.numbering-assertion-function =
+  \once \override Score.FootnoteItem.numbering-assertion-function =
     #(lambda (grob) (make-footnote-numbering-assertion-function 5))
   < f \footnote #'(1 . -1) \markup { n } a c >
-  \once \override FootnoteSpanner.numbering-assertion-function =
+  \once \override Score.FootnoteSpanner.numbering-assertion-function =
     #(simultaneous-footnote-numbering-assertion-function 6 7)
   a8-\footnote #'(1 . 1) \markup { p } \<
   -\footnote #'(1 . 1) \markup { o } [ b c d ] a4 b c |
Index: input/regression/footnote-spanner.ly
diff --git a/input/regression/footnote-spanner.ly b/input/regression/footnote-spanner.ly index 78fa5f316b919ad62d67f467a3ae1f3616180e2b..7ed7e701e774c17423bc4e71d1f4ec1ec693ecdb 100644
--- a/input/regression/footnote-spanner.ly
+++ b/input/regression/footnote-spanner.ly
@@ -37,7 +37,7 @@ b c d a
 b c d a
 b c d a\!

-\once \override FootnoteSpanner.spanner-placement = #RIGHT
+\once \override Score.FootnoteSpanner.spanner-placement = #RIGHT
 b4-\single\footnote
               \markup { \tiny "2." }
               #'(0.5 . 0.5)
Index: input/regression/in-note.ly
diff --git a/input/regression/in-note.ly b/input/regression/in-note.ly
index 2e3bffb754db3799ff30d8185d39e9cf1aef042d..bb43f98ace5af8768da9e26d0038c033659653af 100644
--- a/input/regression/in-note.ly
+++ b/input/regression/in-note.ly
@@ -9,7 +9,7 @@
 \book {
   \relative c' {
     \repeat unfold 5 {
-      \once \override FootnoteItem.footnote = ##f
+      \once \override Score.FootnoteItem.footnote = ##f
       \footnote
          "" #'(0 . 0)
          \markup { \box \fill-line { "this is a test" } } NoteHead





reply via email to

[Prev in Thread] Current Thread [Next in Thread]