From 9fb28f4db2cf0f4d302f70c4def238cd2145f329 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Tue, 21 Jan 2014 13:27:45 +0100 Subject: [PATCH] Run scripts/auxiliar/update-with-convert-ly.sh --- Documentation/de/essay/engraving.itely | 4 ++-- Documentation/es/essay/engraving.itely | 4 ++-- Documentation/essay/engraving.itely | 4 ++-- Documentation/fr/essay/engraving.itely | 4 ++-- Documentation/learning/templates.itely | 8 ++++---- Documentation/ly-examples/sesto-full.ly | 4 ++-- Documentation/ly-examples/sesto-piano.ly | 4 ++-- .../snippets/aligning-syllables-with-melisma.ly | 4 ++-- .../snippets/satb-choir-template---four-staves.ly | 10 +++++----- input/regression/hara-kiri-stanza-number.ly | 4 ++-- input/regression/lyric-combine-empty-warning.ly | 8 ++++---- input/regression/lyric-combine-new.ly | 8 ++++---- input/regression/lyric-combine-polyphonic.ly | 6 +++--- input/regression/lyric-extender-broken.ly | 4 ++-- input/regression/lyric-extender-completion.ly | 4 ++-- input/regression/lyric-phrasing.ly | 4 ++-- input/regression/lyrics-after-grace.ly | 4 ++-- input/regression/lyrics-melisma-beam.ly | 4 ++-- input/regression/midi-lyric-barcheck.ly | 4 ++-- input/regression/morgenlied.ly | 6 +++--- .../page-spacing-nonstaff-lines-and-markup.ly | 4 ++-- .../page-spacing-nonstaff-lines-independent.ly | 4 ++-- input/regression/song-melisma.ly | 4 ++-- input/regression/song-repetition.ly | 8 ++++---- input/regression/span-bar-allow-span-bar.ly | 8 ++++---- input/regression/typography-demo.ly | 6 +++--- 26 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Documentation/de/essay/engraving.itely b/Documentation/de/essay/engraving.itely index 0affa3b9e5..b750abd188 100644 --- a/Documentation/de/essay/engraving.itely +++ b/Documentation/de/essay/engraving.itely @@ -9,7 +9,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.30" +@c \version "2.19.2" @c Translators: Till Paala @@ -919,7 +919,7 @@ collide = \once \override NoteColumn.force-hshift = #0 \new Voice { \voiceTwo bes \collide bes } >> } - \new Lyrics \lyricsto "sample" \lyricmode { "good " " bad" } + \new Lyrics \lyricsto "sample" { "good " " bad" } >> } @end lilypond diff --git a/Documentation/es/essay/engraving.itely b/Documentation/es/essay/engraving.itely index 4dd535f1e8..a926cb5b32 100644 --- a/Documentation/es/essay/engraving.itely +++ b/Documentation/es/essay/engraving.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.30" +@c \version "2.19.2" @node Grabado musical @chapter Grabado musical @@ -922,7 +922,7 @@ collide = \once \override NoteColumn.force-hshift = #0 \new Voice { \voiceTwo bes \collide bes } >> } - \new Lyrics \lyricsto "sample" \lyricmode { "bien " " mal" } + \new Lyrics \lyricsto "sample" { "bien " " mal" } >> } @end lilypond diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely index 16f3518d56..c27c0f7b0e 100644 --- a/Documentation/essay/engraving.itely +++ b/Documentation/essay/engraving.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.30" +@c \version "2.19.2" @node Music engraving @chapter Music engraving @@ -860,7 +860,7 @@ collide = \once \override NoteColumn.force-hshift = #0 \new Voice { \voiceTwo bes \collide bes } >> } - \new Lyrics \lyricsto "sample" \lyricmode { "good " " bad" } + \new Lyrics \lyricsto "sample" { "good " " bad" } >> } @end lilypond diff --git a/Documentation/fr/essay/engraving.itely b/Documentation/fr/essay/engraving.itely index 1a71ee2876..2c0ad5209f 100644 --- a/Documentation/fr/essay/engraving.itely +++ b/Documentation/fr/essay/engraving.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.17.30" +@c \version "2.19.2" @c Translators: Jean-Charles Malahieude, John Mandereau, Gauvain Pocentek @@ -934,7 +934,7 @@ collide = \once \override NoteColumn.force-hshift = #0 \new Voice { \voiceTwo bes \collide bes } >> } - \new Lyrics \lyricsto "sample" \lyricmode { "bien " " mauvais" } + \new Lyrics \lyricsto "sample" { "bien " " mauvais" } >> } @end lilypond diff --git a/Documentation/learning/templates.itely b/Documentation/learning/templates.itely index 172fa476ab..cc35e50da7 100644 --- a/Documentation/learning/templates.itely +++ b/Documentation/learning/templates.itely @@ -8,7 +8,7 @@ Guide, node Updating translation committishes.. @end ignore -@c \version "2.18.0" +@c \version "2.19.2" @node Templates @appendix Templates @@ -106,11 +106,11 @@ parts: @lilypond[verbatim, quote] SopranoMusic = \relative { a'4 a a a } - SopranoLyricsOne = \lyricsto "Soprano" \lyricmode { + SopranoLyricsOne = \lyricsto "Soprano" { \set stanza = "1." Words to verse one } - SopranoLyricsTwo = \lyricsto "Soprano" \lyricmode { + SopranoLyricsTwo = \lyricsto "Soprano" { \set stanza = "2." Words to verse two } @@ -417,7 +417,7 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print @ The `line-width' is for \header. @li lypond[quote,verbatim,ragged-right,line-width] -\version "2.16.0" +\version "2.19.2" \header { dedication = "dedication" title = "Title" diff --git a/Documentation/ly-examples/sesto-full.ly b/Documentation/ly-examples/sesto-full.ly index 6f10964616..52c6327349 100644 --- a/Documentation/ly-examples/sesto-full.ly +++ b/Documentation/ly-examples/sesto-full.ly @@ -4,7 +4,7 @@ %%% %%% Nicolas Sceaux -\version "2.16.0" +\version "2.19.2" \include "sesto.ily" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -34,7 +34,7 @@ \set Staff.instrumentName = \markup \smallCaps Sesto. \global \clef treble \sesto >> - \lyricsto "sesto" \new Lyrics \sestoLyrics + \new Lyrics \lyricsto "sesto" \sestoLyrics >> \new Staff << \set Staff.instrumentName = "Bassi." diff --git a/Documentation/ly-examples/sesto-piano.ly b/Documentation/ly-examples/sesto-piano.ly index 286746b16d..223040e600 100644 --- a/Documentation/ly-examples/sesto-piano.ly +++ b/Documentation/ly-examples/sesto-piano.ly @@ -4,7 +4,7 @@ %%% %%% Nicolas Sceaux -\version "2.16.0" +\version "2.19.2" \include "sesto.ily" %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -25,7 +25,7 @@ \set Staff.instrumentName = \markup \smallCaps Sesto. \global \clef treble \sesto >> - \lyricsto "sesto" \new Lyrics \sestoLyrics + \new Lyrics \lyricsto "sesto" \sestoLyrics >> \new PianoStaff << \new Staff << diff --git a/Documentation/snippets/aligning-syllables-with-melisma.ly b/Documentation/snippets/aligning-syllables-with-melisma.ly index 7acef57d56..ae3f731ed2 100644 --- a/Documentation/snippets/aligning-syllables-with-melisma.ly +++ b/Documentation/snippets/aligning-syllables-with-melisma.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.19.2" \header { lsrtags = "text, vocal-music" @@ -29,7 +29,7 @@ their note. The alignment can be altered using the c d~^\markup "reset to default" d e } } - \new Lyrics \lyricsto "vocal" \lyricmode { + \new Lyrics \lyricsto "vocal" { word word word \set lyricMelismaAlignment = #RIGHT word word word diff --git a/Documentation/snippets/satb-choir-template---four-staves.ly b/Documentation/snippets/satb-choir-template---four-staves.ly index 99d40cc6c6..8df4962101 100644 --- a/Documentation/snippets/satb-choir-template---four-staves.ly +++ b/Documentation/snippets/satb-choir-template---four-staves.ly @@ -4,7 +4,7 @@ %% and then run scripts/auxiliar/makelsr.py %% %% This file is in the public domain. -\version "2.16.0" +\version "2.19.2" \header { lsrtags = "template, vocal-music" @@ -48,28 +48,28 @@ basswords = \lyricmode { mi mi mi mi } \global \sopranonotes >> - \lyricsto "soprano" \new Lyrics \sopranowords + \new Lyrics \lyricsto "soprano" \sopranowords >> \new Staff << \new Voice = "alto" << \global \altonotes >> - \lyricsto "alto" \new Lyrics \altowords + \new Lyrics \lyricsto "alto" \altowords >> \new Staff << \new Voice = "tenor" << \global \tenornotes >> - \lyricsto "tenor" \new Lyrics \tenorwords + \new Lyrics \lyricsto "tenor" \tenorwords >> \new Staff << \new Voice = "bass" << \global \bassnotes >> - \lyricsto "bass" \new Lyrics \basswords + \new Lyrics \lyricsto "bass" \basswords >> >> } diff --git a/input/regression/hara-kiri-stanza-number.ly b/input/regression/hara-kiri-stanza-number.ly index 66d2bae701..382cb37a20 100644 --- a/input/regression/hara-kiri-stanza-number.ly +++ b/input/regression/hara-kiri-stanza-number.ly @@ -11,14 +11,14 @@ lines." ragged-right = ##T } -\version "2.16.0" +\version "2.19.2" << \new Voice = melody \relative c'{ r2 r4 r8 e8 |\break e16 e8. } - \lyricsto "melody" \lyrics { + \new Lyrics \lyricsto "melody" { \set stanza = "Verse 2." _ bla bla } >> diff --git a/input/regression/lyric-combine-empty-warning.ly b/input/regression/lyric-combine-empty-warning.ly index 5c35ed00a2..2f38988243 100644 --- a/input/regression/lyric-combine-empty-warning.ly +++ b/input/regression/lyric-combine-empty-warning.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" #(ly:set-option 'warning-as-error #f) #(ly:expect-warning (ly:translate-cpp-warning-scheme "cannot find Voice `%s'") "not-existing-notes") @@ -17,9 +17,9 @@ no warning should be printed." c1 } % This should not give a warning (empty lyrics, existing voice): - \new Lyrics \lyricsto "notes" \lyricmode { } + \new Lyrics \lyricsto "notes" { } % This should give a warning (non-existing voice): - \new Lyrics \lyricsto "not-existing-notes" \lyricmode { Test } + \new Lyrics \lyricsto "not-existing-notes" { Test } % This should NOT give a warning (non-existing voice, but also no lyrics): - \new Lyrics \lyricsto "not-existing-notes" \lyricmode { } + \new Lyrics \lyricsto "not-existing-notes" { } >> diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index 053a23e1c4..b01227ac9a 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc = "With the @code{\\lyricsto} mechanism, individual lyric lines can be associated with one melody line. Each lyric line @@ -11,8 +11,8 @@ can be tuned to either follow or ignore melismata." \autoBeamOff c2( d4) e8[ c b c] f4 } - \lyricsto "bla" \new Lyrics { bla ab blob blob } - \lyricsto "bla" \new Lyrics { + \new Lyrics \lyricsto "bla" { bla ab blob blob } + \new Lyrics \lyricsto "bla" { bla \set ignoreMelismata = ##t @@ -26,7 +26,7 @@ can be tuned to either follow or ignore melismata." blob } - \lyricsto "bla" \new Lyrics { + \new Lyrics \lyricsto "bla" { nes ted lyrics voice with more words than no tes } >> diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 16285dd6cf..0f979840da 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc ="Polyphonic rhythms and rests do not disturb @@ -21,14 +21,14 @@ bes'4 bes'4 bes'4 bes'4 } - \lyricsto "one" \context Lyrics = sop { + \context Lyrics = sop \lyricsto "one" { Do mi nus ex } \new Voice = "two" { \voiceTwo ees'8 r8 r8 r8 ees' r8 r8 r8 } - \lyricsto "two" \new Lyrics { + \new Lyrics \lyricsto "two" { Do na } >> diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly index 7d36a12335..0919bfcbbf 100644 --- a/input/regression/lyric-extender-broken.ly +++ b/input/regression/lyric-extender-broken.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { @@ -18,6 +18,6 @@ of the melisma." a) a2( b) \break a2 } - \lyricsto A \context Lyrics \lyricmode { a __ a __ ha } + \context Lyrics \lyricsto A { a __ a __ ha } >> diff --git a/input/regression/lyric-extender-completion.ly b/input/regression/lyric-extender-completion.ly index fbe84a5422..66e744594a 100644 --- a/input/regression/lyric-extender-completion.ly +++ b/input/regression/lyric-extender-completion.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { @@ -16,6 +16,6 @@ d | } } -\new Lyrics \lyricsto "upper" \lyricmode { Ah __ } +\new Lyrics \lyricsto "upper" { Ah __ } >> diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index ab24aa3b22..3d16224aeb 100644 --- a/input/regression/lyric-phrasing.ly +++ b/input/regression/lyric-phrasing.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc = " @@ -20,7 +20,7 @@ d16[ e f g] } - \lyricsto "bla" \context Lyrics \lyricmode { + \context Lyrics \lyricsto "bla" { alllll __ tijd izzz } diff --git a/input/regression/lyrics-after-grace.ly b/input/regression/lyrics-after-grace.ly index dafbe7d976..ccc72ac186 100644 --- a/input/regression/lyrics-after-grace.ly +++ b/input/regression/lyrics-after-grace.ly @@ -5,7 +5,7 @@ } -\version "2.16.0" +\version "2.19.2" \paper { ragged-right = ##t } @@ -15,5 +15,5 @@ \new Voice = "myVoice" { \afterGrace c''2 { e''32( } c''2) }} - \new Lyrics \lyricsto "myVoice" \lyricmode { foo -- bar } + \new Lyrics \lyricsto "myVoice" { foo -- bar } >> diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index ba811ed8a9..b3f99228b6 100644 --- a/input/regression/lyrics-melisma-beam.ly +++ b/input/regression/lyrics-melisma-beam.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc = "Melismata are triggered by manual beams. Notes in a @@ -16,7 +16,7 @@ \set Staff.autoBeaming = ##f g4 d8[ b8 d8 g8] g4 } - \lyricsto "" \new Lyrics \lyricmode { bla blaa -- bla } + \new Lyrics \lyricsto "" { bla blaa -- bla } >> diff --git a/input/regression/midi-lyric-barcheck.ly b/input/regression/midi-lyric-barcheck.ly index 16c658e1e9..84790d7be2 100644 --- a/input/regression/midi-lyric-barcheck.ly +++ b/input/regression/midi-lyric-barcheck.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc = "Lyrics in MIDI are aligned to ties and beams: @@ -17,7 +17,7 @@ this examples causes no bar checks in MIDI. c1 } - \lyricsto "A" \lyrics { bla bla | bla bla | bla bla | bla } + \new Lyrics \lyricsto "A" { bla bla | bla bla | bla bla | bla } >> \layout {} \midi {} diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly index 2a2e93dca3..00a8c78cff 100644 --- a/input/regression/morgenlied.ly +++ b/input/regression/morgenlied.ly @@ -27,7 +27,7 @@ been lowered } -\version "2.17.6" +\version "2.19.2" manuscriptBreak = { \break } @@ -157,8 +157,8 @@ pianoLH = \relative c'' \repeat volta 2 { \new Staff << \context Staff \accidentalStyle modern \melody >> - \lyricsto "singer" \new Lyrics \firstVerse - \lyricsto "singer" \new Lyrics \secondVerse + \new Lyrics \lyricsto "singer" \firstVerse + \new Lyrics \lyricsto "singer" \secondVerse \new PianoStaff << \set PianoStaff.instrumentName = \markup { \bold diff --git a/input/regression/page-spacing-nonstaff-lines-and-markup.ly b/input/regression/page-spacing-nonstaff-lines-and-markup.ly index 1f7f6ef350..c0b32e8af0 100644 --- a/input/regression/page-spacing-nonstaff-lines-and-markup.ly +++ b/input/regression/page-spacing-nonstaff-lines-and-markup.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc = "Having markup after a non-staff line doesn't confuse @@ -13,7 +13,7 @@ the page layout engine." \new Staff << \new Voice = "asdf" { c' d' e' f' } >> - \new Lyrics \lyricsto "asdf" \lyricmode { a b c d } + \new Lyrics \lyricsto "asdf" { a b c d } >> } \markup "next song" diff --git a/input/regression/page-spacing-nonstaff-lines-independent.ly b/input/regression/page-spacing-nonstaff-lines-independent.ly index 96f1c1df12..43a01b7d5a 100644 --- a/input/regression/page-spacing-nonstaff-lines-independent.ly +++ b/input/regression/page-spacing-nonstaff-lines-independent.ly @@ -1,4 +1,4 @@ -\version "2.17.6" +\version "2.19.2" \header { texidoc = "Spacing rules between Staves coexist with rules affecting @@ -12,7 +12,7 @@ staves is larger than the @code{padding} for associated lyrics." \new Staff = "bass" \new Voice = "b" { \clef bass c2 c' } \new Lyrics \with { alignAboveContext = "bass" - } \lyricsto "b" \lyricmode { bass \skip2 } + } \lyricsto "b" { bass \skip2 } >> \layout { \context { diff --git a/input/regression/song-melisma.ly b/input/regression/song-melisma.ly index 6a597cb1c4..00949e9f36 100644 --- a/input/regression/song-melisma.ly +++ b/input/regression/song-melisma.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc="Festival song synthesis output supports melismas. @@ -18,7 +18,7 @@ melismas. \melismaEnd e2 } - \lyricsto "lala" \new Lyrics { + \new Lyrics \lyricsto "lala" { la di __ daah } >> diff --git a/input/regression/song-repetition.ly b/input/regression/song-repetition.ly index 1f9ce28c07..3a8a9f718b 100644 --- a/input/regression/song-repetition.ly +++ b/input/regression/song-repetition.ly @@ -1,4 +1,4 @@ -\version "2.16.0" +\version "2.19.2" \header { texidoc="Festival song synthesis output supports repeat signs. @@ -13,12 +13,12 @@ repeat signs. c2 e4 r4 | g2 e | c1 | \context Voice = verse \repeat volta 2 {c4 d e f | g1 | } a2 b | c1} - \lyricsto melody \context Lyrics = mainlyrics \lyricmode { + \context Lyrics = mainlyrics \lyricsto melody { do mi sol mi do la si do } - \lyricsto verse \context Lyrics = mainlyrics \lyricmode { + \context Lyrics = mainlyrics \lyricsto verse { do re mi fa sol } - \lyricsto verse \context Lyrics = repeatlyrics \lyricmode { + \context Lyrics = repeatlyrics \lyricsto verse { dodo rere mimi fafa solsol } >> } diff --git a/input/regression/span-bar-allow-span-bar.ly b/input/regression/span-bar-allow-span-bar.ly index c6fe94815b..d1525438dc 100644 --- a/input/regression/span-bar-allow-span-bar.ly +++ b/input/regression/span-bar-allow-span-bar.ly @@ -1,5 +1,5 @@ -\version "2.17.6" +\version "2.19.2" \header { texidoc = "The @code{SpanBarStub} grob takes care of horizontal spacing @@ -24,7 +24,7 @@ span bar were not there. \once \override Staff.BarLine.allow-span-bar = ##f c2 c c c } - \new Lyrics \lyricsto "upper" \lyricmode { + \new Lyrics \lyricsto "upper" { long-syllable a b c long-syllable a b c long-syllable a b c long-syllable a b c } @@ -38,7 +38,7 @@ span bar were not there. \once \override Staff.BarLine.allow-span-bar = ##f c2 c c c } - \new Lyrics \lyricsto "middle" \lyricmode { + \new Lyrics \lyricsto "middle" { syllable a b c syllable a b c syllable a b c syllable a b c } @@ -51,7 +51,7 @@ span bar were not there. c2 c c c c2 c c c } - \new Lyrics \lyricsto "lower" \lyricmode { + \new Lyrics \lyricsto "lower" { word a b c word a b c word a b c word a b c } diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly index 92bab85643..7cc98d500f 100644 --- a/input/regression/typography-demo.ly +++ b/input/regression/typography-demo.ly @@ -8,7 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert" } -\version "2.17.6" +\version "2.19.2" #(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI.")) ignoreMelisma = \set ignoreMelismata = ##t @@ -127,8 +127,8 @@ pianoLH = \relative c'' \repeat volta 2\new Voice { } << \context Staff \accidentalStyle modern \melody >> - \lyricsto "singer" \new Lyrics \firstVerse - \lyricsto "singer" \new Lyrics \secondVerse + \new Lyrics \lyricsto "singer" \firstVerse + \new Lyrics \lyricsto "singer" \secondVerse \new PianoStaff << \set PianoStaff.instrumentName = \markup { \bold -- 2.39.2