* lily/syllable-group.cc (set_lyric_align): Only fiddle with

       alignment if a note has more than a single lyric so single stanza
       songs are aligned correctly.

diff --git a/ChangeLog b/ChangeLog
index 41f707536c863ab2a9c31473fe271a840ba201e2..2984d261b6b2811bbfedd9ebb1228ee31013eb63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-28  Glen Prideaux  <gprideau@odyssey.apana.org.au>
+       
+       * lily/syllable-group.cc (set_lyric_align): Only fiddle with
+       alignment if a note has more than a single lyric so single stanza
+       songs are aligned correctly.
+
 2002-07-28  Han-Wen  <hanwen@cs.uu.nl>
 
        * input/test/broken-spanner-adjustment.ly: new file.

diff --git a/VERSION b/VERSION
index b6fa0d3fc4c39c05dd0cff912e9c1e82942a5103..73c98f4535667e99d74a608b19e1c128ff42a836 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=70
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=gp1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/syllable-group.cc b/lily/syllable-group.cc
index 0c180e78e7419b6075dbfa6b5fc5689d296781a6..1650fd94afd2805bf98cda3c288fbce1d5a5da63 100644 (file)
--- a/lily/syllable-group.cc
+++ b/lily/syllable-group.cc
@@ -97,8 +97,8 @@ Syllable_group::add_extender (Grob * extender)
 bool 
 Syllable_group::set_lyric_align (const char *punc, Grob *default_notehead)
 {
-  if (lyric_list_.size ()==0) {
-    // No lyrics: nothing to do.
+  if (lyric_list_.size ()<=1) {
+    // No lyrics or single line: nothing to do.
     return true;
   }