X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=baa061b2e4107b827fcaf29c2b3dbc7d41a5dbc3;hb=15c43df3abc82ef71c674d7a7e4e4b6951b38187;hp=9d7d2c4285af38378a75e27558f1f86a4004d6bd;hpb=e8936ee66fdd3e7ebe30556590e8dc913908a533;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 9d7d2c4285..baa061b2e4 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,23 +3,24 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2003 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ #include "multi-measure-rest.hh" + #include "warn.hh" -#include "paper-def.hh" +#include "output-def.hh" #include "paper-column.hh" // urg #include "font-interface.hh" #include "rest.hh" -#include "molecule.hh" #include "misc.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "text-item.hh" #include "percent-repeat-item.hh" #include "lookup.hh" +#include "separation-item.hh" MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1); SCM @@ -28,7 +29,7 @@ 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. @@ -63,9 +64,9 @@ Multi_measure_rest::percent (SCM smob) return r.smobbed_copy (); } -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); Spanner * sp = dynamic_cast (me); @@ -76,15 +77,17 @@ Multi_measure_rest::brew_molecule (SCM smob) Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS); do { - Item * col = sp->get_bound (d)->get_column (); + Item * b = sp->get_bound (d); - Interval coldim = col->extent (common, 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); - Real space = sp_iv.length(); + Real space = sp_iv.length (); Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); /* @@ -94,14 +97,14 @@ Multi_measure_rest::brew_molecule (SCM smob) Real x_off = (sp_iv[LEFT] - rx) >? 0; - Molecule mol; - mol.add_molecule (symbol_molecule (me, space)); + 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); } mol.translate_axis (x_off, X_AXIS); @@ -110,48 +113,48 @@ Multi_measure_rest::brew_molecule (SCM smob) -Molecule -Multi_measure_rest::symbol_molecule (Grob *me, Real space) +Stencil +Multi_measure_rest::symbol_stencil (Grob *me, Real 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); } if (measures <= 0) - return Molecule(); + return Stencil (); - SCM limit = me->get_grob_property ("expand-limit"); - if (measures > gh_scm2int (limit)) + SCM limit = me->get_property ("expand-limit"); + if (measures > scm_to_int (limit)) { Real padding = 0.15; - Molecule s = big_rest (me, (1.0 - 2*padding) * space); + Stencil s = big_rest (me, (1.0 - 2*padding) * space); s.translate_axis (padding * space, X_AXIS); return s; } - SCM alist_chain = Font_interface::font_alist_chain (me); + SCM alist_chain = Font_interface::music_font_alist_chain (me); Real staff_space = Staff_symbol_referencer::staff_space (me); Font_metric *musfont - = Font_interface::get_font (me,alist_chain); + = select_font (me->get_layout (), alist_chain); - SCM sml = me->get_grob_property ("use-breve-rest"); + SCM sml = me->get_property ("use-breve-rest"); if (measures == 1) { - if (sml == SCM_BOOL_T) + if (to_boolean (sml)) { - Molecule s = musfont->find_by_name (Rest::glyph_name (me, -1, "")); + Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "", false)); s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS); - return s ; + return s; } else { - Molecule s = musfont->find_by_name (Rest::glyph_name (me, 0, "")); + Stencil s = musfont->find_by_name (Rest::glyph_name (me, 0, "", true)); /* ugh. @@ -171,23 +174,26 @@ Multi_measure_rest::symbol_molecule (Grob *me, Real space) } - -Molecule +/* + WIDTH can also be 0 to determine the minimum size of the object. + */ +Stencil Multi_measure_rest::big_rest (Grob *me, Real width) { - Real tthick = gh_scm2double (me->get_grob_property ("thick-thickness")); - Real hair_thick = gh_scm2double (me->get_grob_property ("hair-thickness")); + 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_paper ()->get_realvar (ly_symbol2scm ("linethickness")); - Real y = slt * tthick/2 * ss; + 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, width - 2 * ythick), Interval (-y, y)); + Box b (Interval (0, 0 >? (width - 2 * ythick)), Interval (-y, y)); - Molecule m = Lookup::filledbox (b); - Molecule yb = Lookup::filledbox (Box (Interval (-0.5, 0.5)* ythick, Interval (-ss, ss))); + Real blot = width ? (.8 * (y get_grob_property ("use-breve-rest"); + SCM sml = me->get_property ("use-breve-rest"); while (l) { @@ -222,7 +226,7 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, int k; if (l >= 2) { - l-=2; + l -= 2; k = -2; } else @@ -231,16 +235,16 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, k = -1; } - Molecule r (musfont->find_by_name ("rests-" + to_string (k))); + Stencil r (musfont->find_by_name ("rests." + to_string (k))); symbols_width += r.extent (X_AXIS).length (); - mols = gh_cons (r.smobbed_copy (), mols); + mols = scm_cons (r.smobbed_copy (), mols); } else { int k; if (l >= 4) { - l-=4; + l -= 4; k = -2; } else if (l>= 2) @@ -251,99 +255,94 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, else { k = 0; - l --; + l--; } - Molecule r (musfont->find_by_name ("rests-" + to_string (k))); + Stencil r (musfont->find_by_name ("rests." + to_string (k))); if (k == 0) { Real staff_space = Staff_symbol_referencer::staff_space (me); r.translate_axis (staff_space, Y_AXIS); } symbols_width += r.extent (X_AXIS).length (); - mols = gh_cons (r.smobbed_copy (), mols); + mols = scm_cons (r.smobbed_copy (), mols); } count ++; } - - Real outer_padding_factor = 1.5; // make outer padding this much bigger. - Real inner_padding = (space - symbols_width) / (2 * outer_padding_factor + (count-1)); + /* 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; - } + inner_padding = 1.0; - Molecule mol; - for (SCM s = mols; gh_pair_p (s); s = gh_cdr(s)) - { - mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_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); + mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); return mol; } void -Multi_measure_rest::add_column (Grob*me,Item* c) +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); +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)->get_column (); - Item * r = sp->get_bound (RIGHT)->get_column (); - 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}}; + Item *combinations[4][2] = {{li,ri}, + {lb,ri}, + {li,rb}, + {lb,rb}}; - Real sym_width = symbol_molecule (me, 0.0).extent (X_AXIS).length (); + Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); - for (int i=0; i < 4; i++) + 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; + rod.item_l_drul_[LEFT] = li; + rod.item_l_drul_[RIGHT] = ri; - - rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER] - + sym_width + 2.0; // 2.0 = magic! + rod.distance_ = li->extent (li, X_AXIS)[BIGGER] + - ri->extent (ri, X_AXIS)[SMALLER] + /* 2.0 = magic! */ + + sym_width + 2.0; - Real minlen =0.0; - SCM ml =me->get_grob_property ("minimum-length"); - if (gh_number_p (ml)) minlen = gh_scm2double (ml); - rod.distance_ = max(rod.distance_, - minlen); + 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");