From 25110470652ac8871f5c1852538e0f8b1a4d620d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 8 Dec 2005 13:27:30 +0000 Subject: [PATCH] renew. --- ChangeLog | 2 + Documentation/topdocs/NEWS.tely | 5 ++ input/regression/lyric-hyphen-retain.ly | 75 +++++++++---------------- 3 files changed, 34 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 643bebc3fa..684f3c8e7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-12-08 Han-Wen Nienhuys + * input/regression/lyric-hyphen-retain.ly: renew. + * scm/define-grobs.scm (all-grob-descriptions): add LyricSpace grob diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 069dbd931e..7ee4c2c2df 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -45,6 +45,11 @@ This document is also available in @uref{NEWS.pdf,PDF}. @itemize @bullet +@item Spaces between lyrics and distance between syllables with +hyphens may now be separately tuned. + +This feature has been sponsored by Bertalan Fodor. + @item A MusicXML importer is included now. @item Texts set in a TrueType font are now kerned. This requires CVS diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly index d066169fcc..6b3a2ede6d 100644 --- a/input/regression/lyric-hyphen-retain.ly +++ b/input/regression/lyric-hyphen-retain.ly @@ -1,59 +1,38 @@ - -\version "2.7.14" - \header { - texidoc = "In tightly engraved music, hyphens are removed, except at the -end of the line. Normally, lyrics are not typeset so tightly, but by -tuning down @code{padding} of in @code{SeparationItem}, syllables are put -closer together, and as a result hyphens may disappear. - -In some languages (e.g. German and Hungarian), hyphens should not -disappear, since spelling depends on hyphenation. For that purpose, -hyphens can be forced to remain setting @code{spacing-procedure} to -@code{Hyphen_spanner::set_spacing_rods} of the @code{LyricHyphen} -grob. The @code{minimum-length} property may be used to tune the -amount - -" + texidoc = "The minimum distance between lyrics are determined by the +@code{minimum-distance} of @code{LyricHyphen} and +@code{LyricSpace}. The hyphen is omitted when it would be shorter than +its @code{minimum-length} setting." } +\version "2.7.22" -<< - \new Staff \relative c'' { - \time 1/4 c16[ c c c] - \time 1/4 - c16[ c c c] - \time 1/4 - c16[ c c c] - - } - \new Lyrics \with { - % Otherwise lyrics are so far apart that hyphens don't disappear - \override SeparationItem #'padding = #0.0 +\layout { + \context { + \Lyrics + \remove Separating_line_group_engraver } - \lyricmode { - bla -- bla -- bla -- bla -- - bla -- bla -- bla -- bla -- - \override LyricHyphen #'minimum-length = #0.7 - \override LyricHyphen #'springs-and-rods = - #Hyphen_spanner::set_spacing_rods + raggedright = ##t +} - bla -- bla -- bla -- bla - } ->> - \layout { - indent = 0.0 \cm - linewidth = 3.4 \cm - - \context { - \Staff \remove "Time_signature_engraver" - } - - } - - +{ + \time 2/4 + c32 c c c + c32 c c c + c32 c c c + c32 c c c + c32 c c c +} +\addlyrics +{ + syl -- lab word + \once \override LyricHyphen #'minimum-distance = #0.0 + syl -- lab word + \override LyricSpace #'minimum-distance = #0.0 + syl -- lab word +} -- 2.39.5