Run scripts/auxiliar/update-with-convert-ly.sh

[lilypond.git] / input / regression / lyric-hyphen-retain.ly

diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index d10aa84285ac487a15eb3a196d86682866331ec6..c19d42a2adcc70c06a7c527b506a7d98a9ac7442 100644 (file)
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -1,59 +1,44 @@
+\header {
 
-\version "2.6.0"
+  texidoc = "The minimum distance between lyrics is determined by the
+@code{minimum-distance} of @code{LyricHyphen} and
+@code{LyricSpace}.
 
-\header {
+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.
 
-  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.
+Like all overrides within @code{\\lyricsto} and @code{\\addlyrics}, the
+effect of a setting is delayed is one syllable."
 
-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
+}
 
-"
+\version "2.19.21"
 
+\layout {
+  ragged-right = ##t
 }
 
 
-<<
-  \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
-  }
-  \lyricmode {
-    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 
-  }
->>
-  \layout   {
-    indent = 0.0 \cm
-    linewidth = 3.4 \cm
-
-    \context {
-      \Staff \remove "Time_signature_engraver"
-    }
-    
-  }
-  
-
-
-  
+\relative {
+  \time 2/4
+  c''32 c c c 
+  c32 c c c 
+  c32 c c c 
+  c32 c c c 
+  c32 c c c 
+}
+\addlyrics
+{
+  %% 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
+}