Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 1b6798086a3244558555a7cd1fa98059e15e834d..f73657afe184bfec6820190186c53759d0c04458 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -224,13 +224,8 @@ Spanner::set_bound (Direction d, Grob *s)
     Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this);
 }
 
-void
-Spanner::pre_init ()
+Preinit_Spanner::Preinit_Spanner ()
 {
-  break_index_ = (vsize)-1;
-  // This is stupid, but derived_mark may be run before broken_into_
-  // has run its constructor and has a recognizable array size.
-  // So we use break_index_ == -1 as a sentinel.
   spanned_drul_.set (0, 0);
   pure_property_cache_ = SCM_UNDEFINED;
 }
@@ -460,11 +455,8 @@ Spanner::calc_normalized_endpoints (SCM smob)
       Real total_width = 0.0;
       vector<Real> span_data;
 
-      if (!orig->is_broken ())
-        span_data.push_back (orig->spanner_length ());
-      else
-        for (vsize i = 0; i < orig->broken_intos_.size (); i++)
-          span_data.push_back (orig->broken_intos_[i]->spanner_length ());
+      for (vsize i = 0; i < orig->broken_intos_.size (); i++)
+        span_data.push_back (orig->broken_intos_[i]->spanner_length ());
 
       vector<Interval> unnormalized_endpoints;