Run grand-replace (issue 3765)

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 92cb9cdf14b102875d0977938f862197ef828a58..5d0485f46e4007bc519a242415957a90fc02e92e 100644 (file)
--- 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
@@ -50,8 +50,7 @@ Spanner::do_break_processing ()
       /*
         If we have a spanner spanning one column, we must break it
         anyway because it might provide a parent for another item.  */
-      Direction d = LEFT;
-      do
+      for (LEFT_and_RIGHT (d))
         {
           Item *bound = left->find_prebroken_piece (d);
           if (!bound)
@@ -67,7 +66,6 @@ Spanner::do_break_processing ()
               broken_intos_.push_back (span);
             }
         }
-      while ((flip (&d)) != LEFT);
     }
   else
     {
@@ -95,17 +93,15 @@ Spanner::do_break_processing ()
           Drul_array<Item *> bounds;
           bounds[LEFT] = break_points[i - 1];
           bounds[RIGHT] = break_points[i];
-          Direction d = LEFT;
-          do
+          for (LEFT_and_RIGHT (d))
             {
               if (!bounds[d]->get_system ())
                 bounds[d] = bounds[d]->find_prebroken_piece (- d);
             }
-          while ((flip (&d)) != LEFT);
 
           if (!bounds[LEFT] || ! bounds[RIGHT])
             {
-              programming_error ("bounds of this piece aren't breakable. ");
+              programming_error ("bounds of this piece aren't breakable.");
               continue;
             }
 
@@ -114,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;
             }
@@ -151,13 +148,11 @@ Spanner::get_break_index () const
 void
 Spanner::set_my_columns ()
 {
-  Direction i = (Direction) LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
-      if (!spanned_drul_[i]->get_system ())
-        set_bound (i, spanned_drul_[i]->find_prebroken_piece ((Direction) - i));
+      if (!spanned_drul_[d]->get_system ())
+        set_bound (d, spanned_drul_[d]->find_prebroken_piece ((Direction) - d));
     }
-  while (flip (&i) != LEFT);
 }
 
 Interval_t<int>
@@ -256,19 +251,15 @@ Spanner::spanner_length () const
       Drul_array<SCM> bounds (get_property ("left-bound-info"),
                               get_property ("right-bound-info"));
 
-      Direction d = LEFT;
-      do
+      for (LEFT_and_RIGHT (d))
         lr[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("X"),
                                                  bounds[d], SCM_BOOL_F), -d);
-      while (flip (&d) != LEFT);
     }
 
   if (lr.is_empty ())
     {
-      Direction d = LEFT;
-      do
+      for (LEFT_and_RIGHT (d))
         lr[d] = spanned_drul_[d]->relative_coordinate (0, X_AXIS);
-      while (flip (&d) != LEFT);
     }
 
   if (lr.is_empty ())
@@ -329,43 +320,15 @@ 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
 {
   scm_gc_mark (pure_property_cache_);
 
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     if (spanned_drul_[d])
       scm_gc_mark (spanned_drul_[d]->self_scm ());
-  while (flip (&d) != LEFT)
-    ;
+  ;
 
   for (vsize i = broken_intos_.size (); i--;)
     scm_gc_mark (broken_intos_[i]->self_scm ());
@@ -422,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;