X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=baa061b2e4107b827fcaf29c2b3dbc7d41a5dbc3;hb=f525f992e5dbeb579981153775cc9ee10b78cb3f;hp=ed39337b78db4836b28a725187da3447bceac320;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index ed39337b78..baa061b2e4 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,46 +3,33 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ #include "multi-measure-rest.hh" -#include "debug.hh" -#include "paper-def.hh" + +#include "warn.hh" +#include "output-def.hh" #include "paper-column.hh" // urg #include "font-interface.hh" #include "rest.hh" -#include "molecule.hh" #include "misc.hh" -#include "group-interface.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "text-item.hh" #include "percent-repeat-item.hh" - - -void -Multi_measure_rest::set_interface (Grob*me) -{ - me->set_interface (ly_symbol2scm ("multi-measure-rest-interface")); -} - -bool -Multi_measure_rest::has_interface (Grob*me) -{ - return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface")); -} +#include "lookup.hh" +#include "separation-item.hh" MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1); SCM Multi_measure_rest::percent (SCM smob) { - Grob *me = unsmob_grob (smob); Spanner *sp = dynamic_cast (me); - Molecule r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); + Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); // ugh copy & paste. @@ -50,7 +37,7 @@ Multi_measure_rest::percent (SCM smob) Direction d = LEFT; do { - Item * col = sp->get_bound (d)->column_l (); + Item * col = sp->get_bound (d)->get_column (); Interval coldim = col->extent (0, X_AXIS); @@ -77,99 +64,187 @@ Multi_measure_rest::percent (SCM smob) return r.smobbed_copy (); } - -/* - [TODO] 17 - variable-sized multi-measure rest symbol: |====| ?? -*/ -MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Multi_measure_rest,print,1); SCM -Multi_measure_rest::brew_molecule (SCM smob) +Multi_measure_rest::print (SCM smob) { Grob *me = unsmob_grob (smob); - if (to_boolean (me->get_grob_property ("skip-timestep"))) - { - me->set_grob_property ("skip-timestep", SCM_EOL); - return SCM_EOL; - } - Spanner * sp = dynamic_cast (me); - SCM alist_chain = Font_interface::font_alist_chain (me); - - - SCM style_chain = - Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"), - alist_chain); - - Font_metric *musfont - = Font_interface::get_font (me,style_chain); - - Real staff_space = Staff_symbol_referencer::staff_space (me); - Interval sp_iv; Direction d = LEFT; + + Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS); do { - Item * col = sp->get_bound (d)->column_l (); + Item * b = sp->get_bound (d); - Interval coldim = col->extent (0, X_AXIS); + Interval coldim = (Separation_item::has_interface (b)) + ? Separation_item::relative_width (b, common) + : b->extent (common, X_AXIS); - sp_iv[d] = coldim[-d] ; + sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d]; } while ((flip (&d)) != LEFT); - Molecule mol; - Real x_off = 0.0; + + Real space = sp_iv.length (); 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; + Real x_off = (sp_iv[LEFT] - rx) >? 0; - /* - center between stuff. - */ - x_off += sp_iv.length ()/ 2; - - Molecule s; + Stencil mol; + mol.add_stencil (symbol_stencil (me, space)); int measures = 0; - SCM m (me->get_grob_property ("measure-count")); - if (gh_number_p (m)) + SCM m (me->get_property ("measure-count")); + if (scm_is_number (m)) { - measures = gh_scm2int (m); + measures = scm_to_int (m); } - - SCM limit = me->get_grob_property ("expand-limit"); + mol.translate_axis (x_off, X_AXIS); + return mol.smobbed_copy (); +} + + + +Stencil +Multi_measure_rest::symbol_stencil (Grob *me, Real space) +{ + int measures = 0; + SCM m (me->get_property ("measure-count")); + if (scm_is_number (m)) + { + measures = scm_to_int (m); + } if (measures <= 0) - return SCM_EOL; + 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); + return s; + } + + SCM alist_chain = Font_interface::music_font_alist_chain (me); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + Font_metric *musfont + = select_font (me->get_layout (), alist_chain); + + SCM sml = me->get_property ("use-breve-rest"); if (measures == 1) { - s = musfont->find_by_name (Rest::glyph_name (me, 0, "")); + if (to_boolean (sml)) + { + Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "", false)); - /* - ugh. - */ - if (Staff_symbol_referencer::position_f (me) == 0.0) - s.translate_axis (Staff_symbol_referencer::staff_space (me), Y_AXIS); + s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS); + + return s; + } + else + { + Stencil s = musfont->find_by_name (Rest::glyph_name (me, 0, "", true)); + + /* + 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 ; + } + } + else + { + return church_rest (me, musfont, measures, space); } - else if (measures <= gh_scm2int (limit)) +} + + +/* + 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 ythick = hair_thick * slt * ss; + Box b (Interval (0, 0 >? (width - 2 * ythick)), Interval (-y, y)); + + Real blot = width ? (.8 * (y get_property ("use-breve-rest"); + + while (l) { - /* - Build a rest from smaller parts. Distances inbetween are - really variable, see Wanske pp. 125 */ + if (sml == SCM_BOOL_T) + { + int k; + if (l >= 2) + { + l -= 2; + k = -2; + } + else + { + l -= 1; + k = -1; + } - int l = measures; - while (l) + Stencil r (musfont->find_by_name ("rests." + to_string (k))); + symbols_width += r.extent (X_AXIS).length (); + mols = scm_cons (r.smobbed_copy (), mols); + } + else { int k; if (l >= 4) { - l-=4; + l -= 4; k = -2; } else if (l>= 2) @@ -180,96 +255,95 @@ Multi_measure_rest::brew_molecule (SCM smob) else { k = 0; - l --; + l--; } - Real pad = s.empty_b () - ? 0.0 : gh_scm2double (me->get_grob_property ("padding")) * staff_space; - - Molecule r (musfont->find_by_name ("rests-" + to_str (k))); + Stencil r (musfont->find_by_name ("rests." + to_string (k))); if (k == 0) - r.translate_axis (staff_space, Y_AXIS); - - s.add_at_edge (X_AXIS, RIGHT, r, pad); + { + Real staff_space = Staff_symbol_referencer::staff_space (me); + r.translate_axis (staff_space, Y_AXIS); + } + symbols_width += r.extent (X_AXIS).length (); + mols = scm_cons (r.smobbed_copy (), mols); } - - - s.align_to (X_AXIS, CENTER); - } - else - { - String idx = ("rests-") + to_str (-4); - s = musfont->find_by_name (idx); + count ++; } - - mol.add_molecule (s); - if (measures > 1) - { - Molecule s = Text_item::text2molecule (me, - ly_str02scm (to_str (measures).ch_C ()), - alist_chain); - s.align_to (X_AXIS, CENTER); - s.translate_axis (3.0 * staff_space, Y_AXIS); - mol.add_molecule (s); - } - mol.translate_axis (x_off, X_AXIS); - return mol.smobbed_copy (); + + /* Make outer padding this much bigger. */ + Real outer_padding_factor = 1.5; + Real inner_padding = (space - symbols_width) + / (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); + mol.align_to (X_AXIS, LEFT); + mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); + + return mol; } -/* - UGH. JUNKME elt prop "columns" isn't really needed. - */ void -Multi_measure_rest::add_column (Grob*me,Item* c) +Multi_measure_rest::add_column (Grob *me, Item *c) { - Pointer_group_interface::add_grob (me, ly_symbol2scm ("columns"),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); - +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1); SCM Multi_measure_rest::set_spacing_rods (SCM smob) { - Grob*me = unsmob_grob (smob); + Grob *me = unsmob_grob (smob); Spanner*sp = dynamic_cast (me); - if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT))) + if (!(sp->get_bound (LEFT) && sp->get_bound (RIGHT))) { programming_error ("Multi_measure_rest::get_rods (): I am not spanned!"); return SCM_UNSPECIFIED; } - Item * l = sp->get_bound (LEFT)->column_l (); - Item * r = sp->get_bound (RIGHT)->column_l (); - Item * lb = l->find_prebroken_piece (RIGHT); - Item * rb = r->find_prebroken_piece (LEFT); + 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* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}}; - Real staff_space = Staff_symbol_referencer::staff_space (me); - for (int i=0; i < 4; i++) + 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 * l = combinations[i][0]; - Item *r = combinations[i][1]; + Item *li = combinations[i][0]; + Item *ri = combinations[i][1]; - if (!l || !r) + if (!li || !ri) continue; Rod rod; - rod.item_l_drul_[LEFT] = l; - rod.item_l_drul_[RIGHT] = r; - - /* - should do something more advanced. - */ - rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER] - + gh_scm2double (me->get_grob_property ("minimum-width")) * staff_space; + rod.item_l_drul_[LEFT] = li; + rod.item_l_drul_[RIGHT] = ri; + + rod.distance_ = li->extent (li, X_AXIS)[BIGGER] + - ri->extent (ri, X_AXIS)[SMALLER] + /* 2.0 = magic! */ + + sym_width + 2.0; + Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0); + rod.distance_ = max (rod.distance_, minlen); rod.add_to_cols (); } return SCM_UNSPECIFIED; } +ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface", + "A rest that spans a whole number of measures.", + "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length"); +