nitpicks

[lilypond.git] / lily / tie-formatting-problem.cc

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index a55f31373519f6519131a5c5fd76bb8724c55cdd..d9d58cec70baa673fb738fff12573c0e662f44ee 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -48,7 +48,7 @@ Tie_formatting_problem::get_attachment (Real y, Drul_array<int> columns) const
       Tuple2<int> key (columns[d], int (d));
       Chord_outline_map::const_iterator i (chord_outlines_.find (key));
       if (i == chord_outlines_.end ())
-       programming_error ("Can't find chord outline");
+       programming_error ("Cannot find chord outline");
       else
        attachments[d] = i->second.height (y);
     }
@@ -180,6 +180,7 @@ Tie_formatting_problem::set_column_chord_outline (vector<Item*> bounds,
   if (bounds[0]->break_status_dir ())
     {
       Real x = robust_relative_extent (bounds[0],  x_refpoint_, X_AXIS)[-dir];
+      
       chord_outlines_[key].set_minimum_height (x);
     }
   else
@@ -266,7 +267,14 @@ Tie_formatting_problem::from_ties (vector<Grob*> const &ties)
       for (vsize i = 0; i < ties.size (); i++)
        {
          Item *it = dynamic_cast<Spanner*> (ties[i])->get_bound (d);
-                                            
+         if (it->break_status_dir ())
+           {
+             Item *sep
+               = dynamic_cast<Item*> (unsmob_grob (ties[i]->get_object ("separation-item")));
+             if (sep && sep->get_column () == it->get_column ())
+               it = sep;
+           }
+         
          bounds.push_back (it);
        }