Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 1dcae55298d3130077a06fa24bcf5e74368940e5..c0ac823b02b5329f8c7991b1f019aca551e1512f 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"
@@ -251,11 +248,12 @@ Spanner::broken_neighbor (Direction d) const
     return 0;
 
   vsize k = broken_spanner_index (this);
+  Spanner *orig = dynamic_cast<Spanner*> (original_);
   int j = int (k) + d;
-  if (j < 0 || vsize (j) >= broken_intos_.size ())
+  if (j < 0 || vsize (j) >= orig->broken_intos_.size ())
     return 0;
 
-  return broken_intos_[j];
+  return orig->broken_intos_[j];
 }
 
 int
@@ -336,16 +334,33 @@ SCM
 Spanner::set_spacing_rods (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-
-  Rod r;
-  Spanner *sp = dynamic_cast<Spanner *> (me);
-  r.item_drul_[LEFT] = sp->get_bound (LEFT);
-  r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
-
   SCM num_length = me->get_property ("minimum-length");
   if (scm_is_number (num_length))
     {
+      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 ()));
+
+      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 ();
     }
   
@@ -370,7 +385,6 @@ unsmob_spanner (SCM s)
 }
 
 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"