X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fglissando-engraver.cc;h=38270f446f79f0571021b11ff99683185f1e6ba6;hb=bcafa85b883969cd02a43f41ba71e1536aacec7f;hp=08f420c128a10483454418e9389dfa201148a4ee;hpb=09f09c054a7c985424925605c237c78b9adb4047;p=lilypond.git

diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 08f420c128..38270f446f 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -44,11 +44,11 @@ protected:
 
 private:
   vector<Spanner *> lines_;
+  vector<Spanner *> kill_me_;
   bool start_glissandi;
   bool stop_glissandi;
 
   Stream_event *event_;
-  SCM map;
   vector<vsize> note_column_1;
   vector<vsize> note_column_2;
 };
@@ -56,7 +56,6 @@ private:
 Glissando_engraver::Glissando_engraver ()
 {
   event_ = 0;
-  map = SCM_EOL;
   start_glissandi = false;
   stop_glissandi = false;
 }
@@ -79,10 +78,35 @@ void
 Glissando_engraver::acknowledge_note_column (Grob_info info)
 {
   Grob *g = info.grob ();
+  if (stop_glissandi)
+    {
+      extract_grob_set (g, "note-heads", note_heads);
+      int glissando_index = 0;
+      for (vsize i = 0; i < note_column_1.size (); i++)
+        {
+          if (note_column_2[i] >= note_heads.size ())
+            {
+              kill_me_.push_back (lines_[i]);
+              announce_end_grob (lines_[i], SCM_EOL);
+            }
+          else
+            {
+              lines_[i]->set_bound (RIGHT, note_heads[note_column_2[i]]);
+              lines_[i]->set_property ("glissando-index", scm_from_int (glissando_index));
+              glissando_index++;
+              announce_end_grob (lines_[i], note_heads[note_column_2[i]]->self_scm ());
+            }
+        }
+      lines_.clear ();
+      note_column_1.clear ();
+      note_column_2.clear ();
+      stop_glissandi = false;
+    }
+
   if (start_glissandi)
     {
       extract_grob_set (g, "note-heads", note_heads);
-      map = get_property ("glissandoMap");
+      SCM map = get_property ("glissandoMap");
       if (map == SCM_EOL)
         for (vsize i = 0; i < note_heads.size (); i++)
           {
@@ -102,34 +126,12 @@ Glissando_engraver::acknowledge_note_column (Grob_info info)
             note_column_1.push_back (vsize (n1));
             note_column_2.push_back (vsize (n2));
           }
-      for (vsize i=0; i < note_column_1.size (); i++)
+      for (vsize i = 0; i < note_column_1.size (); i++)
         {
           lines_.push_back (make_spanner ("Glissando", event_->self_scm ()));
           lines_.back ()->set_bound (LEFT, note_heads[note_column_1[i]]);
         }
     }
-
-  if (stop_glissandi)
-    {
-      extract_grob_set (g, "note-heads", note_heads);
-      int glissando_index = 0;
-      for (vsize i=0; i < note_column_1.size (); i++)
-        {
-          if (note_column_2[i] >= note_heads.size ())
-            lines_[i]->suicide ();
-          else
-            {
-              lines_[i]->set_bound (RIGHT, note_heads[note_column_2[i]]);
-              lines_[i]->set_property ("glissando-index", scm_from_int (glissando_index));
-              glissando_index++;
-              announce_end_grob (lines_[i], note_heads[note_column_2[i]]->self_scm ());
-            }
-        }
-      lines_.clear ();
-      note_column_1.clear ();
-      note_column_2.clear ();
-      stop_glissandi = false;
-    }      
 }
 
 void
@@ -139,11 +141,10 @@ Glissando_engraver::stop_translation_timestep ()
   if (start_glissandi)
     {
       if (stop_glissandi)
-	programming_error ("overwriting glissando");
+        programming_error ("overwriting glissando");
       stop_glissandi = true;
+      start_glissandi = false;
     }
-
-  start_glissandi = false;
   event_ = 0;
 }
 
@@ -155,26 +156,29 @@ Glissando_engraver::finalize ()
       string msg = _ ("unterminated glissando");
 
       if (event_)
-	event_->origin ()->warning (msg);
+        event_->origin ()->warning (msg);
       else
-	warning (msg);
+        warning (msg);
 
-      for (vsize i=0; i < lines_.size (); i++)
+      for (vsize i = 0; i < lines_.size (); i++)
         lines_[i]->suicide ();
     }
+
+  for (vsize i = 0; i < kill_me_.size (); i++)
+    kill_me_[i]->suicide ();
 }
 
 ADD_ACKNOWLEDGER (Glissando_engraver, note_column);
 ADD_TRANSLATOR (Glissando_engraver,
-		/* doc */
-		"Engrave glissandi.",
+                /* doc */
+                "Engrave glissandi.",
 
-		/* create */
-		"Glissando ",
+                /* create */
+                "Glissando ",
 
-		/* read */
-		"glissandoMap ",
+                /* read */
+                "glissandoMap ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );