X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmulti-measure-rest.cc;h=f7741706849709bba3e861c9a9fc4b014e6aaf26;hb=6e227b10eed0ebe522ca7512eb7d2cc1d9561e64;hp=0d95c82f8abec91b4ee09c5a2241e7a11df2f6af;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 0d95c82f8a..f774170684 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -1,11 +1,10 @@ -/* - multi-measure-rest.cc -- implement Multi_measure_rest - +/* + multi-measure-rest.cc -- implement Multi_measure_rest + source file of the GNU LilyPond music typesetter - + (c) 1998--2005 Jan Nieuwenhuizen - - */ +*/ #include "multi-measure-rest.hh" @@ -17,7 +16,7 @@ #include "misc.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" -#include "text-item.hh" +#include "text-interface.hh" #include "percent-repeat-item.hh" #include "lookup.hh" #include "separation-item.hh" @@ -27,49 +26,48 @@ SCM Multi_measure_rest::percent (SCM smob) { Grob *me = unsmob_grob (smob); - Spanner *sp = dynamic_cast (me); - - Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); + Spanner *sp = dynamic_cast (me); + + Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); // ugh copy & paste. - + Interval sp_iv; Direction d = LEFT; do { - Item * col = sp->get_bound (d)->get_column (); + Item *col = sp->get_bound (d)->get_column (); Interval coldim = col->extent (0, X_AXIS); - sp_iv[d] = coldim[-d] ; + sp_iv[d] = coldim[-d]; } while ((flip (&d)) != LEFT); Real x_off = 0.0; - Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); + Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); /* we gotta stay clear of sp_iv, so move a bit to the right if needed. - */ - x_off += (sp_iv[LEFT] - rx) >? 0; + */ + x_off += max (sp_iv[LEFT] - rx, 0.0); /* center between stuff. - */ - x_off += sp_iv.length ()/ 2; + */ + x_off += sp_iv.length () / 2; r.translate_axis (x_off, X_AXIS); - return r.smobbed_copy (); } MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1); SCM -Multi_measure_rest::print (SCM smob) +Multi_measure_rest::print (SCM smob) { Grob *me = unsmob_grob (smob); - Spanner * sp = dynamic_cast (me); + Spanner *sp = dynamic_cast (me); Interval sp_iv; Direction d = LEFT; @@ -77,25 +75,24 @@ Multi_measure_rest::print (SCM smob) Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS); do { - Item * b = sp->get_bound (d); + Item *b = sp->get_bound (d); - Interval coldim = (Separation_item::has_interface (b)) + Interval coldim = (Separation_item::has_interface (b)) ? Separation_item::relative_width (b, common) : b->extent (common, X_AXIS); - sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d]; + sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d]; } while ((flip (&d)) != LEFT); Real space = sp_iv.length (); - Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); + Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); /* we gotta stay clear of sp_iv, so move a bit to the right if needed. - */ - Real x_off = (sp_iv[LEFT] - rx) >? 0; - + */ + Real x_off = max (sp_iv[LEFT] - rx, 0.0); Stencil mol; mol.add_stencil (symbol_stencil (me, space)); @@ -111,8 +108,6 @@ Multi_measure_rest::print (SCM smob) return mol.smobbed_copy (); } - - Stencil Multi_measure_rest::symbol_stencil (Grob *me, Real space) { @@ -124,14 +119,13 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) } if (measures <= 0) return Stencil (); - SCM limit = me->get_property ("expand-limit"); if (measures > scm_to_int (limit)) { - Real padding = 0.15; - Stencil s = big_rest (me, (1.0 - 2*padding) * space); - s.translate_axis (padding * space, X_AXIS); + Real padding = 0.15; + Stencil s = big_rest (me, (1.0 - 2 * padding) * space); + s.translate_axis (padding * space, X_AXIS); return s; } @@ -148,8 +142,8 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) { Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "", false)); - s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS); - + s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS); + return s; } else @@ -158,59 +152,57 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) /* ugh. - */ + */ if (Staff_symbol_referencer::get_position (me) == 0.0) s.translate_axis (staff_space, Y_AXIS); - s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS); - - return s ; - } + s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS); + + return s; + } } else { - return church_rest (me, musfont, measures, space); + return church_rest (me, musfont, measures, space); } } - /* WIDTH can also be 0 to determine the minimum size of the object. - */ +*/ Stencil Multi_measure_rest::big_rest (Grob *me, Real width) { Real thick_thick = robust_scm2double (me->get_property ("thick-thickness"), 1.0); Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1); - Real ss = Staff_symbol_referencer::staff_space (me); Real slt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); - Real y = slt * thick_thick/2 * ss; + Real y = slt * thick_thick / 2 * ss; Real ythick = hair_thick * slt * ss; - Box b (Interval (0, 0 >? (width - 2 * ythick)), Interval (-y, y)); - - Real blot = width ? (.8 * (y = 4) @@ -247,7 +239,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, l -= 4; k = -2; } - else if (l>= 2) + else if (l >= 2) { l -= 2; k = -1; @@ -267,21 +259,20 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, symbols_width += r.extent (X_AXIS).length (); mols = scm_cons (r.smobbed_copy (), mols); } - count ++; + count++; } - - /* Make outer padding this much bigger. */ + /* Make outer padding this much bigger. */ Real outer_padding_factor = 1.5; Real inner_padding = (space - symbols_width) - / (2 * outer_padding_factor + (count-1)); + / (2 * outer_padding_factor + (count - 1)); if (inner_padding < 0) inner_padding = 1.0; - - Stencil mol; - for (SCM s = mols; scm_is_pair (s); s = scm_cdr (s)) - mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (scm_car (s)), - inner_padding, 0); + + Stencil mol; + for (SCM s = mols; scm_is_pair (s); s = scm_cdr (s)) + mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (scm_car (s)), + inner_padding, 0); mol.align_to (X_AXIS, LEFT); mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); @@ -291,7 +282,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, void Multi_measure_rest::add_column (Grob *me, Item *c) { - add_bound_item (dynamic_cast (me), c); + add_bound_item (dynamic_cast (me), c); } MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1); @@ -300,8 +291,8 @@ Multi_measure_rest::set_spacing_rods (SCM smob) { Grob *me = unsmob_grob (smob); - Spanner*sp = dynamic_cast (me); - if (!(sp->get_bound (LEFT) && sp->get_bound (RIGHT))) + Spanner *sp = dynamic_cast (me); + if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT))) { programming_error ("Multi_measure_rest::get_rods (): I am not spanned!"); return SCM_UNSPECIFIED; @@ -310,15 +301,15 @@ Multi_measure_rest::set_spacing_rods (SCM smob) Item *li = sp->get_bound (LEFT)->get_column (); Item *ri = sp->get_bound (RIGHT)->get_column (); Item *lb = li->find_prebroken_piece (RIGHT); - Item *rb = ri->find_prebroken_piece (LEFT); - + Item *rb = ri->find_prebroken_piece (LEFT); + Item *combinations[4][2] = {{li, ri}, {lb, ri}, {li, rb}, {lb, rb}}; Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); - + for (int i = 0; i < 4; i++) { Item *li = combinations[i][0]; @@ -328,14 +319,14 @@ Multi_measure_rest::set_spacing_rods (SCM smob) continue; Rod rod; - rod.item_l_drul_[LEFT] = li; - rod.item_l_drul_[RIGHT] = ri; + rod.item_drul_[LEFT] = li; + rod.item_drul_[RIGHT] = ri; rod.distance_ = li->extent (li, X_AXIS)[BIGGER] - ri->extent (ri, X_AXIS)[SMALLER] /* 2.0 = magic! */ - + sym_width + 2.0; - + + sym_width + 2.0; + Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0); rod.distance_ = max (rod.distance_, minlen); rod.add_to_cols ();