X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=d11153aaab654981e13c48e1befd8bf2303e664c;hb=cd97f3fa5b1275595307e89b5b070f833adb573a;hp=e67ed6b3e15edb68769461dbe2f719a8f1142672;hpb=7e33691750a97e1b66192cb484f479a173390132;p=lilypond.git

diff --git a/lily/tie.cc b/lily/tie.cc
index e67ed6b3e1..d11153aaab 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -7,22 +7,25 @@
 */
 
 #include "tie.hh"
-#include "spanner.hh"
+
+#include "main.hh"
+#include "bezier.hh"
+#include "directional-element-interface.hh"
+#include "font-interface.hh"
+#include "grob-array.hh"
 #include "lookup.hh"
+#include "note-head.hh"
 #include "output-def.hh"
-#include "rhythmic-head.hh"
-#include "bezier.hh"
 #include "paper-column.hh"
-#include "warn.hh"
+#include "rhythmic-head.hh"
+#include "spanner.hh"
 #include "staff-symbol-referencer.hh"
-#include "directional-element-interface.hh"
-#include "bezier.hh"
 #include "stem.hh"
-#include "note-head.hh"
+#include "text-interface.hh"
 #include "tie-column.hh"
-#include "grob-array.hh"
-#include "tie-formatting-problem.hh"
 #include "tie-configuration.hh"
+#include "tie-formatting-problem.hh"
+#include "warn.hh"
 
 
 int
@@ -68,7 +71,7 @@ Tie::get_position (Grob *me)
     {
       Grob *h = head (me, d);
       if (h)
-	return (int) Staff_symbol_referencer::get_position (h);
+	return (int) rint (Staff_symbol_referencer::get_position (h));
     }
   while (flip (&d) != LEFT);
 
@@ -96,20 +99,32 @@ Tie::get_position (Grob *me)
 Direction
 Tie::get_default_dir (Grob *me)
 {
-  Item *sl = head (me, LEFT) ? Rhythmic_head::get_stem (head (me, LEFT)) : 0;
-  Item *sr = head (me, RIGHT) ? Rhythmic_head::get_stem (head (me, RIGHT)) : 0;
-  if (sl && sr)
+  Drul_array<Grob*> stems;
+  Direction d = LEFT;
+  do
+    {
+      Grob *stem = head (me, d) ? Rhythmic_head::get_stem (head (me, d)) : 0;
+      if (stem)
+	stem = Stem::is_invisible (stem) ? 0 : stem;
+
+      stems[d] = stem;
+    }
+  while (flip (&d)!= LEFT);
+  
+  if (stems[LEFT] && stems[RIGHT])
     {
-      if (get_grob_direction (sl) == UP
-	  && get_grob_direction (sr) == UP)
+      if (get_grob_direction (stems[LEFT]) == UP
+	  && get_grob_direction (stems[RIGHT]) == UP)
 	return DOWN;
     }
-  else if (sl || sr)
+  else if (stems[LEFT] || stems[RIGHT])
     {
-      Item *s = sl ? sl : sr;
+      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;
 }
 
@@ -193,7 +208,7 @@ Tie::calc_control_points (SCM smob)
       (void) yparent->get_property ("positioning-done");
     }
 
-  if (!scm_is_pair (me->get_property ("control-points")))
+  if (!scm_is_pair (me->get_property_data (ly_symbol2scm ("control-points"))))
     {
       set_default_control_points (me);
     }
@@ -201,7 +216,9 @@ Tie::calc_control_points (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-
+/*
+  TODO: merge witnh Slur::print.
+ */
 MAKE_SCHEME_CALLBACK (Tie, print, 1);
 SCM
 Tie::print (SCM smob)
@@ -211,8 +228,8 @@ Tie::print (SCM smob)
   SCM cp = me->get_property ("control-points");
 
   Real staff_thick = Staff_symbol_referencer::line_thickness (me);
-  Real base_thick = robust_scm2double (me->get_property ("thickness"), 1);
-  Real thick = base_thick * staff_thick;
+  Real base_thick = staff_thick * robust_scm2double (me->get_property ("thickness"), 1);
+  Real line_thick = staff_thick * robust_scm2double (me->get_property ("line-thickness"), 1);
 
   Bezier b;
   int i = 0;
@@ -228,13 +245,31 @@ Tie::print (SCM smob)
   SCM f = me->get_property ("dash-fraction");
   if (scm_is_number (p) && scm_is_number (f))
     a = Lookup::dashed_slur (b,
-			     thick,
+			     line_thick,
 			     robust_scm2double (p, 1.0),
 			     robust_scm2double (f, 0));
   else
     a = Lookup::slur (b,
-		      get_grob_direction (me) * staff_thick,
-		      thick);
+		      get_grob_direction (me) * base_thick,
+		      line_thick);
+
+#if DEBUG_TIE_SCORING
+  SCM quant_score = me->get_property ("quant-score");
+
+  if (to_boolean (me->layout ()
+		  ->lookup_variable (ly_symbol2scm ("debug-tie-scoring")))
+      && scm_is_string (quant_score))
+    {
+      string str;
+      SCM properties = Font_interface::text_font_alist_chain (me);
+
+      Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
+				    (me->layout ()->self_scm (), properties,
+				     quant_score));
+      tm.translate_axis (b.control_[0][Y_AXIS]*2, Y_AXIS);
+      a.add_at_edge (X_AXIS, RIGHT, tm, 1.0, 0);
+    }
+#endif
 
   return a.smobbed_copy ();
 }
@@ -242,7 +277,7 @@ Tie::print (SCM smob)
 ADD_INTERFACE (Tie,
 	       "tie-interface",
 	       
-	       "A tie connecting two noteheads. \n\n"
+	       "A horizontal curve connecting two noteheads. \n\n"
 	       ,
 	       
 
@@ -253,8 +288,11 @@ ADD_INTERFACE (Tie,
 	       "dash-period "
 	       "details "
 	       "direction "
+	       "line-thickness " 
+	       "quant-score "
+	       "staff-position "
 	       "thickness "
-	       "x-gap ");
+	       );