X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Ftie.cc;h=bf9a4769d426a00b7f072e157aa0ddf143454d4c;hb=415e12bad5e919a796cb1023576e725dbfb13f4e;hp=1d4e7fca9ac296659d01bfdfd2deaeae3e9f7df6;hpb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;p=lilypond.git

diff --git a/lily/tie.cc b/lily/tie.cc
index 1d4e7fca9a..bf9a4769d4 100644
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -1,9 +1,20 @@
 /*
-  tie.cc -- implement Tie
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "tie.hh"
@@ -17,6 +28,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"
@@ -30,8 +42,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);
 }
@@ -113,7 +124,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,11 +150,11 @@ 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"));
 }
 
 
-MAKE_SCHEME_CALLBACK(Tie, calc_direction, 1);
+MAKE_SCHEME_CALLBACK (Tie, calc_direction, 1);
 SCM
 Tie::calc_direction (SCM smob)
 {
@@ -204,8 +219,7 @@ Tie::get_control_points (Grob *me,
   return controls;
 }
 
-
-MAKE_SCHEME_CALLBACK(Tie, calc_control_points, 1);
+MAKE_SCHEME_CALLBACK (Tie, calc_control_points, 1);
 SCM
 Tie::calc_control_points (SCM smob)
 {
@@ -214,10 +228,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 (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");
     }
@@ -256,31 +276,28 @@ Tie::print (SCM smob)
 
   Stencil a;
 
-  SCM p = me->get_property ("dash-period");
-  SCM f = me->get_property ("dash-fraction");
-  if (scm_is_number (p) && scm_is_number (f))
-    a = Lookup::dashed_slur (b,
-			     line_thick,
-			     robust_scm2double (p, 1.0),
-			     robust_scm2double (f, 0));
-  else
-    a = Lookup::slur (b,
-		      get_grob_direction (me) * base_thick,
-		      line_thick);
+  SCM dash_definition = me->get_property ("dash-definition");
+  a = Lookup::slur (b,
+	            get_grob_direction (me) * base_thick,
+		    line_thick,
+                    dash_definition);
 
 #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))
+  SCM annotation = me->get_property ("annotation");
+  if (!scm_is_string (annotation))
+    {
+      SCM debug = me->layout ()->lookup_variable (ly_symbol2scm ("debug-tie-scoring"));
+      if (to_boolean (debug))
+	annotation = me->get_property ("quant-score");
+    }
+  if (scm_is_string (annotation))
     {
       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));
+				     annotation));
       tm.translate (Offset (b.control_[3][X_AXIS] + 0.5,
 			    b.control_[0][Y_AXIS] * 2));
       tm = tm.in_color (1, 0, 0);
@@ -297,24 +314,22 @@ 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.
 	       "control-points "
-	       "dash-fraction "
-	       "dash-period "
+               "dash-definition "
 	       "details "
 	       "direction "
-	       "separation-item "
 	       "head-direction "
-	       "line-thickness " 
+	       "line-thickness "
+	       "neutral-direction "
 	       "quant-score "
+	       "separation-item "
 	       "staff-position "
 	       "thickness "
-
 	       );