X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=7ce96126f47aa6d698c059d4bec04ca0b6e7359a;hb=f1d34682d29f5c714cb4b02221043da5ae1e659c;hp=ea462cee20b90a34ad06fcf30df884337f303a4b;hpb=28b274e6d311e56087794a973e82ebd1185f923e;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index ea462cee20..7ce96126f4 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -1,182 +1,359 @@ -/* - 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--2000 Jan Nieuwenhuizen - - */ + + (c) 1998--2009 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 "bar.hh" -#include "lookup.hh" +#include "font-interface.hh" #include "rest.hh" -#include "molecule.hh" #include "misc.hh" -#include "group-interface.hh" -#include "stem.hh" +#include "spanner.hh" #include "staff-symbol-referencer.hh" +#include "system.hh" +#include "text-interface.hh" +#include "percent-repeat-item.hh" +#include "lookup.hh" +#include "separation-item.hh" -Multi_measure_rest::Multi_measure_rest () -{ - measures_i_ = 0; - set_elt_property ("columns", SCM_EOL); -} - - -/* - [TODO] 17 - * variable-sized multi-measure rest symbol: |====| ?? - - * build 3, 5, 6, 7, 8 symbols (how far, property?) - from whole, brevis and longa rests - -*/ -Molecule* -Multi_measure_rest::do_brew_molecule_p () const +Interval +Multi_measure_rest::bar_width (Spanner *me) { - Interval sp_iv; + Interval iv; Direction d = LEFT; do { - Item * col = spanned_drul_[d]->column_l (); + Item *col = me->get_bound (d)->get_column (); - Interval coldim = col->extent (X_AXIS) - + col->relative_coordinate (0, X_AXIS); + Interval coldim = Paper_column::break_align_width (col); - sp_iv[d] = coldim[-d] ; + iv[d] = coldim[-d]; } while ((flip (&d)) != LEFT); - Molecule *mol_p = new Molecule; + + 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 = spanned_drul_[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; - - Molecule s; - bool rest_symbol=true; - SCM alt_symbol_sym =get_elt_property ("alt-symbol"); - if (gh_string_p (alt_symbol_sym)) - { - s = lookup_l () -> afm_find (ly_scm2string (alt_symbol_sym)); - rest_symbol = false; - } - else if (measures_i_ == 1 || measures_i_ == 2 || measures_i_ == 4) - { - s = lookup_l ()->afm_find ("rests-" + to_str (- intlog2(measures_i_))); - s.translate_axis (-s.extent ()[X_AXIS].length () / 2, X_AXIS); - } - else - { - String idx = ("rests-") + to_str (-4); - s = lookup_l ()->afm_find (idx); - } - - mol_p->add_molecule (s); - Real staff_space - = staff_symbol_referencer (this).staff_space (); - if (measures_i_ == 1 && rest_symbol) + 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) +{ + Grob *me = unsmob_grob (smob); + Spanner *sp = dynamic_cast (me); + + Interval sp_iv = bar_width (sp); + 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. + */ + Real x_off = max (sp_iv[LEFT] - rx, 0.0); + + Stencil mol; + mol.add_stencil (symbol_stencil (me, space)); + + int measures = 0; + 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 (); +} + +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 Stencil (); + + SCM limit = me->get_property ("expand-limit"); + if (measures > scm_to_int (limit)) { - mol_p->translate_axis (staff_space, Y_AXIS); + Real padding = 0.15; + Stencil s = big_rest (me, (1.0 - 2 * padding) * space); + s.translate_axis (padding * space, X_AXIS); + return s; } - else if (measures_i_ > 1) + + 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->layout (), alist_chain); + + SCM sml = me->get_property ("use-breve-rest"); + if (measures == 1) { - Molecule s (lookup_l ()->text ("number", to_str (measures_i_), paper_l ())); - s.align_to (X_AXIS, CENTER); - s.translate_axis (3.0 * staff_space, Y_AXIS); - mol_p->add_molecule (s); + if (to_boolean (sml)) + { + 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; + } + 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; + } } - mol_p->translate_axis (x_off, X_AXIS); - return mol_p; + else + return church_rest (me, musfont, measures, space); } /* - UGH. JUNKME elt prop "columns" isn't really needed. - */ + 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); -void -Multi_measure_rest::do_add_processing () + Real ss = Staff_symbol_referencer::staff_space (me); + 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.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 (?) +*/ +Stencil +Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, + Real space) { - if (gh_pair_p (get_elt_property ("columns"))) + SCM mols = SCM_EOL; + + /* See Wanske pp. 125 */ + int l = measures; + int count = 0; + Real symbols_width = 0.0; + + bool use_breve = to_boolean (me->get_property ("use-breve-rest")); + + while (l) { - Link_array column_arr (Group_interface__extract_elements (this, (Item*)0, "columns")); - - set_bounds (LEFT, column_arr[0 >? column_arr.size () - 2]); - set_bounds (RIGHT, column_arr.top ()); + if (use_breve) + { + int k; + if (l >= 2) + { + l -= 2; + k = -2; + } + else + { + l -= 1; + k = -1; + } + + 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; + k = -2; + } + else if (l >= 2) + { + l -= 2; + k = -1; + } + else + { + k = 0; + l--; + } + + 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 = scm_cons (r.smobbed_copy (), mols); + } + count++; } -} - -void -Multi_measure_rest::do_post_processing () -{ - if (!gh_pair_p (get_elt_property ("columns"))) - set_elt_property ("transparent", SCM_BOOL_T); -} + /* 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; - -void -Multi_measure_rest::add_column (Item* c) -{ - Group_interface gi (this, "columns"); - gi.add_element (c); + 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); - - add_dependency (c); + return mol; } - -Array -Multi_measure_rest::get_rods () const +void +Multi_measure_rest::add_column (Grob *me, Item *c) { - Array a; + add_bound_item (dynamic_cast (me), c); +} - if (!(spanned_drul_[LEFT] && spanned_drul_[RIGHT])) +void +Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) +{ + 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 a; + return ; } - Item * l = spanned_drul_[LEFT]->column_l (); - Item * r = spanned_drul_[RIGHT]->column_l (); - Item * lb = l->find_broken_piece (RIGHT); - Item * rb = r->find_broken_piece (LEFT); - - Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}}; - for (int i=0; i < 4; i++) + 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] = {{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; - - /* - should do something more advanced. - */ - rod.distance_f_ = l->extent (X_AXIS)[BIGGER] - r->extent (X_AXIS)[SMALLER] - + paper_l ()->get_var ("mmrest_x_minimum"); - - a.push (rod); + rod.item_drul_[LEFT] = li; + rod.item_drul_[RIGHT] = ri; + + 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 (); } +} + +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; +} - return a; +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, + "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 " + ); +