X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=53d669365450b6aaf5e550c0643854aa7a26f82c;hb=d558a989232668d7a9af43385a35deb810ec008a;hp=8cc223b191ec89554bc7347247139b62a15bbeaf;hpb=ade2bb7da653fbd9d670590afd67376fe69c59dd;p=lilypond.git

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 8cc223b191..53d6693654 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -32,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;
@@ -84,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;
@@ -103,6 +102,17 @@ Spanner::do_break_processing ()
 	      continue;
 	    }
 
+	  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]);
@@ -146,7 +156,7 @@ Spanner::set_my_columns ()
 }
 
 Interval_t<int>
-Spanner::spanned_rank_iv () const
+Spanner::spanned_rank_interval () const
 {
   Interval_t<int> iv (0, 0);
 
@@ -418,5 +428,6 @@ ADD_INTERFACE (Spanner,
 	       "also the X-reference point of the spanner.\n",
 
 	       "minimum-length "
+	       "to-barline "
 	       );