X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-interface.cc;h=c662d77d9f84f42b97e62d71f2c17b7320f113fc;hb=bd97c502d275ea64db1ad0334327b734e17f2496;hp=f936b0498f26d2abd1cd5e61d27938a36bf79e37;hpb=d4ba37c298813e0f7008ef8388e126c34d8f8dd3;p=lilypond.git

diff --git a/lily/line-interface.cc b/lily/line-interface.cc
index f936b0498f..c662d77d9f 100644
--- a/lily/line-interface.cc
+++ b/lily/line-interface.cc
@@ -210,16 +210,15 @@ Line_interface::line (Grob *me, Offset from, Offset to)
   else if (type == ly_symbol2scm ("trill"))
     return make_trill_line (me, from, to);
   
-  Stencil stil;
+  Stencil stencil;
 
-  SCM dash_fraction = me->get_property ("dash-fraction");
-  if (scm_is_number (dash_fraction) || type == ly_symbol2scm ("dotted-line"))
+  if (type == ly_symbol2scm ("dashed-line") || type == ly_symbol2scm ("dotted-line"))
     {
 
       Real fraction
 	= type == ly_symbol2scm ("dotted-line")
 	? 0.0
-	: robust_scm2double (dash_fraction, 0.4);
+	: robust_scm2double (me->get_property ("dash-fraction"), 0.4);
 
       fraction = min (max (fraction, 0.0), 1.0);
       Real period = Staff_symbol_referencer::staff_space (me)
@@ -240,21 +239,24 @@ Line_interface::line (Grob *me, Offset from, Offset to)
 	   */
 	  period = ((to-from).length () - period * fraction) / n;
 	}
-      stil = make_dashed_line (thick, from, to, period, fraction);
+      stencil = make_dashed_line (thick, from, to, period, fraction);
     }
   else
-    stil = make_line (thick, from, to);
+    stencil = make_line (thick, from, to);
 
-  return stil;
+  return stencil;
 }
 
 ADD_INTERFACE (Line_interface,
-	       "Generic line objects. Any object using lines supports this.  Normally, "
-	       "you get a straight line. If @code{dash-period} is defined, a dashed line is "
-	       "produced; the length of the dashes is tuned with "
-	       "@code{dash-fraction}. If the latter is set to 0, a dotted line is "
-	       "produced. If @code{dash-fraction} is negative, the line is made "
-	       "transparent.",
+	       "Generic line objects.  Any object using lines supports this."
+	       "  The property @code{style} can be @code{line},"
+	       " @code{dashed-line}, @code{trill}, @code{dotted-line} or"
+	       " @code{zigzag}.\n"
+	       "\n"
+	       "For @code{dashed-line}, the length of the dashes is tuned"
+	       " with @code{dash-fraction}.  If the latter is set to@tie{}0, a"
+	       " dotted line is produced.  If @code{dash-period} is negative,"
+	       " the line is made transparent.",
 
 	       /* properties */
 	       "dash-period "