X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-interface.cc;h=3d1bb02d6f3158cf9666541ca1ce6bf0e8b932af;hb=1987047329ca97c6b81aea4ded4b3e127c8c2d93;hp=b3f110f11a73fe9dc687c6b2dec6df081c95f599;hpb=bb5b3568f7ad1e96c4f067d1ebc9b0c2d2bd3b37;p=lilypond.git diff --git a/lily/line-interface.cc b/lily/line-interface.cc index b3f110f11a..3d1bb02d6f 100644 --- a/lily/line-interface.cc +++ b/lily/line-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2004--2007 Han-Wen Nienhuys + (c) 2004--2008 Han-Wen Nienhuys */ #include "line-interface.hh" @@ -111,13 +111,7 @@ Line_interface::make_zigzag_line (Grob *me, total.add_stencil (moved_squiggle); } - Box b; - b.add_point (Offset (0, 0)); - b.add_point (dz); - b[X_AXIS].widen (thick / 2); - b[Y_AXIS].widen (thick / 2); - - return Stencil (b, total.expr ()); + return total; } @@ -210,7 +204,7 @@ 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; if (type == ly_symbol2scm ("dashed-line") || type == ly_symbol2scm ("dotted-line")) { @@ -239,24 +233,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. " - "The property @code{style} can be @code{line}, " - "@code{dashed-line}, @code{trill}, \n" - "@code{dotted-line} or @code{zigzag}.\n" - "\n", - "For dashed-line, 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-period} 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 "