Fix #629.

Only use Tie::get_default_direction and cross-linebreak
synchronization for broken ties.

diff --git a/lily/tie.cc b/lily/tie.cc
index 980484d21bcdaed4b0345b1fdee3f5891f5a7ffa..35c39fe5461c7653a406d842aefb9d0edf812f1d 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -31,8 +31,7 @@
 
 
 bool
-Tie::less (Grob *const &s1,
-          Grob *const &s2)
+Tie::less (Grob *const &s1, Grob *const &s2)
 {
   return Tie::get_position (s1) < Tie::get_position (s2);
 }
@@ -209,7 +208,6 @@ Tie::get_control_points (Grob *me,
   return controls;
 }
 
-
 MAKE_SCHEME_CALLBACK (Tie, calc_control_points, 1);
 SCM
 Tie::calc_control_points (SCM smob)
@@ -219,18 +217,16 @@ Tie::calc_control_points (SCM smob)
   Grob *yparent = me->get_parent (Y_AXIS);
   if ((Tie_column::has_interface (yparent)
        || Semi_tie_column::has_interface (yparent)) 
-      && unsmob_grob_array (yparent->get_object ("ties"))
-      //      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1
-      )
+      && unsmob_grob_array (yparent->get_object ("ties")))
     {
       extract_grob_set (yparent, "ties", ties);
-      if (ties.size() == 1
+      if (me->original() && ties.size() == 1
          && !to_dir (me->get_property_data ("direction")))
        {
          assert (ties[0] == me);
          set_grob_direction (me, Tie::get_default_dir (me));
-       }
-      
+           
+       }      
       /* trigger positioning. */
       (void) yparent->get_property ("positioning-done");
     }