From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 23 Sep 2004 19:43:02 +0000 (+0000)
Subject: * input/regression/lyric-extender.ly: Fix and add test.
X-Git-Tag: release/2.3.19~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c25ee470e74011bda8c19fbc6d52f293cf179355;p=lilypond.git

* input/regression/lyric-extender.ly: Fix and add test.

* lily/extender-engraver.cc (stop_translation_timestep): Oops, typo.
---

diff --git a/ChangeLog b/ChangeLog
index 4b741c5fe3..e1e27701e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-23  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* input/regression/lyric-extender.ly: Fix and add test.
+
+	* lily/extender-engraver.cc (stop_translation_timestep): Oops, typo.
+
 2004-09-23  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* lily/note-head.cc: remove Note_head::extent.
diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 32a139e83d..732baec5d0 100644
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -21,7 +21,7 @@ SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
-GGVERSION=2.5.993
+GGVERSION=2.5.995
 
 export AUTOMAKE=automake-1.8
 export ACLOCAL=aclocal-1.8
@@ -77,7 +77,8 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
 fi
 
 ## 3. Currently (2004-9-15) GUILE CVS works again
-##PATH=/usr/bin:$PATH
+unset GUILE_LOAD_PATH
+PATH=/usr/bin:$PATH
 
 if [ -d $OPT/libffi/ ]; then
     export LDFLAGS=-L$OPT/libffi/lib
diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly
index b25f18950d..f91cdf4208 100644
--- a/input/regression/lyric-extender.ly
+++ b/input/regression/lyric-extender.ly
@@ -1,16 +1,17 @@
 \version "2.3.17"
 
-\header { texidoc= "In lyric extenders, a syllable may be extended over several notes. "}
+\header { texidoc= "A LyricExtender may span several notes.  A
+LyricExtender does not extend past a rest."}
 
-\paper { raggedright= ##t }
-\score{
- \relative c'	<<
-	\context Voice = melody {
-	    c8[ ( d] )
-	    r4 f4 }
-	\lyricsto melody \context Lyrics \lyricmode { ah __ ha  }
-	>>
-}
+\paper { raggedright = ##t }
+<<
+    \relative c''{
+	c8( d e f)
+	d1
+	r2. f4
+    }
+    \addlyrics { ah2 __ ha4 __ ah4 }
+>>
 
 
 
diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 7f7b11b35b..c8b4bef0b3 100644
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -98,7 +98,7 @@ Extender_engraver::stop_translation_timestep ()
 	}
       else if (r && pending_extender_)
 	/* Rest: stop right here. */
-	pending_extender_->set_bound (RIGHT, h);
+	pending_extender_->set_bound (RIGHT, r);
  
       if (extender_ && !r)
 	{