X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-item.cc;h=ae8910fca496c61353eb1991c8cffa54d8d824ab;hb=455972425ff391f3c4ab80c689a8e9e803af8cc7;hp=b0c86c45b46060154ffd6f8af538cb82d69940fb;hpb=2eb63c6977706ba261e4ee0674c734a34b3ee904;p=lilypond.git diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index b0c86c45b4..ae8910fca4 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001--2007 Han-Wen Nienhuys + (c) 2001--2009 Han-Wen Nienhuys */ #include "percent-repeat-item.hh" @@ -26,17 +26,17 @@ Percent_repeat_item_interface::brew_slash (Grob *me) return m; } -/* - todo: use grob props for dot_neg_kern, slash_neg_kern? -*/ Stencil -Percent_repeat_item_interface::x_percent (Grob *me, int count, - Real dot_neg_kern, - Real slash_neg_kern) +Percent_repeat_item_interface::x_percent (Grob *me, int count) { Stencil m; Stencil s = brew_slash (me); + Real dot_neg_kern = + robust_scm2double (me->get_property ("dot-negative-kern"), 0.75); + Real slash_neg_kern = + robust_scm2double (me->get_property ("slash-negative-kern"), 1.6); + for (int i = count; i--;) m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern); Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots.dot"); @@ -47,6 +47,7 @@ Percent_repeat_item_interface::x_percent (Grob *me, int count, m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern); m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern); + m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS); return m; } @@ -55,8 +56,7 @@ SCM Percent_repeat_item_interface::double_percent (SCM grob) { Grob *me = unsmob_grob (grob); - Stencil m = x_percent (me, 2, 0.75, 1.6); - m.translate_axis (- m.extent (X_AXIS).center (), X_AXIS); + Stencil m = x_percent (me, 2); return m.smobbed_copy (); } @@ -74,6 +74,8 @@ ADD_INTERFACE (Percent_repeat_item_interface, "Repeats that look like percent signs.", /* properties */ + "dot-negative-kern " + "slash-negative-kern " "slope " "thickness " );