X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-hyphen-retain.ly;h=c19d42a2adcc70c06a7c527b506a7d98a9ac7442;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=0731b194111fceb9758c5942894578eed011531f;hpb=2205ef7a616d73e6a83274816e775426bf41b7bd;p=lilypond.git diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly index 0731b19411..c19d42a2ad 100644 --- a/input/regression/lyric-hyphen-retain.ly +++ b/input/regression/lyric-hyphen-retain.ly @@ -1,22 +1,29 @@ \header { - texidoc = "The minimum distance between lyrics are determined by the + texidoc = "The minimum distance between lyrics is 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." +@code{LyricSpace}. + +The ideal length of a hyphen is determined by its @code{length} +property, but it may be shortened down to @code{minimum-length} in +tight situations. If in this it still does not fit, the hyphen will be +omitted. + +Like all overrides within @code{\\lyricsto} and @code{\\addlyrics}, the +effect of a setting is delayed is one syllable." } -\version "2.7.39" +\version "2.19.21" \layout { ragged-right = ##t } -\relative c'' { +\relative { \time 2/4 - c32 c c c + c''32 c c c c32 c c c c32 c c c c32 c c c @@ -24,9 +31,14 @@ its @code{minimum-length} setting." } \addlyrics { - syl -- lab word - \once \override LyricHyphen #'minimum-distance = #0.0 - syl -- lab word - \override LyricSpace #'minimum-distance = #0.0 - syl -- lab word + %% tight spacing: hyphen disappears + syl -- lab word + + %% increase minimum-distance: forces more space, so hyphen reappears + \override LyricHyphen.minimum-distance = #1.0 + syl -- lab word + + %% minimum-distance 0 for LyricSpace: this places words next to each other. + \override LyricSpace.minimum-distance = #0.0 + syl -- lab word }