X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=b5b8a933a21a693d0fe6365051f9e36d9424a45b;hb=2f996385b21b9d5006c7369c2c496ccbee001e97;hp=09359644b98096c28c58c06e7aad9b0ed85ff93a;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 09359644b9..b5b8a933a2 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -14,11 +14,12 @@
 #include "stencil.hh"
 #include "system.hh"
 #include "warn.hh"
+#include "moment.hh"
 
 Grob *
-Spanner::clone (int count) const
+Spanner::clone () const
 {
-  return new Spanner (*this, count);
+  return new Spanner (*this);
 }
 
 void
@@ -31,22 +32,6 @@ Spanner::do_break_processing ()
   if (!left || !right)
     return;
 
-  /*
-    Check if our parent in X-direction spans equally wide
-    or wider than we do.
-  */
-  for (int a = X_AXIS; a < NO_AXES; a++)
-    {
-      if (Spanner *parent = dynamic_cast<Spanner *> (get_parent ((Axis)a)))
-	{
-	  if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ()))
-	    {
-	      programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
-					    name ().c_str (),
-					    parent->name ().c_str ()));
-	    }
-	}
-    }
 
   if (get_system () || is_broken ())
     return;
@@ -64,7 +49,7 @@ Spanner::do_break_processing ()
 	    programming_error ("no broken bound");
 	  else if (bound->get_system ())
 	    {
-	      Spanner *span = dynamic_cast<Spanner *> (clone (broken_intos_.size ()));
+	      Spanner *span = dynamic_cast<Spanner *> (clone ());
 	      span->set_bound (LEFT, bound);
 	      span->set_bound (RIGHT, bound);
 
@@ -83,6 +68,21 @@ Spanner::do_break_processing ()
       break_points.insert (break_points.begin () + 0, left);
       break_points.push_back (right);
 
+      Slice parent_rank_slice;
+      parent_rank_slice.set_full ();
+      
+      /*
+	Check if our parent in X-direction spans equally wide
+	or wider than we do.
+      */
+      for (int a = X_AXIS; a < NO_AXES; a++)
+	{
+	  if (Spanner *parent = dynamic_cast<Spanner *> (get_parent ((Axis)a)))
+	    {
+	      parent_rank_slice.intersect (parent->spanned_rank_interval ());
+	    }
+	}
+  
       for (vsize i = 1; i < break_points.size (); i++)
 	{
 	  Drul_array<Item *> bounds;
@@ -102,7 +102,18 @@ Spanner::do_break_processing ()
 	      continue;
 	    }
 
-	  Spanner *span = dynamic_cast<Spanner *> (clone (broken_intos_.size ()));
+	  bool ok = parent_rank_slice.contains (bounds[LEFT]->get_column ()->get_rank ());
+	  ok = ok && parent_rank_slice.contains (bounds[RIGHT]->get_column ()->get_rank ());
+	  
+	  if (!ok)
+	    {
+	      programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner. Ignoring orphaned part",
+					    name ().c_str ()));
+	      continue;
+	    }
+	    
+	  
+	  Spanner *span = dynamic_cast<Spanner *> (clone ());
 	  span->set_bound (LEFT, bounds[LEFT]);
 	  span->set_bound (RIGHT, bounds[RIGHT]);
 
@@ -145,7 +156,7 @@ Spanner::set_my_columns ()
 }
 
 Interval_t<int>
-Spanner::spanned_rank_iv ()
+Spanner::spanned_rank_interval () const
 {
   Interval_t<int> iv (0, 0);
 
@@ -156,6 +167,14 @@ Spanner::spanned_rank_iv ()
   return iv;
 }
 
+Interval_t<Moment>
+Spanner::spanned_time () const
+{
+  return spanned_time_interval (spanned_drul_[LEFT],
+				spanned_drul_[RIGHT]);
+}
+
+
 Item *
 Spanner::get_bound (Direction d) const
 {
@@ -196,16 +215,16 @@ Spanner::set_bound (Direction d, Grob *s)
     Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this);
 }
 
-Spanner::Spanner (SCM s, Object_key const *key)
-  : Grob (s, key)
+Spanner::Spanner (SCM s)
+  : Grob (s)
 {
   break_index_ = 0;
   spanned_drul_[LEFT] = 0;
   spanned_drul_[RIGHT] = 0;
 }
 
-Spanner::Spanner (Spanner const &s, int count)
-  : Grob (s, count)
+Spanner::Spanner (Spanner const &s)
+  : Grob (s)
 {
   spanned_drul_[LEFT] = spanned_drul_[RIGHT] = 0;
 }
@@ -339,11 +358,14 @@ Spanner::set_spacing_rods (SCM smob)
     {
       Rod r;
       Spanner *sp = dynamic_cast<Spanner *> (me);
-      
-
       System *root = get_root_system (me);
-      vector<Item*> cols (root->broken_col_range (sp->get_bound (LEFT)->get_column (),
-						  sp->get_bound (RIGHT)->get_column ()));
+      Drul_array<Item*> bounds (sp->get_bound (LEFT),
+				sp->get_bound (RIGHT));
+      if (!bounds[LEFT] || !bounds[RIGHT])
+	return SCM_UNSPECIFIED;
+      
+      vector<Item*> cols (root->broken_col_range (bounds[LEFT]->get_column (),
+						  bounds[RIGHT]->get_column ()));
 
       if (cols.size ())
 	{
@@ -384,7 +406,7 @@ unsmob_spanner (SCM s)
   return dynamic_cast<Spanner *> (unsmob_grob (s));
 }
 
-MAKE_SCHEME_CALLBACK(Spanner, bounds_width, 1);
+MAKE_SCHEME_CALLBACK (Spanner, bounds_width, 1);
 SCM
 Spanner::bounds_width (SCM grob)
 {
@@ -409,5 +431,6 @@ ADD_INTERFACE (Spanner,
 	       "also the X-reference point of the spanner.\n",
 
 	       "minimum-length "
+	       "to-barline "
 	       );