(stop_translation_timestep): backport

of glissando bugfix.

diff --git a/ChangeLog b/ChangeLog
index f2a3c78721e40224a919dde40612b66fd583d99b..130b3285943d3fff1fd28ef6284fbab087590a0f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/glissando-engraver.cc (stop_translation_timestep): backport
+       of glissando bugfix.
+
 2003-09-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * Documentation/user/tutorial.itely (More about pitches and

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 9435968bd3127637f15a0fa16bfa558ec1c8165a..f74cad1af4d62381f15f53132a88bc82d59757f8 100644 (file)
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -55,8 +55,6 @@ Glissando_engraver::process_music ()
 {
   if (event_)
     {
-      last_line_ = line_;
-      
       line_ = new Spanner (get_property ("Glissando"));
       announce_grob (line_, event_->self_scm ());
     }
@@ -87,7 +85,12 @@ Glissando_engraver::stop_translation_timestep ()
       last_line_ =0;
     }
 
-  last_line_ = line_;
+ if (line_)
+    {
+      if ( last_line_)
+       programming_error ("Overwriting glissando.");
+      last_line_ = line_;
+    }
   line_ = 0;
   event_ = 0;
 }