X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=09f2367acaa6ee7f98208b40f5716c47c5bd91a3;hb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;hp=0c11f2833ab4be321755bd9115772e84c3600e13;hpb=675533acf58b9b863adc830f175696735ca6dc95;p=lilypond.git

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 0c11f2833a..09f2367aca 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -19,6 +19,24 @@
 #include "system.hh"
 #include "group-interface.hh"
 
+/* spanner in name? */
+LY_DEFINE (get_broken_into,
+	  "get-broken-into", 1, 0, 0, (SCM spanner),
+	   "
+Return broken-into list for @var{spanner}.
+"
+)
+{
+  ///  Spanner *me = unsmob_spanner (spanner);
+  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (spanner));
+  SCM_ASSERT_TYPE (me, spanner, SCM_ARG1, __FUNCTION__, "spanner");
+
+  SCM s = SCM_EOL;
+  for (int i = me->broken_intos_.size (); i; i--)
+    s = gh_cons (me->broken_intos_[i-1]->self_scm (), s);
+  return s;
+}
+
 void
 Spanner::do_break_processing ()
 {
@@ -39,14 +57,14 @@ Spanner::do_break_processing ()
 	{
 	  if (!parent->spanned_rank_iv ().contains_b (this->spanned_rank_iv ()))
 	    {
-	      programming_error (to_str ("Spanner `%s' is not fully contained in parent spanner `%s'.",
-					 name ().ch_C (),
-					 parent->name ().ch_C ()));
+	      programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
+					 name ().to_str0 (),
+					 parent->name ().to_str0 ()));
 	    }
 	}
     }
   
-  if (line_l () || broken_b ())
+  if (get_system () || broken_b ())
     return;
 
   if (left == right)
@@ -60,22 +78,22 @@ Spanner::do_break_processing ()
 	  Item* bound = left->find_prebroken_piece (d);
 	  if (!bound)
 	    programming_error ("no broken bound");
-	  else if (bound->line_l ())
+	  else if (bound->get_system ())
 	    {
-	      Spanner * span_p = dynamic_cast<Spanner*> (clone ());
-	      span_p->set_bound (LEFT, bound);
-	      span_p->set_bound (RIGHT, bound);
+	      Spanner * span = dynamic_cast<Spanner*> (clone ());
+	      span->set_bound (LEFT, bound);
+	      span->set_bound (RIGHT, bound);
 
-	      assert (span_p->line_l ()); 
-	      span_p->line_l ()->typeset_grob (span_p);
-	      broken_into_l_arr_.push (span_p);
+	      assert (span->get_system ()); 
+	      span->get_system ()->typeset_grob (span);
+	      broken_intos_.push (span);
 	    }
 	}
       while ((flip (&d))!= LEFT);
     }
   else
     {
-      Link_array<Item> break_points = pscore_l_->line_l_->broken_col_range (left,right);
+      Link_array<Item> break_points = pscore_->system_->broken_col_range (left,right);
 
       break_points.insert (left,0);
       break_points.push (right);
@@ -88,7 +106,7 @@ Spanner::do_break_processing ()
 	  Direction d = LEFT;
 	  do
 	    {
-	      if (!bounds[d]->line_l ())
+	      if (!bounds[d]->get_system ())
 		bounds[d] = bounds[d]->find_prebroken_piece (- d);
 	    }
 	  while ((flip (&d))!= LEFT);
@@ -99,26 +117,26 @@ Spanner::do_break_processing ()
 	      continue; 
 	    }
 
-	  Spanner *span_p = dynamic_cast<Spanner*> (clone ());
-	  span_p->set_bound (LEFT,bounds[LEFT]);
-	  span_p->set_bound (RIGHT,bounds[RIGHT]);
+	  Spanner *span = dynamic_cast<Spanner*> (clone ());
+	  span->set_bound (LEFT,bounds[LEFT]);
+	  span->set_bound (RIGHT,bounds[RIGHT]);
 
-	  if (!bounds[LEFT]->line_l () 
+	  if (!bounds[LEFT]->get_system () 
 	    
-	      || !bounds[RIGHT]->line_l ()
-	      || bounds[LEFT]->line_l () != bounds[RIGHT]->line_l ())
+	      || !bounds[RIGHT]->get_system ()
+	      || bounds[LEFT]->get_system () != bounds[RIGHT]->get_system ())
 	    {
 	      programming_error ("bounds of spanner are invalid");
-	      span_p->suicide ();
+	      span->suicide ();
 	    }
 	  else
 	    {
-	      bounds[LEFT]->line_l ()->typeset_grob (span_p);
-	      broken_into_l_arr_.push (span_p);
+	      bounds[LEFT]->get_system ()->typeset_grob (span);
+	      broken_intos_.push (span);
 	    }
 	}
     }
-  broken_into_l_arr_.sort (Spanner::compare);
+  broken_intos_.sort (Spanner::compare);
 }
 
 void
@@ -127,7 +145,7 @@ Spanner::set_my_columns ()
   Direction i = (Direction) LEFT;
   do 
     {
-      if (!spanned_drul_[i]->line_l ())
+      if (!spanned_drul_[i]->get_system ())
 	set_bound (i,spanned_drul_[i]->find_prebroken_piece ((Direction) -i));
     } 
   while (flip (&i) != LEFT);
@@ -140,11 +158,11 @@ Spanner::spanned_rank_iv ()
 
   if (spanned_drul_[LEFT])
     {
-      iv[LEFT] = Paper_column::rank_i (spanned_drul_[LEFT]->column_l ());
+      iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
     }
   if (spanned_drul_[RIGHT])
     {
-      iv[RIGHT] = Paper_column::rank_i (spanned_drul_[RIGHT]->column_l ());
+      iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
     }
   return iv;
 }
@@ -222,38 +240,38 @@ Spanner::spanner_length () const
 }
 
 System *
-Spanner::line_l () const
+Spanner::get_system () const
 {
   if (!spanned_drul_[LEFT] || !spanned_drul_[RIGHT])
     return 0;
-  if (spanned_drul_[LEFT]->line_l () != spanned_drul_[RIGHT]->line_l ())
+  if (spanned_drul_[LEFT]->get_system () != spanned_drul_[RIGHT]->get_system ())
     return 0;
-  return spanned_drul_[LEFT]->line_l ();
+  return spanned_drul_[LEFT]->get_system ();
 }
 
 
 Grob*
 Spanner::find_broken_piece (System*l) const
 {
-  int idx = binsearch_link_array (broken_into_l_arr_, (Spanner*)l, Spanner::compare);
+  int idx = binsearch_links (broken_intos_, (Spanner*)l, Spanner::compare);
   
   if (idx < 0)
     return 0;
   else
-    return broken_into_l_arr_ [idx];
+    return broken_intos_ [idx];
 }
 
 
 int
 Spanner::compare (Spanner * const &p1, Spanner * const &p2)
 {
-  return  p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_;
+  return  p1->get_system ()->rank_ - p2->get_system ()->rank_;
 }
 
 bool
 Spanner::broken_b () const
 {
-  return broken_into_l_arr_.size ();
+  return broken_intos_.size ();
 }
 
 
@@ -266,7 +284,7 @@ Spanner::broken_b () const
 Real
 Spanner::get_broken_left_end_align () const
 {
-  Paper_column *sc = dynamic_cast<Paper_column*> (spanned_drul_[LEFT]->column_l ());
+  Paper_column *sc = dynamic_cast<Paper_column*> (spanned_drul_[LEFT]->get_column ());
 
   // Relevant only if left span point is first column in line
   if (sc != NULL &&
@@ -289,7 +307,7 @@ Spanner::do_derived_mark ()
 {
   /*
     We'd be fucked if this is called before spanned_drul_[] is inited.  */
-  if (status_c_ == ORPHAN)
+  if (status_ == ORPHAN)
     return SCM_EOL;
   
   Direction d = LEFT;
@@ -298,8 +316,8 @@ Spanner::do_derived_mark ()
       scm_gc_mark (spanned_drul_[d]->self_scm ());
   while (flip (&d) != LEFT);
 
-  for (int i= broken_into_l_arr_.size () ; i--;)
-    scm_gc_mark (broken_into_l_arr_[i]->self_scm ());
+  for (int i= broken_intos_.size () ; i--;)
+    scm_gc_mark (broken_intos_[i]->self_scm ());
 
   return SCM_EOL;
 }
@@ -331,7 +349,7 @@ Spanner::set_spacing_rods (SCM smob)
   Spanner*sp = dynamic_cast<Spanner*> (me);
   r.item_l_drul_[LEFT] = sp->get_bound (LEFT);
   r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT);
-  r.distance_f_ =
+  r.distance_ =
     gh_scm2double (me->get_grob_property ("minimum-length"))
     * 1.0;