X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-item.cc;h=b0c86c45b46060154ffd6f8af538cb82d69940fb;hb=3635122e33a2c93a6240647b98f3e37d2cfdfe81;hp=f7b553b20699b8f254b8569d50d5d594e94ab748;hpb=b782f68f927fa02b3ea895dd1bd801082e5bda6e;p=lilypond.git diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index f7b553b206..b0c86c45b4 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -1,28 +1,25 @@ -/* - percent-repeat-item.cc -- implement Percent_repeat_item_interface - - source file of the GNU LilyPond music typesetter - - (c) 2001--2004 Han-Wen Nienhuys - - */ +/* + percent-repeat-item.cc -- implement Percent_repeat_item_interface -#include "percent-repeat-item.hh" + source file of the GNU LilyPond music typesetter -#include + (c) 2001--2007 Han-Wen Nienhuys +*/ +#include "percent-repeat-item.hh" +#include "item.hh" #include "lookup.hh" #include "font-interface.hh" Stencil -Percent_repeat_item_interface::brew_slash ( Grob *me) +Percent_repeat_item_interface::brew_slash (Grob *me) { Real slope = robust_scm2double (me->get_property ("slope"), 1); Real wid = 2.0 / slope; /* todo: check out if in staff-rule thickness normally. - */ + */ Real thick = robust_scm2double (me->get_property ("thickness"), 1); Stencil m = Lookup::repeat_slash (wid, slope, thick); m.translate_axis (-m.extent (Y_AXIS).center (), Y_AXIS); @@ -31,31 +28,29 @@ Percent_repeat_item_interface::brew_slash ( Grob *me) /* 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) { - Stencil m ; + Stencil m; Stencil s = brew_slash (me); - for (int i = count; i--;) - { - m.add_at_edge (X_AXIS, RIGHT, s, -slash_neg_kern,0); - } - Stencil d1 = Font_interface::get_default_font (me)->find_by_name ("dots-dot"); - Stencil d2 = d1; - d1.translate_axis (0.5, Y_AXIS ); + 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"); + Stencil d2 = d1; + d1.translate_axis (0.5, Y_AXIS); d2.translate_axis (-0.5, Y_AXIS); - - m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern,0); - m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern,0); + + m.add_at_edge (X_AXIS, LEFT, d1, -dot_neg_kern); + m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern); return m; } -MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface,double_percent,1); +MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface, double_percent, 1); SCM Percent_repeat_item_interface::double_percent (SCM grob) { @@ -65,7 +60,7 @@ Percent_repeat_item_interface::double_percent (SCM grob) return m.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface,beat_slash,1); +MAKE_SCHEME_CALLBACK (Percent_repeat_item_interface, beat_slash, 1); SCM Percent_repeat_item_interface::beat_slash (SCM grob) { @@ -75,9 +70,11 @@ Percent_repeat_item_interface::beat_slash (SCM grob) return m.smobbed_copy (); } -ADD_INTERFACE (Percent_repeat_item_interface,"percent-repeat-interface", - "Repeats that look like percent signs", - "slope thickness"); - - +ADD_INTERFACE (Percent_repeat_item_interface, + "Repeats that look like percent signs.", + + /* properties */ + "slope " + "thickness " + );