* 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 4b741c5fe348809351a6b68e5ee313c0c0fc7fe5..e1e27701e15138c998bbd135bf9596b344f5bb62 100644 (file)
--- 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 32a139e83d0b0a2009cf38f5fde40bb4abdc933d..732baec5d0addc7cb4326447c8ceb56326161ee9 100644 (file)
--- 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 b25f18950ddebc513b6252dada5e3e1d6a58f6df..f91cdf420866d78e0d9fba7cc88434fd691164bb 100644 (file)
--- 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 7f7b11b35bafcbd2476228bbb356a28b0d5690bd..c8b4bef0b3546f00f161b94be4fead941362d29b 100644 (file)
--- 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)
        {