From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 8 Dec 2005 13:47:26 +0000 (+0000)
Subject: * input/regression/lyric-hyphen-retain.ly: renew.
X-Git-Tag: release/2.7.22~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a3c7c76769eb5197237a1ccbfaf1aefaf90ca470;p=lilypond.git

* 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 7ee4c2c2df..7bbb596369 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -46,7 +46,8 @@ 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.
+hyphens may now be separately tuned through the
+@internalsref{LyricSpace} grob.
 
 This feature has been sponsored by Bertalan Fodor.
 
diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 29fa05754d..f33aa41814 100644
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -880,7 +880,7 @@ combination of a backslash followed by one of @code{`}, @code{'},
 
 @seealso
 
-Program reference: @internalsref{LyricText}.
+Program reference: @internalsref{LyricText}, @internalsref{LyricSpace}.
 
 @refbugs
 
@@ -903,42 +903,10 @@ indicated with a horizontal line centered between a syllable and the
 next one.  Such a line is called an extender line, and it is entered as
 `@code{__}'.
 
-In tighly engraved music, hyphens can be removed.  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 by overriding @code{minimum-length} of
-the @code{LyricHyphen} grob.
-
-@lilypond[quote,verbatim,raggedright]
-\score {
- <<
-  \new Staff \relative c'' {
-    \time 1/4 c16 c c c c16 c c c c16 c c c
-  }
-  \lyricmode { \new Lyrics
-    \with {
-      \override SeparationItem #'padding = #0.0
-      % Otherwise lyrics are so far apart that hyphens don't disappear
-    } 
-    {
-      An -- ti -- cons -- ti --
-      tu -- tion -- nel -- le --
-      \override LyricHyphen  #'minimum-length = #0.7
-      \override LyricHyphen  #'springs-and-rods =
-        #Hyphen_spanner::set_spacing_rods
-      men -- taire -- ment. ouf~!
-    }
-  }
- >>
- \layout   {
-  indent = 0.0 \cm
-  linewidth = 3.4 \cm
-  \context {
-    \Staff \remove "Time_signature_engraver"
-  }
- }
-}
-@end lilypond
+In tighly engraved music, hyphens can be removed.  Whether this
+happens can be controlled with the @code{minimum-distance} (minimum
+distance between two syllables) and the @code{minimum-length}
+(threshold below which hyphens are removed).
 
 @seealso
 
diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index 6b3a2ede6d..c9af3bfe0d 100644
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -10,17 +10,11 @@ its @code{minimum-length} setting."
 \version "2.7.22"
 
 \layout {
-  \context {
-    \Lyrics
-    \remove Separating_line_group_engraver
-  }
-
   raggedright = ##t
 }
 
 
-
-{
+\relative c'' {
   \time 2/4
   c32 c c c 
   c32 c c c 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 7528f93ef6..f9cc03ebdd 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -879,7 +879,7 @@
 	(dash-period . 10.0)
 	(length . 0.66)
 	(minimum-length . 0.3)
-	(minimum-distance . 0.5)
+	(minimum-distance . 0.1)
 	(padding . 0.07)
 	(springs-and-rods . ,Hyphen_spanner::set_spacing_rods)