X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=bf9a4769d426a00b7f072e157aa0ddf143454d4c;hb=415e12bad5e919a796cb1023576e725dbfb13f4e;hp=f02cddacf84a8f107cc637dcf72121c3c48332eb;hpb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;p=lilypond.git

diff --git a/lily/tie.cc b/lily/tie.cc
index f02cddacf8..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--2008 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"
@@ -265,17 +276,11 @@ 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 annotation = me->get_property ("annotation");
@@ -315,8 +320,7 @@ ADD_INTERFACE (Tie,
 	       "annotation "
 	       "avoid-slur " 	//  UGH.
 	       "control-points "
-	       "dash-fraction "
-	       "dash-period "
+               "dash-definition "
 	       "details "
 	       "direction "
 	       "head-direction "