From f2bd555640f6f28276fd56250c7e8b1bd07aa1df Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Thu, 17 May 2012 11:10:16 +0200 Subject: [PATCH] Run scripts/auxiliar/update-with-convert-ly --- Documentation/de/notation/input.itely | 50 +++++++++---------- Documentation/es/notation/input.itely | 50 +++++++++---------- Documentation/fr/notation/input.itely | 50 +++++++++---------- Documentation/ja/notation/input.itely | 50 +++++++++---------- Documentation/notation/input.itely | 50 +++++++++---------- .../footnote-auto-numbering-page-reset.ly | 10 ++-- .../footnote-auto-numbering-vertical-order.ly | 38 +++++++------- input/regression/footnote-auto-numbering.ly | 10 ++-- input/regression/footnote-break-visibility.ly | 6 +-- input/regression/footnote-footer-padding.ly | 8 +-- input/regression/footnote-spanner.ly | 6 +-- input/regression/footnote.ly | 10 ++-- input/regression/in-note.ly | 6 +-- 13 files changed, 172 insertions(+), 172 deletions(-) diff --git a/Documentation/de/notation/input.itely b/Documentation/de/notation/input.itely index ba01fc60a3..0675766ead 100644 --- a/Documentation/de/notation/input.itely +++ b/Documentation/de/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes. @end ignore -@c \version "2.15.32" +@c \version "2.15.39" @c Translators: Till Paala @@ -1128,10 +1128,10 @@ werden, auf den sich die Fußnote bezieht. \header { tagline = ##f } \relative c' { \footnote #'(0.5 . -2) #'NoteHead - \markup { Die erste Note } + \markup { Die erste Note } \default a'4 b8 \footnote #'(0.5 . 1) #'NoteHead - \markup { Die dritte Note } + \markup { Die dritte Note } \default e c4 d4 } } @@ -1147,9 +1147,9 @@ stehen: \header { tagline = ##f } \relative c' { < - c-\footnote #'(1 . -1.25) "Hier ein C" - es-\footnote #'(2 . -0.25) \markup { \italic "Ein Es" } - g-\footnote #'(2 . 3) \markup { \bold "Das ist ein G" } + c-\footnote #'(1 . -1.25) "Hier ein C" \default + es-\footnote #'(2 . -0.25) \markup { \italic "Ein Es" } \default + g-\footnote #'(2 . 3) \markup { \bold "Das ist ein G" } \default >1 } } @@ -1168,25 +1168,25 @@ Tagline und Copyright gezeigt wird. \header { copyright = \markup { "Copyright 1970" } } \relative c' { \footnote #'(-3 . 0) #'DynamicText - \markup { \bold Forte } + \markup { \bold Forte } \default \footnote #'(0 . 1.5) #'Slur - \markup { Ein Bogen } + \markup { Ein Bogen } \default a'4\f( \footnote #'(0 . -2) #'Beam - \markup { Balken } + \markup { Balken } \default b8)[ e] \footnote #'(1 . -1) #'Stem - \markup { \teeny { Das ist ein Hals } } + \markup { \teeny { Das ist ein Hals } } \default c4 \footnote #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { Ein Warnungsversetzungszeichen } + \markup \italic { Ein Warnungsversetzungszeichen } \default \footnote #'(0.5 . -0.5) #'TextScript - \markup \italic { Langsamer hier } + \markup \italic { Langsamer hier } \default dis?4_"rit." } } @@ -1229,12 +1229,12 @@ Wie auch bei automatischen Fußnoten muss der Befehl @code{\footnote} \header { tagline = ##f } \relative c' { a'4-\footnote - "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. Die erste Note" } + "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. Die erste Note" } \default b8 e-\footnote - \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. Die zweite Note" + \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. Die zweite Note" \default c4 - d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" + d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" \default } } @end lilypond @@ -1246,10 +1246,10 @@ Fußnoten für Akkordnoten werden wie folgt notiert: \header { tagline = ##f } \relative c' { < - c-\footnote "1" #'(1 . -1.25) "1. C" + c-\footnote "1" #'(1 . -1.25) "1. C" \default es-\footnote - \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" - g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } + \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" \default + g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } \default >1 } } @@ -1268,36 +1268,36 @@ Position der Fußnotentexte zu Tagline und Copyright anzeigen: \relative c' { \footnote \markup { \teeny 1 } #'(-3 . 0) #'DynamicText - \markup { 1. \bold Forte } + \markup { 1. \bold Forte } \default \footnote \markup { \teeny b } #'(0 . 1.5) #'Slur - \markup { b. Ein Bogen } + \markup { b. Ein Bogen } \default a'4\f( \footnote \markup { \teeny 3 } #'(0 . -2) #'Beam - \markup { 3. Balken } + \markup { 3. Balken } \default b8)[ e] \footnote \markup { 4 } #'(1 . -1) #'Stem - \markup { \bold 4. { Das ist ein Hals } } + \markup { \bold 4. { Das ist ein Hals } } \default c4 \footnote \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { v. Ein Warnungsversetzungszeichen } + \markup \italic { v. Ein Warnungsversetzungszeichen } \default \footnote \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript - \markup \italic { a. Langsamer hier } + \markup \italic { a. Langsamer hier } \default dis?4_"rit." \breathe \footnote \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign - \markup { \null } + \markup { \null } \default } } @end lilypond diff --git a/Documentation/es/notation/input.itely b/Documentation/es/notation/input.itely index 4668d0a140..08ee2799d0 100644 --- a/Documentation/es/notation/input.itely +++ b/Documentation/es/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.15.32" +@c \version "2.15.39" @node Entrada y salida generales @chapter Entrada y salida generales @@ -1108,10 +1108,10 @@ al que se adjunta la nota al pie: \header { tagline = ##f } \relative c' { \footnote #'(0.5 . -2) #'NoteHead - \markup { The first note } + \markup { The first note } \default a'4 b8 \footnote #'(0.5 . 1) #'NoteHead - \markup { The third note } + \markup { The third note } \default e c4 d4 } } @@ -1126,9 +1126,9 @@ quiere adjuntar la nota al pie como un @code{TextScript}: \header { tagline = ##f } \relative c' { < - c-\footnote #'(1 . -1.25) "Here is a C" - es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" } - g-\footnote #'(2 . 3) \markup { \bold "This is a G" } + c-\footnote #'(1 . -1.25) "Here is a C" \default + es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" } \default + g-\footnote #'(2 . 3) \markup { \bold "This is a G" } \default >1 } } @@ -1147,25 +1147,25 @@ línea informativa y la línea de copyright. \header { copyright = \markup { "Copyright 1970" } } \relative c' { \footnote #'(-3 . 0) #'DynamicText - \markup { \bold Forte } + \markup { \bold Forte } \default \footnote #'(0 . 1.5) #'Slur - \markup { A slur } + \markup { A slur } \default a'4\f( \footnote #'(0 . -2) #'Beam - \markup { Beam } + \markup { Beam } \default b8)[ e] \footnote #'(1 . -1) #'Stem - \markup { \teeny { This is a stem } } + \markup { \teeny { This is a stem } } \default c4 \footnote #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { A cautionary accidental } + \markup \italic { A cautionary accidental } \default \footnote #'(0.5 . -0.5) #'TextScript - \markup \italic { Slow Down } + \markup \italic { Slow Down } \default dis?4_"rit." } } @@ -1207,12 +1207,12 @@ que la nota al pie está anotando y adjuntada como un \header { tagline = ##f } \relative c' { a'4-\footnote - "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } + "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } \default b8 e-\footnote - \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" + \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" \default c4 - d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" + d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" \default } } @end lilypond @@ -1224,10 +1224,10 @@ Para anotar notas de acordes con notas al pie manuales: \header { tagline = ##f } \relative c' { < - c-\footnote "1" #'(1 . -1.25) "1. C" + c-\footnote "1" #'(1 . -1.25) "1. C" \default es-\footnote - \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" - g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } + \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" \default + g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } \default >1 } } @@ -1247,38 +1247,38 @@ informativa a la de copyright: \relative c' { \footnote \markup { \teeny 1 } #'(-3 . 0) #'DynamicText - \markup { 1. \bold Forte } + \markup { 1. \bold Forte } \default \footnote \markup { \teeny b } #'(0 . 1.5) #'Slur - \markup { b. A slur } + \markup { b. A slur } \default a'4\f( \footnote \markup { \teeny 3 } #'(0 . -2) #'Beam - \markup { 3. Beam } + \markup { 3. Beam } \default b8)[ e] \footnote \markup { 4 } #'(1 . -1) #'Stem - \markup { \bold 4. { This is a stem } } + \markup { \bold 4. { This is a stem } } \default c4 \footnote \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { v. A cautionary accidental } + \markup \italic { v. A cautionary accidental } \default \footnote \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript - \markup \italic { a. Slow Down } + \markup \italic { a. Slow Down } \default dis?4_"rit." \breathe \footnote \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign - \markup { \null } + \markup { \null } \default } } @end lilypond diff --git a/Documentation/fr/notation/input.itely b/Documentation/fr/notation/input.itely index 182c8e54b2..238495890e 100644 --- a/Documentation/fr/notation/input.itely +++ b/Documentation/fr/notation/input.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.15.32" +@c \version "2.15.39" @c Translators: Jean-Charles Malahieude, Valentin Villenave @@ -1155,10 +1155,10 @@ l'objet auquel la note est attachée. \header { tagline = ##f } \relative c' { \footnote #'(0.5 . -2) #'NoteHead - \markup { La première note } + \markup { La première note } \default a'4 b8 \footnote #'(0.5 . 1) #'NoteHead - \markup { La troisième note } + \markup { La troisième note } \default e c4 d4 } } @@ -1174,9 +1174,9 @@ le @code{TextScript} fait référence. \header { tagline = ##f } \relative c' { < - c-\footnote #'(1 . -1.25) "Voici un do" - es-\footnote #'(2 . -0.25) \markup { \italic "Un mi bémol" } - g-\footnote #'(2 . 3) \markup { \bold "Ceci est un sol" } + c-\footnote #'(1 . -1.25) "Voici un do" \default + es-\footnote #'(2 . -0.25) \markup { \italic "Un mi bémol" } \default + g-\footnote #'(2 . 3) \markup { \bold "Ceci est un sol" } \default >1 } } @@ -1196,25 +1196,25 @@ et le pied de page. \header { copyright = \markup { "Copyright 1970" } } \relative c' { \footnote #'(-3 . 0) #'DynamicText - \markup { \bold Forte } + \markup { \bold Forte } \default \footnote #'(0 . 1.5) #'Slur - \markup { A slur } + \markup { A slur } \default a'4\f( \footnote #'(0 . -2) #'Beam - \markup { Beam } + \markup { Beam } \default b8)[ e] \footnote #'(1 . -1) #'Stem - \markup { \teeny { This is a stem } } + \markup { \teeny { This is a stem } } \default c4 \footnote #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { A cautionary accidental } + \markup \italic { A cautionary accidental } \default \footnote #'(0.5 . -0.5) #'TextScript - \markup \italic { Slow Down } + \markup \italic { Slow Down } \default dis?4_"rit." } } @@ -1262,12 +1262,12 @@ référence. \header { tagline = ##f } \relative c' { a'4-\footnote - "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } + "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } \default b8 e-\footnote - \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" + \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" \default c4 - d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" + d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" \default } } @end lilypond @@ -1281,10 +1281,10 @@ l'annotation fait référence, comme s'il s'agissait d'une articulation. \header { tagline = ##f } \relative c' { < - c-\footnote "1" #'(1 . -1.25) "1. C" + c-\footnote "1" #'(1 . -1.25) "1. C" \default es-\footnote - \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" - g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } + \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" \default + g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } \default >1 } } @@ -1305,38 +1305,38 @@ et le pied de page. \relative c' { \footnote \markup { \teeny 1 } #'(-3 . 0) #'DynamicText - \markup { 1. \bold Forte } + \markup { 1. \bold Forte } \default \footnote \markup { \teeny b } #'(0 . 1.5) #'Slur - \markup { b. A slur } + \markup { b. A slur } \default a'4\f( \footnote \markup { \teeny 3 } #'(0 . -2) #'Beam - \markup { 3. Beam } + \markup { 3. Beam } \default b8)[ e] \footnote \markup { 4 } #'(1 . -1) #'Stem - \markup { \bold 4. { This is a stem } } + \markup { \bold 4. { This is a stem } } \default c4 \footnote \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { v. A cautionary accidental } + \markup \italic { v. A cautionary accidental } \default \footnote \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript - \markup \italic { a. Slow Down } + \markup \italic { a. Slow Down } \default dis?4_"rit." \breathe \footnote \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign - \markup { \null } + \markup { \null } \default } } @end lilypond diff --git a/Documentation/ja/notation/input.itely b/Documentation/ja/notation/input.itely index eafb56fb51..b2f37b0935 100644 --- a/Documentation/ja/notation/input.itely +++ b/Documentation/ja/notation/input.itely @@ -7,7 +7,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.15.32" +@c \version "2.15.39" @c Translators: Yoshiki Sawada @@ -1107,10 +1107,10 @@ scoreTitleMarkup = \markup @{ \column @{ \header { tagline = ##f } \relative c' { \footnote #'(0.5 . -2) #'NoteHead - \markup { The first note } + \markup { The first note } \default a'4 b8 \footnote #'(0.5 . 1) #'NoteHead - \markup { The third note } + \markup { The third note } \default e c4 d4 } } @@ -1125,9 +1125,9 @@ scoreTitleMarkup = \markup @{ \column @{ \header { tagline = ##f } \relative c' { < - c-\footnote #'(1 . -1.25) "Here is a C" - es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" } - g-\footnote #'(2 . 3) \markup { \bold "This is a G" } + c-\footnote #'(1 . -1.25) "Here is a C" \default + es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" } \default + g-\footnote #'(2 . 3) \markup { \bold "This is a G" } \default >1 } } @@ -1146,25 +1146,25 @@ scoreTitleMarkup = \markup @{ \column @{ \header { copyright = \markup { "Copyright 1970" } } \relative c' { \footnote #'(-3 . 0) #'DynamicText - \markup { \bold Forte } + \markup { \bold Forte } \default \footnote #'(0 . 1.5) #'Slur - \markup { A slur } + \markup { A slur } \default a'4\f( \footnote #'(0 . -2) #'Beam - \markup { Beam } + \markup { Beam } \default b8)[ e] \footnote #'(1 . -1) #'Stem - \markup { \teeny { This is a stem } } + \markup { \teeny { This is a stem } } \default c4 \footnote #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { A cautionary accidental } + \markup \italic { A cautionary accidental } \default \footnote #'(0.5 . -0.5) #'TextScript - \markup \italic { Slow Down } + \markup \italic { Slow Down } \default dis?4_"rit." } } @@ -1205,12 +1205,12 @@ scoreTitleMarkup = \markup @{ \column @{ \header { tagline = ##f } \relative c' { a'4-\footnote - "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } + "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } \default b8 e-\footnote - \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" + \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" \default c4 - d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" + d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" \default } } @end lilypond @@ -1222,10 +1222,10 @@ scoreTitleMarkup = \markup @{ \column @{ \header { tagline = ##f } \relative c' { < - c-\footnote "1" #'(1 . -1.25) "1. C" + c-\footnote "1" #'(1 . -1.25) "1. C" \default es-\footnote - \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" - g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } + \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" \default + g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } \default >1 } } @@ -1245,38 +1245,38 @@ scoreTitleMarkup = \markup @{ \column @{ \relative c' { \footnote \markup { \teeny 1 } #'(-3 . 0) #'DynamicText - \markup { 1. \bold Forte } + \markup { 1. \bold Forte } \default \footnote \markup { \teeny b } #'(0 . 1.5) #'Slur - \markup { b. A slur } + \markup { b. A slur } \default a'4\f( \footnote \markup { \teeny 3 } #'(0 . -2) #'Beam - \markup { 3. Beam } + \markup { 3. Beam } \default b8)[ e] \footnote \markup { 4 } #'(1 . -1) #'Stem - \markup { \bold 4. { This is a stem } } + \markup { \bold 4. { This is a stem } } \default c4 \footnote \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { v. A cautionary accidental } + \markup \italic { v. A cautionary accidental } \default \footnote \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript - \markup \italic { a. Slow Down } + \markup \italic { a. Slow Down } \default dis?4_"rit." \breathe \footnote \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign - \markup { \null } + \markup { \null } \default } } @end lilypond diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely index 9294d5cd08..7c161ca2db 100644 --- a/Documentation/notation/input.itely +++ b/Documentation/notation/input.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.15.32" +@c \version "2.15.39" @node General input and output @chapter General input and output @@ -1054,10 +1054,10 @@ footnote is being attached to: \header { tagline = ##f } \relative c' { \footnote #'(0.5 . -2) #'NoteHead - \markup { The first note } + \markup { The first note } \default a'4 b8 \footnote #'(0.5 . 1) #'NoteHead - \markup { The third note } + \markup { The third note } \default e c4 d4 } } @@ -1071,9 +1071,9 @@ the note to which the footnote is being attached as a @code{TextScript}: \header { tagline = ##f } \relative c' { < - c-\footnote #'(1 . -1.25) "Here is a C" - es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" } - g-\footnote #'(2 . 3) \markup { \bold "This is a G" } + c-\footnote #'(1 . -1.25) "Here is a C" \default + es-\footnote #'(2 . -0.25) \markup { \italic "An E-flat" } \default + g-\footnote #'(2 . 3) \markup { \bold "This is a G" } \default >1 } } @@ -1091,25 +1091,25 @@ relative position of the footnotes to the tagline and copyright. \header { copyright = \markup { "Copyright 1970" } } \relative c' { \footnote #'(-3 . 0) #'DynamicText - \markup { \bold Forte } + \markup { \bold Forte } \default \footnote #'(0 . 1.5) #'Slur - \markup { A slur } + \markup { A slur } \default a'4\f( \footnote #'(0 . -2) #'Beam - \markup { Beam } + \markup { Beam } \default b8)[ e] \footnote #'(1 . -1) #'Stem - \markup { \teeny { This is a stem } } + \markup { \teeny { This is a stem } } \default c4 \footnote #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { A cautionary accidental } + \markup \italic { A cautionary accidental } \default \footnote #'(0.5 . -0.5) #'TextScript - \markup \italic { Slow Down } + \markup \italic { Slow Down } \default dis?4_"rit." } } @@ -1148,12 +1148,12 @@ Like automatic footnotes, manual @code{\footnote} commands must come \header { tagline = ##f } \relative c' { a'4-\footnote - "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } + "1" #'(0.5 . -2) #'NoteHead \markup { \italic "1. The first note" } \default b8 e-\footnote - \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" + \markup { \bold "2" } #'(0.5 . 1) #'NoteHead "2. The second note" \default c4 - d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" + d\p-\footnote "3" #'(0.5 . -1) #'DynamicText "3. Piano" \default } } @end lilypond @@ -1165,10 +1165,10 @@ To annotate chorded notes with manual footnotes: \header { tagline = ##f } \relative c' { < - c-\footnote "1" #'(1 . -1.25) "1. C" + c-\footnote "1" #'(1 . -1.25) "1. C" \default es-\footnote - \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" - g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } + \markup { \bold "b" } #'(2 . -0.25) "b. E-flat" \default + g-\footnote "3" #'(2 . 3) \markup { \italic "iii. G" } \default >1 } } @@ -1187,38 +1187,38 @@ the relative position of the footnotes to the tagline and copyright \relative c' { \footnote \markup { \teeny 1 } #'(-3 . 0) #'DynamicText - \markup { 1. \bold Forte } + \markup { 1. \bold Forte } \default \footnote \markup { \teeny b } #'(0 . 1.5) #'Slur - \markup { b. A slur } + \markup { b. A slur } \default a'4\f( \footnote \markup { \teeny 3 } #'(0 . -2) #'Beam - \markup { 3. Beam } + \markup { 3. Beam } \default b8)[ e] \footnote \markup { 4 } #'(1 . -1) #'Stem - \markup { \bold 4. { This is a stem } } + \markup { \bold 4. { This is a stem } } \default c4 \footnote \markup \concat \teeny { "sharp (v)" } #'(0 . 0.5) #'AccidentalCautionary - \markup \italic { v. A cautionary accidental } + \markup \italic { v. A cautionary accidental } \default \footnote \markup \concat \teeny { "a" } #'(0.5 . -0.5) #'TextScript - \markup \italic { a. Slow Down } + \markup \italic { a. Slow Down } \default dis?4_"rit." \breathe \footnote \markup { \teeny \musicglyph #"rests.4" } #'(1.5 . -0.25) #'BreathingSign - \markup { \null } + \markup { \null } \default } } @end lilypond diff --git a/input/regression/footnote-auto-numbering-page-reset.ly b/input/regression/footnote-auto-numbering-page-reset.ly index 5014b32cb2..ae48d86ef5 100644 --- a/input/regression/footnote-auto-numbering-page-reset.ly +++ b/input/regression/footnote-auto-numbering-page-reset.ly @@ -1,4 +1,4 @@ -\version "2.15.25" +\version "2.15.39" \header { texidoc = "This is an example of automatic footnote numbering where the number is reset on each page. It uses the symbol-footnotes @@ -24,7 +24,7 @@ have been reached. \markup { h i } \relative c' { -\footnote #'(1 . -1) #'NoteHead \markup { j } +\footnote #'(1 . -1) #'NoteHead \markup { j } \default a b c d } \pageBreak @@ -35,9 +35,9 @@ a b c d } \relative c' { d4 e - < f a-\footnote #'(1 . -1) \markup { n } c > - \footnote #'(1 . 1) #'Beam \markup { o } - \footnote #'(1 . 1) #'Hairpin \markup { p } + < f a-\footnote #'(1 . -1) \markup { n } \default c > + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c | d a b c | d a b c | diff --git a/input/regression/footnote-auto-numbering-vertical-order.ly b/input/regression/footnote-auto-numbering-vertical-order.ly index d229da8454..a7eaa23dd2 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.25" +\version "2.15.39" \header { texidoc = "This regtest makes sure that footnote numbers are laid out in the correct vertical order. @@ -32,31 +32,31 @@ in the correct vertical order. d4 e \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 0)) - < f a-\footnote #'(1 . -1) \markup { n } c > + < f a-\footnote #'(1 . -1) \markup { n } \default 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 } + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c\f | d a b c |\break d,4 e \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 6)) - < f a-\footnote #'(1 . -1) \markup { n } c > + < f a-\footnote #'(1 . -1) \markup { n } \default 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 } + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c | d a b c\f |\pageBreak d,4 e \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 12)) - < f a-\footnote #'(1 . -1) \markup { n } c > + < f a-\footnote #'(1 . -1) \markup { n } \default 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 } + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c | d a b c\! |\break } @@ -64,31 +64,31 @@ in the correct vertical order. d4 e \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 1)) - < f a-\footnote #'(1 . -1) \markup { n } c > + < f a-\footnote #'(1 . -1) \markup { n } \default 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 } + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c\f | d a b c |\break d,4 e \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 7)) - < f a-\footnote #'(1 . -1) \markup { n } c > + < f a-\footnote #'(1 . -1) \markup { n } \default 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 } + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c | d a b c\f |\pageBreak d,4 e \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 13)) - < f a-\footnote #'(1 . -1) \markup { n } c > + < f a-\footnote #'(1 . -1) \markup { n } \default 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 } + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c | d a b c\! |\break } diff --git a/input/regression/footnote-auto-numbering.ly b/input/regression/footnote-auto-numbering.ly index 11d9c276f5..4d08f2e57e 100644 --- a/input/regression/footnote-auto-numbering.ly +++ b/input/regression/footnote-auto-numbering.ly @@ -1,4 +1,4 @@ -\version "2.15.25" +\version "2.15.39" \header { texidoc = "This is an example of automatic footnote numbering where the number is not reset on each page. It uses the default @@ -40,7 +40,7 @@ footnotes. \relative c' { \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 3)) - \footnote #'(1 . -1) #'NoteHead \markup { j } + \footnote #'(1 . -1) #'NoteHead \markup { j } \default a b c d } @@ -54,11 +54,11 @@ footnotes. d4 e \once \override FootnoteItem #'numbering-assertion-function = #(lambda (grob) (make-footnote-numbering-assertion-function 5)) - < f a-\footnote #'(1 . -1) \markup { n } c > + < f a-\footnote #'(1 . -1) \markup { n } \default c > \once \override FootnoteSpanner #'numbering-assertion-function = #(simultaneous-footnote-numbering-assertion-function 6 7) - \footnote #'(1 . 1) #'Beam \markup { o } - \footnote #'(1 . 1) #'Hairpin \markup { p } + \footnote #'(1 . 1) #'Beam \markup { o } \default + \footnote #'(1 . 1) #'Hairpin \markup { p } \default a8\< [ b c d ] a4 b c | d a b c | d a b c | diff --git a/input/regression/footnote-break-visibility.ly b/input/regression/footnote-break-visibility.ly index fb49e84841..b7d045798b 100644 --- a/input/regression/footnote-break-visibility.ly +++ b/input/regression/footnote-break-visibility.ly @@ -1,4 +1,4 @@ -\version "2.15.25" +\version "2.15.39" \header { texidoc = "With grobs that have break visibility, footnotes will automatically take the break visibility of the grob being footnoted. @@ -14,12 +14,12 @@ This behavior can be overridden. { \relative c' { c1 - \footnote "foo" #'(0 . 2) #'TimeSignature "bar" + \footnote "foo" #'(0 . 2) #'TimeSignature "bar" \default \time 3/4 \break \pageBreak c2. \once \override Staff . FootnoteItem #'break-visibility = ##(#f #f #t) - \footnote "foo" #'(0 . 2) #'TimeSignature "bar" + \footnote "foo" #'(0 . 2) #'TimeSignature "bar" \default \time 4/4 \break \pageBreak c1 \bar "|." diff --git a/input/regression/footnote-footer-padding.ly b/input/regression/footnote-footer-padding.ly index 0c72c5e41f..43970a6b11 100644 --- a/input/regression/footnote-footer-padding.ly +++ b/input/regression/footnote-footer-padding.ly @@ -1,4 +1,4 @@ -\version "2.15.25" +\version "2.15.39" \header { texidoc = "The padding between a footnote and the footer can be tweaked." } @@ -11,18 +11,18 @@ \footnote \markup { \tiny 1 } #'(1 . -1) #'NoteHead - \markup { 1. Tiny space below. } + \markup { 1. Tiny space below. } \default e1 \footnote \markup { \tiny 2 } #'(1 . -1) #'NoteHead - \markup { 2. Tiny space below. } + \markup { 2. Tiny space below. } \default e1 \footnote \markup { \tiny 3 } #'(1 . -1) #'NoteHead - \markup { 3. Big space below. } + \markup { 3. Big space below. } \default e1 }} diff --git a/input/regression/footnote-spanner.ly b/input/regression/footnote-spanner.ly index c550eae244..3d0705ebdb 100644 --- a/input/regression/footnote-spanner.ly +++ b/input/regression/footnote-spanner.ly @@ -1,4 +1,4 @@ -\version "2.15.25" +\version "2.15.39" \header { texidoc = "Footnotes are annotated at the correct place, and the annotation goes to the correct page." @@ -16,7 +16,7 @@ annotation goes to the correct page." \footnote \markup { \tiny "1." } #'(0.5 . 0.5) #'Hairpin - \markup { 1. \justify { Goes to the first broken spanner. } } + \markup { 1. \justify { Goes to the first broken spanner. } } \default b4\< c d a b c d a b c d a @@ -40,7 +40,7 @@ b c d a\! \footnote \markup { \tiny "2." } #'(0.5 . 0.5) #'Hairpin - \markup { 2. \justify { Goes to the last broken spanner. } } + \markup { 2. \justify { Goes to the last broken spanner. } } \default b4\< c d a b c d a b c d a diff --git a/input/regression/footnote.ly b/input/regression/footnote.ly index 8086ecca74..4d6e2ab9a5 100644 --- a/input/regression/footnote.ly +++ b/input/regression/footnote.ly @@ -1,4 +1,4 @@ -\version "2.15.25" +\version "2.15.39" \header { texidoc = "Lilypond does footnotes." } @@ -15,7 +15,7 @@ \markup { h i } \relative c' { -\footnote \markup { \tiny 4 } #'(1 . -1) #'NoteHead \markup { 4. j } +\footnote \markup { \tiny 4 } #'(1 . -1) #'NoteHead \markup { 4. j } \default a b c d } \pageBreak @@ -26,8 +26,8 @@ a b c d } \relative c' { d4 e - < 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 } + < f a-\footnote \markup { \tiny 6 } #'(1 . -1) \markup { 6. n } \default c > + \footnote \markup { \tiny 7 } #'(1 . 1) #'Beam \markup { 7. o } \default + \footnote \markup { \tiny 8 } #'(1 . 1) #'Hairpin \markup { 8. p } \default a8\< [ b c d\f ] r2. | }} diff --git a/input/regression/in-note.ly b/input/regression/in-note.ly index a7466f9fea..6aeab18cd0 100644 --- a/input/regression/in-note.ly +++ b/input/regression/in-note.ly @@ -1,4 +1,4 @@ -\version "2.15.25" +\version "2.15.39" \header { texidoc = "LilyPond does in-notes. @@ -11,9 +11,9 @@ \repeat unfold 5 { \once \override FootnoteItem #'footnote = ##f \footnote - "" #'(0 . 0) #'NoteHead \markup { \box \fill-line { "this is a test" } } + "" #'(0 . 0) #'NoteHead \markup { \box \fill-line { "this is a test" } } \default \repeat unfold 5 { a\< b c d\! } - \footnote #'(-1 . 1) #'NoteHead "foobar" + \footnote #'(-1 . 1) #'NoteHead "foobar" \default \repeat unfold 5 { a\< b c d\! } } } -- 2.39.2