X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=73041c6a837f6fdb7482f14b02a7c65f57ae9a08;hb=af770f3440264c18ce01525dce1aa76b86ace0d5;hp=d11153aaab654981e13c48e1befd8bf2303e664c;hpb=43ae5e9a69e4f4f4f82eaccc4d8c47d7af5fe610;p=lilypond.git

diff --git a/lily/tie.cc b/lily/tie.cc
index d11153aaab..73041c6a83 100644
--- 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;
@@ -135,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)
     {
@@ -162,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,
@@ -200,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)
     {
@@ -208,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);
     }
@@ -233,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++;
@@ -275,8 +289,6 @@ Tie::print (SCM smob)
 }
 
 ADD_INTERFACE (Tie,
-	       "tie-interface",
-	       
 	       "A horizontal curve connecting two noteheads. \n\n"
 	       ,
 	       
@@ -288,6 +300,7 @@ ADD_INTERFACE (Tie,
 	       "dash-period "
 	       "details "
 	       "direction "
+	       "head-direction "
 	       "line-thickness " 
 	       "quant-score "
 	       "staff-position "