From d818c79b329b1704b28d19f9235107ede4872e9e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 19 Apr 2004 16:27:29 +0000 Subject: [PATCH] *** empty log message *** --- input/regression/lyric-combine-new.ly | 10 ++++++---- input/regression/lyric-combine-polyphonic.ly | 11 +++++------ input/regression/lyric-hyphen-break.ly | 2 +- input/test/lyric-hyphen-retain.ly | 18 ++++++++++-------- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index 9dfb95e12b..0e1568b20b 100644 --- a/input/regression/lyric-combine-new.ly +++ b/input/regression/lyric-combine-new.ly @@ -13,8 +13,8 @@ \autoBeamOff c2( d4) e8[ c b c] f4 } - \lyricsto "bla" \lyrics \new Lyrics { bla ab blob blob } - \lyricsto "bla" \lyrics \new Lyrics { + \lyricsto "bla" \new Lyrics \lyrics { bla ab blob blob } + \lyricsto "bla" \new Lyrics \lyrics { bla \set ignoreMelismata = ##t @@ -28,6 +28,8 @@ blob } - \lyricsto "bla" \lyrics \new Lyrics { nes ted lyrics voice with more words than no tes } >> - + \lyricsto "bla" \new Lyrics \lyrics { + 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 848e52e7f3..872b87a72c 100644 --- a/input/regression/lyric-combine-polyphonic.ly +++ b/input/regression/lyric-combine-polyphonic.ly @@ -21,13 +21,12 @@ texidoc ="Polyphonic rhythms and rests do not disturb \voiceTwo ees'8 r8 r8 r8 ees' r8 r8 r8 } - \lyricsto "two" \lyrics \new Lyrics { - Do na + \lyricsto "two" \new Lyrics \lyrics { + Do na } - \lyrics \lyricsto "one" \new Lyrics - { - Do mi nus ex - } + \lyricsto "one" \new Lyrics \lyrics { + Do mi nus ex + } >> } \paper { raggedright = ##t} diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index fb109c5914..9e8cd19279 100644 --- a/input/regression/lyric-hyphen-break.ly +++ b/input/regression/lyric-hyphen-break.ly @@ -15,7 +15,7 @@ c16[ c c c] r c16[ c c] } - \lyrics \new Lyrics { + \new Lyrics \lyrics { bla16 -- bla -- bla -- bla -- bla -- bla -- bla -- bla8 -- bla16 -- bla -- bla diff --git a/input/test/lyric-hyphen-retain.ly b/input/test/lyric-hyphen-retain.ly index e630e4e84f..f2484e4fd9 100644 --- a/input/test/lyric-hyphen-retain.ly +++ b/input/test/lyric-hyphen-retain.ly @@ -24,15 +24,17 @@ c16[ c c c] c16[ c c c] } - \lyrics \new Lyrics \with { + \new Lyrics \with { % Otherwise lyrics are so far apart that hyphens don't disappear - \override SeparationItem #'padding = #0.0 - }{ bla -- bla -- bla -- bla -- - bla -- bla -- bla -- bla -- - - \override LyricHyphen #'minimum-length = #0.7 - \override LyricHyphen #'spacing-procedure = - #Hyphen_spanner::set_spacing_rods + \override SeparationItem #'padding = #0.0 + } + \lyrics { + bla -- bla -- bla -- bla -- + bla -- bla -- bla -- bla -- + + \override LyricHyphen #'minimum-length = #0.7 + \override LyricHyphen #'spacing-procedure = + #Hyphen_spanner::set_spacing_rods bla -- bla -- bla -- bla }>> -- 2.39.5