X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-hyphen-retain.ly;h=9b965b0723d94b9b219940ca42f50d4075ec46b7;hb=19520fd5bbd221ca1d35011d7710e233c92a44b0;hp=c9af3bfe0d4af9579b6f7423314b353361d64413;hpb=a3c7c76769eb5197237a1ccbfaf1aefaf90ca470;p=lilypond.git

diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index c9af3bfe0d..9b965b0723 100644
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -1,16 +1,23 @@
 \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.22"
+\version "2.14.0"
 
 \layout {
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
@@ -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
 }