X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-hyphen-retain.ly;h=787e313a9e6e84efc3a4db1a6c785b2cd4d9140a;hb=49f9b097ce73335f8a6b3436c43df1aed8a77288;hp=6b3a2ede6d7c9301565780879df5cf2834bc413e;hpb=25110470652ac8871f5c1852538e0f8b1a4d620d;p=lilypond.git

diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index 6b3a2ede6d..787e313a9e 100644
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -1,26 +1,27 @@
 \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.11.51"
 
 \layout {
-  \context {
-    \Lyrics
-    \remove Separating_line_group_engraver
-  }
-
-  raggedright = ##t
+  ragged-right = ##t
 }
 
 
-
-{
+\relative c'' {
   \time 2/4
   c32 c c c 
   c32 c c c 
@@ -30,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
 }