elaborate explanation.

diff --git a/ChangeLog b/ChangeLog
index cb464d65da39dc0b74eb3ade94148bb359540ee2..e5bcd60abdd8038d6eb5cbd6ffc793b2be220cfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-03-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * input/regression/lyric-hyphen-retain.ly: elaborate explanation.
+
        * scripts/abc2ly.py (option_parser): update to 2.7.40
 
 2006-03-20  Graham Percival  <gpermus@gmail.com>

diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index 0731b194111fceb9758c5942894578eed011531f..9f954cb82c4670952b87664af3317bc3d45fe63a 100644 (file)
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -2,8 +2,15 @@
 
   texidoc = "The minimum distance between lyrics are 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."
 
 }
 
@@ -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
 }

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index d2c5408bb12f9429f254d19295e3a0404ca10567..1d10225b4d64c94c2383aad2e37d45c3702182c0 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -803,6 +803,17 @@
                 (interfaces . (line-interface
                                tuplet-bracket-interface))))))
 
+
+    (LyricExtender
+     . (
+       (stencil . ,ly:lyric-extender::print)
+       (thickness . 0.8) ; line-thickness
+       (minimum-length . 1.5)
+       (Y-extent . (0 . 0))
+       (meta . ((class . Spanner)
+                (interfaces . (lyric-interface
+                               lyric-extender-interface))))))
+
     (LyricHyphen
      . (
        (thickness . 1.3)
@@ -821,18 +832,8 @@
                                lyric-hyphen-interface
                                spanner-interface))))))
 
-    (LyricExtender
-     . (
-       (stencil . ,ly:lyric-extender::print)
-       (thickness . 0.8) ; line-thickness
-       (minimum-length . 1.5)
-       (Y-extent . (0 . 0))
-       (meta . ((class . Spanner)
-                (interfaces . (lyric-interface
-                               lyric-extender-interface))))))
-
     (LyricSpace
-     . ((minimum-distance . 0.3)
+     . ((minimum-distance . 0.45)
        (springs-and-rods . ,ly:hyphen-spanner::set-spacing-rods)
        (padding . 0.0)
        (Y-extent . #f)
@@ -1059,12 +1060,10 @@
     (PaperColumn
      . (
        (axes . (0))
-
        (before-line-breaking . ,ly:paper-column::before-line-breaking)
        ;; (stencil . ,ly:paper-column::print)
        (X-extent . ,ly:axis-group-interface::width)
        
-
        ;; debugging
        ;;                       (font-size . -6) (font-name . "sans") (Y-extent . #f)
        (meta . ((class . Paper_column)
@@ -1073,14 +1072,13 @@
                                spaceable-grob-interface))))))
 
     (ParenthesesItem
-     . (
-       (stencil . ,parentheses-item::print)
+     . ((stencil . ,parentheses-item::print)
        (font-size . -6)
        (padding . 0.2)
        (meta . ((class . Item)
                 (interfaces . (parentheses-interface font-interface))))
-       
-             ))
+       ))
+    
     (PhrasingSlur
      . ((details . ,default-slur-details)
        (control-points . ,ly:slur::calc-control-points)