Only set stopped_tuplets_ when actually erasing a tuplet

bracket. Fixes odd spacing and programming errors with Cary.

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 3177368245b6bef825d629014d537b2b369a658f..42dfe5997bdc0bb291160a8441bf0a2f01fecd8e 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -318,6 +318,9 @@ Spacing_spanner::musical_column_spacing (Grob *me,
 
          if (!Paper_column::is_musical (right_col))
            {
+             /*
+               reconsider this: breaks with wide marks/tempos/etc.
+              */
              Real left_col_stick_out = robust_relative_extent (left_col, left_col,  X_AXIS)[RIGHT];
              compound_fixed_note_space = max (left_col_stick_out, options->increment_);
 
@@ -429,6 +432,7 @@ Spacing_spanner::fills_measure (Grob *me, Item *left, Item *col)
 
   return false;
 }
+
 /*
   Read hints from L and generate springs.
 */

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index b95150ce10d6dc056298869d10b361cd8eca4efd..cd8038494b631143a4c24e7be41566f5131132b6 100644 (file)
--- a/lily/tuplet-engraver.cc
+++ b/lily/tuplet-engraver.cc
@@ -108,9 +108,11 @@ Tuplet_engraver::process_music ()
   Moment now = now_mom();
   for (vsize i = tuplets_.size (); i --; )
     {
-      stopped_tuplets_.push_back (tuplets_[i]);
       if (tuplets_[i].stop_moment_ == now)
-       tuplets_.erase (tuplets_.begin () + i);
+       {
+         stopped_tuplets_.push_back (tuplets_[i]);
+         tuplets_.erase (tuplets_.begin () + i);
+       }
     }
   
   for (vsize i = 0; i < stopped_tuplets_.size (); i++)
@@ -134,7 +136,7 @@ Tuplet_engraver::process_music ()
              bracket->set_bound (RIGHT,
                                  bracket->get_bound (LEFT));
              number->set_bound (RIGHT,
-                                                     stopped_tuplets_[i].bracket_->get_bound (LEFT));
+                                stopped_tuplets_[i].bracket_->get_bound (LEFT));
            }
          
          // todo: scrap last_tuplets_, use stopped_tuplets_ only.