X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspanner.cc;h=5d0485f46e4007bc519a242415957a90fc02e92e;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=9a8ff83a3ffca20c2579e67ec9770b716c5779bc;hpb=caac677710724849651381d11577f61dd9618bcf;p=lilypond.git

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 9a8ff83a3f..5d0485f46e 100644
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -101,7 +101,7 @@ Spanner::do_break_processing ()
 
           if (!bounds[LEFT] || ! bounds[RIGHT])
             {
-              programming_error ("bounds of this piece aren't breakable. ");
+              programming_error ("bounds of this piece aren't breakable.");
               continue;
             }
 
@@ -110,7 +110,8 @@ Spanner::do_break_processing ()
 
           if (!ok)
             {
-              programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner. Ignoring orphaned part",
+              programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner."
+                                            "  Ignoring orphaned part",
                                             name ().c_str ()));
               continue;
             }
@@ -319,32 +320,6 @@ Spanner::is_broken () const
   return broken_intos_.size ();
 }
 
-/*
-  If this is a broken spanner, return the amount the left end is to be
-  shifted horizontally so that the spanner starts after the initial
-  clef and key on the staves. This is necessary for ties, slurs,
-  crescendo and decrescendo signs, for example.
-*/
-Real
-Spanner::get_broken_left_end_align () const
-{
-  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
-      && sc->break_status_dir () == RIGHT)
-    {
-      /*
-        We used to do a full search for the Break_align_item.
-        But that doesn't make a difference, since the Paper_column
-        is likely to contain only a Break_align_item.
-      */
-      return sc->extent (sc, X_AXIS)[RIGHT];
-    }
-
-  return 0.0;
-}
-
 void
 Spanner::derived_mark () const
 {
@@ -353,7 +328,7 @@ Spanner::derived_mark () const
   for (LEFT_and_RIGHT (d))
     if (spanned_drul_[d])
       scm_gc_mark (spanned_drul_[d]->self_scm ());
-    ;
+  ;
 
   for (vsize i = broken_intos_.size (); i--;)
     scm_gc_mark (broken_intos_[i]->self_scm ());
@@ -410,6 +385,23 @@ Spanner::set_spacing_rods (SCM smob)
       r.item_drul_[LEFT] = sp->get_bound (LEFT);
       r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
       r.add_to_cols ();
+
+      /*
+        We do not know yet if the spanner is going to have a bound that is
+        broken. To account for this uncertainty, we add the rod twice:
+        once for the central column (see above) and once for the left column
+        (see below). As end_rods_ are never used when rods_ are used and vice
+        versa, this rod will only be accessed once for each spacing
+        configuraiton before line breaking. Then, as a grob never exists in
+        both unbroken and broken forms after line breaking, only one of these
+        two rods will be in the column vector used for spacing in
+        simple-spacer.cc get_line_confugration.
+      */
+      if (Item *left_pbp = sp->get_bound (RIGHT)->find_prebroken_piece (LEFT))
+        {
+          r.item_drul_[RIGHT] = left_pbp;
+          r.add_to_cols ();
+        }
     }
 
   return SCM_UNSPECIFIED;