X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=980484d21bcdaed4b0345b1fdee3f5891f5a7ffa;hb=2a5bf602e34fadfeb14b0d7be3b83fa587be3fbb;hp=9925aa428be2ff6d2736401636ca486bdb972782;hpb=98311cc29e8664d281bcc40a808684e7553c8eaa;p=lilypond.git

diff --git a/lily/tie.cc b/lily/tie.cc
index 9925aa428b..980484d21b 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -17,6 +17,7 @@
 #include "note-head.hh"
 #include "output-def.hh"
 #include "paper-column.hh"
+#include "pointer-group-interface.hh"
 #include "rhythmic-head.hh"
 #include "spanner.hh"
 #include "staff-symbol-referencer.hh"
@@ -113,7 +114,11 @@ Tie::get_default_dir (Grob *me)
   Direction d = LEFT;
   do
     {
-      Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0;
+      Grob *one_head = head (me, d);
+      if (!one_head && dynamic_cast<Spanner*> (me)) 
+	one_head = Tie::head (dynamic_cast<Spanner*> (me)->broken_neighbor (d), d);
+      
+      Grob *stem = one_head ? Rhythmic_head::get_stem (one_head) : 0;
       if (stem)
 	stem = Stem::is_invisible (stem) ? 0 : stem;
 
@@ -135,7 +140,7 @@ Tie::get_default_dir (Grob *me)
   else if (int p = get_position (me))
     return Direction (sign (p));
   
-  return UP;
+  return to_dir (me->get_property("neutral-direction"));
 }
 
 
@@ -218,6 +223,14 @@ Tie::calc_control_points (SCM smob)
       //      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1
       )
     {
+      extract_grob_set (yparent, "ties", ties);
+      if (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");
     }
@@ -300,10 +313,8 @@ Tie::print (SCM smob)
 }
 
 ADD_INTERFACE (Tie,
-	       "A horizontal curve connecting two noteheads. \n\n"
-	       ,
+	       "A horizontal curve connecting two noteheads.",
 	       
-
 	       /* properties */
 	       "annotation "
 	       "avoid-slur " 	//  UGH.
@@ -312,13 +323,13 @@ ADD_INTERFACE (Tie,
 	       "dash-period "
 	       "details "
 	       "direction "
-	       "separation-item "
 	       "head-direction "
-	       "line-thickness " 
+	       "line-thickness "
+	       "neutral-direction "
 	       "quant-score "
+	       "separation-item "
 	       "staff-position "
 	       "thickness "
-
 	       );