X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=d94518db3abc5427327a6caeb5e0cc660f40def4;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e0a44196a0053e772222289682acd9fa92239150;hpb=1021b8a64727e747c36d9e56ab8cefa93b2ea5d1;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index e0a44196a0..d94518db3a 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -1,228 +1,214 @@ -/* - 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--2002 Jan Nieuwenhuizen - - */ + + (c) 1998--2008 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 "system.hh" +#include "text-interface.hh" #include "percent-repeat-item.hh" #include "lookup.hh" +#include "separation-item.hh" -MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1); -SCM -Multi_measure_rest::percent (SCM smob) +Interval +Multi_measure_rest::bar_width (Spanner *me) { - Grob *me = unsmob_grob (smob); - Spanner *sp = dynamic_cast (me); - - Molecule r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); - - // ugh copy & paste. - - Interval sp_iv; + Interval iv; Direction d = LEFT; do { - Item * col = sp->get_bound (d)->get_column (); + Item *col = me->get_bound (d)->get_column (); - Interval coldim = col->extent (0, X_AXIS); + Interval coldim = Paper_column::break_align_width (col); - sp_iv[d] = coldim[-d] ; + iv[d] = coldim[-d]; } while ((flip (&d)) != LEFT); + + return iv; +} + +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); + + Stencil r = Percent_repeat_item_interface::x_percent (me, 1); + + // ugh copy & paste. + + Grob *common_x = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), + X_AXIS); + Interval sp_iv = bar_width (sp); Real x_off = 0.0; - Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); + Real rx = sp->get_bound (LEFT)->relative_coordinate (common_x, 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); + r.translate_axis (x_off, X_AXIS); - 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); + Spanner *sp = dynamic_cast (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)->get_column (); + Interval sp_iv = bar_width (sp); + Real space = sp_iv.length (); - Interval coldim = col->extent (common, X_AXIS); - - sp_iv[d] = 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); - 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)) - { - measures = gh_scm2int (m); - } + SCM m (me->get_property ("measure-count")); + if (scm_is_number (m)) + measures = scm_to_int (m); mol.translate_axis (x_off, X_AXIS); return mol.smobbed_copy (); } - - -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)) - { - measures = gh_scm2int (m); - } + SCM m (me->get_property ("measure-count")); + if (scm_is_number (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); - 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; } - 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->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); - 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. - */ + */ 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); } - - -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_var ("linethickness"); - Real y = slt * tthick/2 * ss; + Real slt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + Real y = slt * thick_thick / 2 * ss; Real ythick = hair_thick * slt * ss; - Box b(Interval (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))); + Box b (Interval (0.0, max (0.0, (width - 2 * ythick))), Interval (-y, y)); + + Real blot = width ? (.8 * min (y, ythick)) : 0.0; + + Stencil m = Lookup::round_filled_box (b, blot); + Stencil yb = Lookup::round_filled_box (Box (Interval (-0.5, 0.5) * ythick, Interval (-ss, ss)), blot); m.add_at_edge (X_AXIS, RIGHT, yb, 0); m.add_at_edge (X_AXIS, LEFT, yb, 0); m.align_to (X_AXIS, LEFT); - + return m; } /* Kirchenpause (?) - */ -Molecule -Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, +*/ +Stencil +Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, Real space) { - SCM mols = SCM_EOL; + SCM mols = SCM_EOL; - /* - see Wanske pp. 125 - */ + /* See Wanske pp. 125 */ int l = measures; int count = 0; Real symbols_width = 0.0; - SCM sml = me->get_grob_property ("use-breve-rest"); + bool use_breve = to_boolean (me->get_property ("use-breve-rest")); while (l) { - if (sml == SCM_BOOL_T) + if (use_breve) { int k; if (l >= 2) { - l-=2; + l -= 2; k = -2; } else @@ -231,19 +217,19 @@ 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 + else { int k; if (l >= 4) { - l-=4; + l -= 4; k = -2; } - else if (l>= 2) + else if (l >= 2) { l -= 2; k = -1; @@ -251,98 +237,123 @@ 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 ++; + 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; - } - - 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); - } + 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); 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); - -SCM -Multi_measure_rest::set_spacing_rods (SCM smob) +void +Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) { - return SCM_UNSPECIFIED; - - Grob*me = unsmob_grob (smob); - - Spanner*sp = dynamic_cast (me); + 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; + return ; } - 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* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}}; + 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); - Real sym_width = symbol_molecule (me, 0.0).extent (X_AXIS).length (); - - for (int i=0; i < 4; i++) + Item *combinations[4][2] = {{li, ri}, + {lb, ri}, + {li, rb}, + {lb, rb}}; + + 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_drul_[LEFT] = li; + rod.item_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_ = Paper_column::minimum_distance (li, ri) + + length + + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0); + + Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0); + rod.distance_ = max (rod.distance_, minlen); rod.add_to_cols (); } - return SCM_UNSPECIFIED; } +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1); +SCM +Multi_measure_rest::set_spacing_rods (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); + calculate_spacing_rods (me, sym_width); + + return SCM_UNSPECIFIED; +} + +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1); +SCM +Multi_measure_rest::set_text_rods (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Stencil *stil = me->get_stencil (); + /* FIXME uncached */ + Real len = (stil && !stil->extent (X_AXIS).is_empty ()) + ? stil->extent (X_AXIS).length () + : 0.0; + calculate_spacing_rods (me, len); + return SCM_UNSPECIFIED; +} -ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface", - "A rest that spans a whole number of measures.\n", - "expand-limit measure-count hair-thickness thick-thickness use-breve-rest"); +ADD_INTERFACE (Multi_measure_rest, + "A rest that spans a whole number of measures.", + + /* properties */ + "expand-limit " + "measure-count " + "hair-thickness " + "thick-thickness " + "use-breve-rest " + "bound-padding " + "minimum-length " + );