merge (2nd try -- argh git.el)

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index bdb7031fcf04ed5959bfca99eadbc134a461c4db..1263237688630d9d862a5978acff1a85856c60b7 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -26,13 +26,14 @@
 #include "tie-configuration.hh"
 #include "tie-formatting-problem.hh"
 #include "warn.hh"
+#include "semi-tie-column.hh"
 
 
-int
-Tie::compare (Grob *const &s1,
-             Grob *const &s2)
+bool
+Tie::less (Grob *const &s1,
+          Grob *const &s2)
 {
-  return sign (Tie::get_position (s1) - Tie::get_position (s2));
+  return Tie::get_position (s1) < Tie::get_position (s2);
 }
 
 void
@@ -44,6 +45,15 @@ Tie::set_head (Grob *me, Direction d, Grob *h)
 Grob *
 Tie::head (Grob *me, Direction d)
 {
+  if (is_direction (me->get_property ("head-direction")))
+     {
+       Direction hd = to_dir (me->get_property ("head-direction"));
+ 
+       return (hd == d)
+        ? unsmob_grob (me->get_object ("note-head"))
+        : 0;
+     }
+  
   Item *it = dynamic_cast<Spanner*> (me)->get_bound (d);
   if (Note_head::has_interface (it))
     return it;
@@ -122,7 +132,9 @@ Tie::get_default_dir (Grob *me)
       Grob *s = stems[LEFT] ? stems[LEFT] : stems[RIGHT];
       return -get_grob_direction (s);
     }
-
+  else if (int p = get_position (me))
+    return Direction (sign (p));
+  
   return UP;
 }
 
@@ -133,7 +145,8 @@ Tie::calc_direction (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   Grob *yparent = me->get_parent (Y_AXIS);
-  if (Tie_column::has_interface (yparent)
+  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)
     {
@@ -160,14 +173,16 @@ Tie::set_default_control_points (Grob *me_grob)
   Tie_specification spec = problem.get_tie_specification (0);
   spec.has_manual_dir_ = true;
   spec.manual_dir_ = get_grob_direction (me);
+
+  if (me->is_live ())
+    {
+      Tie_configuration conf
+       = problem.find_optimal_tie_configuration (spec);
   
-  Tie_configuration conf
-    = problem.find_optimal_tie_configuration (spec);
-  
-  set_control_points (me, problem.common_x_refpoint (),
-                     conf, problem.details_);
+      set_control_points (me, problem.common_x_refpoint (),
+                         conf, problem.details_);
+    }
 }
-
 void
 Tie::set_control_points (Grob *me,
                         Grob *common,
@@ -198,7 +213,8 @@ Tie::calc_control_points (SCM smob)
   (void)  get_grob_direction (me);
 
   Grob *yparent = me->get_parent (Y_AXIS);
-  if (Tie_column::has_interface (yparent)
+  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)
     {
@@ -206,7 +222,7 @@ Tie::calc_control_points (SCM smob)
       (void) yparent->get_property ("positioning-done");
     }
 
-  if (!scm_is_pair (me->get_property_data (ly_symbol2scm ("control-points"))))
+  if (!scm_is_pair (me->get_property_data ("control-points")))
     {
       set_default_control_points (me);
     }
@@ -231,7 +247,7 @@ Tie::print (SCM smob)
 
   Bezier b;
   int i = 0;
-  for (SCM s = cp; s != SCM_EOL; s = scm_cdr (s))
+  for (SCM s = cp; scm_is_pair (s); s = scm_cdr (s))
     {
       b.control_[i] = ly_scm2offset (scm_car (s));
       i++;