X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-item.cc;h=691ad5dbae328680d65f4e1dc4396d91b8522ba7;hb=94dc81b1820c38ffb09ff47227d76b59cc6dd69c;hp=eddb2656a9606c2d2b9a739be142cf785d6ffad0;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index eddb2656a9..691ad5dbae 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -1,28 +1,26 @@ -/* - percent-repeat-item.cc -- implement Percent_repeat_item_interface - +/* + percent-repeat-item.cc -- implement Percent_repeat_item_interface + source file of the GNU LilyPond music typesetter - - (c) 2001--2004 Han-Wen Nienhuys - - */ + + (c) 2001--2006 Han-Wen Nienhuys +*/ #include "percent-repeat-item.hh" -#include #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 +29,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, 0); + 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, 0); + m.add_at_edge (X_AXIS, RIGHT, d2, -dot_neg_kern, 0); 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 +61,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 +71,7 @@ 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, "percent-repeat-interface", + "Repeats that look like percent signs", + "slope thickness");