X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur.cc;h=94e13fe027a1b0ac450162e8942187924fb5b615;hb=ab547077f8c694c8edf882ce58fc6ed63407ccb6;hp=7c015019ffd3fb1d1dd2ca842023896c61a42728;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/slur.cc b/lily/slur.cc
index 7c015019ff..94e13fe027 100644
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -84,8 +84,11 @@ Slur::print (SCM smob)
     }
 
   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 one = get_curve (me);
   Stencil a;
 
@@ -95,12 +98,12 @@ Slur::print (SCM smob)
   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 (one, thick, robust_scm2double (p, 1.0),
+    a = Lookup::dashed_slur (one, line_thick, robust_scm2double (p, 1.0),
 			     robust_scm2double (f, 0));
   else
     a = Lookup::slur (one,
-		      get_grob_direction (me) * staff_thick * 1.0,
-		      thick);
+		      get_grob_direction (me) * base_thick,
+		      line_thick);
 
 #if DEBUG_SLUR_SCORING
   SCM quant_score = me->get_property ("quant-score");
@@ -109,9 +112,11 @@ Slur::print (SCM smob)
 		  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
       && scm_is_string (quant_score))
     {
-      std::string str;
+      string str;
       SCM properties = Font_interface::text_font_alist_chain (me);
 
+      properties = scm_cons (scm_acons (ly_symbol2scm ("font-size"), scm_from_int (-6), SCM_EOL),
+				 properties);
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
 				    (me->layout ()->self_scm (), properties,
 				     quant_score));
@@ -233,17 +238,21 @@ ADD_INTERFACE (Slur, "slur-interface",
 	       "A slur",
 	       
 	       /* properties */
+	       "avoid-slur " 	/* UGH. */
 	       "control-points "
 	       "dash-fraction "
 	       "dash-period "
+	       "details "
 	       "direction "
 	       "eccentricity "
 	       "encompass-objects "
 	       "height-limit "
+	       "line-thickness "
 	       "note-columns "
 	       "positions "
 	       "quant-score "
 	       "ratio "
-	       "details "
-	       "thickness ");
+	       "thickness "
+
+	       );