X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=476f75d8c26e8da85be44c334e3ca6fd18641149;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8a1e9e62c96204d71a9b6fd5c55c41466f505327;hpb=c3805257667c04b22ba780ad9b3f4a37788cf6bd;p=lilypond.git

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 8a1e9e62c9..476f75d8c2 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pointer-group-interface.hh"
@@ -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);
 
@@ -160,28 +170,11 @@ Spanner::spanned_rank_iv () const
 Interval_t<Moment>
 Spanner::spanned_time () const
 {
-  Interval_t<Moment> iv;
-
-  Direction d = LEFT;
-  do
-    {
-      if (spanned_drul_[d] && spanned_drul_[d]->get_column ())
-	iv[d] = robust_scm2moment (spanned_drul_[d]->get_column ()->get_property ("when"),
-				  iv[d]);
-    }
-  while (flip (&d) != LEFT);
-
-  do
-    {
-      if (!spanned_drul_[d] || !spanned_drul_[d]->get_column ())
-	iv[d] = iv[-d];
-    }
-  while (flip (&d) != LEFT);
-  
-  
-  return iv;
+  return spanned_time_interval (spanned_drul_[LEFT],
+				spanned_drul_[RIGHT]);
 }
 
+
 Item *
 Spanner::get_bound (Direction d) const
 {
@@ -198,7 +191,7 @@ Spanner::set_bound (Direction d, Grob *s)
   Item *i = dynamic_cast<Item *> (s);
   if (!i)
     {
-      programming_error ("must have Item for spanner bound");
+      programming_error ("must have Item for spanner bound of " + name());
       return;
     }
 
@@ -365,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 ())
 	{
@@ -410,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)
 {
@@ -428,12 +424,15 @@ Spanner::bounds_width (SCM grob)
 }
 
 ADD_INTERFACE (Spanner,
-	       "Some objects are horizontally spanned between objects. For\n"
-	       "example, slur, beam, tie, etc. These grobs form a subtype called\n"
-	       "@code{Spanner}. All spanners have two span-points (these must be\n"
-	       "@code{Item} objects), one on the left and one on the right. The left bound is\n"
-	       "also the X-reference point of the spanner.\n",
-
+	       "Some objects are horizontally spanned between objects.  For"
+	       " example, slurs, beams, ties, etc.  These grobs form a subtype"
+	       " called @code{Spanner}.  All spanners have two span points"
+	       " (these must be @code{Item} objects), one on the left and one"
+	       " on the right.  The left bound is also the X@tie{}reference"
+	       " point of the spanner.",
+
+	       /* properties */
 	       "minimum-length "
+	       "to-barline "
 	       );