Only set stopped_tuplets_ when actually erasing a tuplet

bracket. Fixes odd spacing and programming errors with Cary.

Conflicts:

	lily/spacing-spanner.cc

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index e6024b34392d3f7609705f64bec4a0c50b7d4a10..4dd45bfd2465899dd7ffdb5a0fa65e5e362edc6c 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -321,6 +321,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_);
 
@@ -397,6 +400,7 @@ Spacing_spanner::musical_column_spacing (Grob *me,
   Spaceable_grob::add_spring (left_col, right_col, distance, inverse_strength);
 }
 
+
 /*
   Read hints from L and generate springs.
 */

diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc
index 7592e98a08d0dcc9fd553b30691755672401e95a..41b9aa894a2298eeb4b81841ee44dc92c97df15a 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.