Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index c7836160b0c772002d07302eaabe63528cd661a1..f4909f53b2cd69216b5743d481adb8ea6f657626 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -6,9 +6,6 @@
   (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "spanner.hh"
-
-
 #include "pointer-group-interface.hh"
 #include "libc-extension.hh"
 #include "paper-column.hh"
@@ -81,7 +78,7 @@ Spanner::do_break_processing ()
   else
     {
       System *root  = get_root_system (this);
-      Link_array__Item_ break_points = root->broken_col_range (left, right);
+      vector<Item*> break_points = root->broken_col_range (left, right);
 
       break_points.insert (break_points.begin () + 0, left);
       break_points.push_back (right);
@@ -124,7 +121,7 @@ Spanner::do_break_processing ()
            }
        }
     }
-  vector_sort (broken_intos_, Spanner::compare);
+  vector_sort (broken_intos_, Spanner::less);
   for (vsize i = broken_intos_.size (); i--;)
     broken_intos_[i]->break_index_ = i;
 }
@@ -238,18 +235,39 @@ Spanner::get_system () const
 Grob *
 Spanner::find_broken_piece (System *l) const
 {
-  vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::compare);
+  vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less);
   if (idx != VPOS)
     return broken_intos_ [idx];
   return 0;
 }
 
+Spanner *
+Spanner::broken_neighbor (Direction d) const
+{
+  if (!original_)
+    return 0;
+
+  vsize k = broken_spanner_index (this);
+  Spanner *orig = dynamic_cast<Spanner*> (original_);
+  int j = int (k) + d;
+  if (j < 0 || vsize (j) >= orig->broken_intos_.size ())
+    return 0;
+
+  return orig->broken_intos_[j];
+}
+
 int
 Spanner::compare (Spanner *const &p1, Spanner *const &p2)
 {
   return p1->get_system ()->get_rank () - p2->get_system ()->get_rank ();
 }
 
+bool
+Spanner::less (Spanner *const &a, Spanner *const &b)
+{
+  return a->get_system ()->get_rank () < b->get_system ()->get_rank ();
+}
+
 bool
 Spanner::is_broken () const
 {
@@ -316,15 +334,36 @@ SCM
 Spanner::set_spacing_rods (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
+  SCM num_length = me->get_property ("minimum-length");
+  if (scm_is_number (num_length))
+    {
+      Rod r;
+      Spanner *sp = dynamic_cast<Spanner *> (me);
+      
 
-  Rod r;
-  Spanner *sp = dynamic_cast<Spanner *> (me);
-  r.item_drul_[LEFT] = sp->get_bound (LEFT);
-  r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
-  r.distance_
-    = robust_scm2double (me->get_property ("minimum-length"), 0);
+      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 ()));
 
-  r.add_to_cols ();
+      if (cols.size ())
+       {
+         Rod r ;
+         r.item_drul_[LEFT] = sp->get_bound (LEFT);
+         r.item_drul_[RIGHT] = cols[0]->find_prebroken_piece (LEFT);
+         r.distance_ = robust_scm2double (num_length, 0);
+         r.add_to_cols ();
+         
+         r.item_drul_[LEFT] = cols.back ()->find_prebroken_piece (RIGHT);
+         r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
+         r.add_to_cols ();
+       }
+          
+      r.distance_ = robust_scm2double (num_length, 0);
+      r.item_drul_[LEFT] = sp->get_bound (LEFT);
+      r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
+      r.add_to_cols ();
+    }
+  
   return SCM_UNSPECIFIED;
 }
 
@@ -332,10 +371,11 @@ Spanner::set_spacing_rods (SCM smob)
   Return I such that SP == SP->ORIGINAL ()->BROKEN_INTOS_[I].
 */
 int
-broken_spanner_index (Spanner *sp)
+broken_spanner_index (Spanner const *sp)
 {
   Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
-  return find (parent->broken_intos_, sp) - parent->broken_intos_.begin ();
+  /* ugh: casting */
+  return find (parent->broken_intos_, (Spanner*) sp) - parent->broken_intos_.begin ();
 }
 
 Spanner *
@@ -344,11 +384,30 @@ unsmob_spanner (SCM s)
   return dynamic_cast<Spanner *> (unsmob_grob (s));
 }
 
+MAKE_SCHEME_CALLBACK(Spanner, bounds_width, 1);
+SCM
+Spanner::bounds_width (SCM grob)
+{
+  Spanner *me = unsmob_spanner (grob);
+
+
+  Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
+
+  Interval w (me->get_bound (LEFT)->relative_coordinate (common, X_AXIS),
+             me->get_bound (RIGHT)->relative_coordinate (common, X_AXIS));
+             
+  w -= me->relative_coordinate (common, X_AXIS);
+
+  return ly_interval2scm (w);
+}
+
 ADD_INTERFACE (Spanner,
-              "spanner-interface",
               "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",
-              "minimum-length");
+
+              "minimum-length "
+              );
+