X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=345123297ffd4e360701a5ba7d0a3f73f2707d91;hb=7e72a1e50e94a7f9738d62599de79fe7745f600c;hp=81ba1f26da6becbda775143fd672ef0afe0d49b9;hpb=fa891b75e895f16fc3871531e244abe78f9d93ff;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 81ba1f26da..345123297f 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,55 +3,50 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2000 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ #include "multi-measure-rest.hh" -#include "debug.hh" +#include "warn.hh" #include "paper-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 "text-item.hh" +#include "percent-repeat-item.hh" +#include "lookup.hh" +#include "separation-item.hh" -Multi_measure_rest::Multi_measure_rest () -{ - set_elt_property ("columns", SCM_EOL); -} - - -/* - [TODO] 17 - * variable-sized multi-measure rest symbol: |====| ?? -*/ -Molecule -Multi_measure_rest::do_brew_molecule () const +MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1); +SCM +Multi_measure_rest::percent (SCM smob) { - Real staff_space - = staff_symbol_referencer (this).staff_space (); + 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; Direction d = LEFT; do { - Item * col = get_bound (d)->column_l (); + Item * col = sp->get_bound (d)->get_column (); - Interval coldim = col->extent (X_AXIS) - + col->relative_coordinate (0, X_AXIS); + Interval coldim = col->extent (0, X_AXIS); sp_iv[d] = coldim[-d] ; } while ((flip (&d)) != LEFT); - Molecule mol; Real x_off = 0.0; - Real rx = 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. @@ -63,25 +58,190 @@ Multi_measure_rest::do_brew_molecule () const */ x_off += sp_iv.length ()/ 2; + r.translate_axis (x_off,X_AXIS); + - Molecule s; + return r.smobbed_copy (); +} + +MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1); +SCM +Multi_measure_rest::brew_molecule (SCM smob) +{ + Grob *me = unsmob_grob (smob); + 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 * b = sp->get_bound (d); + + 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]; + } + while ((flip (&d)) != LEFT); + + 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 = (sp_iv[LEFT] - rx) >? 0; + + + Molecule mol; + mol.add_molecule (symbol_molecule (me, space)); + + int measures = 0; + SCM m (me->get_grob_property ("measure-count")); + if (gh_number_p (m)) + { + measures = gh_scm2int (m); + } + + mol.translate_axis (x_off, X_AXIS); + return mol.smobbed_copy (); +} + - int measures = 1; - SCM m (get_elt_property ("measure-count")); + +Molecule +Multi_measure_rest::symbol_molecule (Grob *me, Real space) +{ + int measures = 0; + SCM m (me->get_grob_property ("measure-count")); if (gh_number_p (m)) { measures = gh_scm2int (m); } + if (measures <= 0) + return Molecule(); - if (measures <= paper_l() ->get_var ("multi_measure_rest_expand_limit")) + SCM limit = me->get_grob_property ("expand-limit"); + if (measures > gh_scm2int (limit)) + { + Real padding = 0.15; + Molecule 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); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + Font_metric *musfont + = select_font (me->get_paper (), alist_chain); + + SCM sml = me->get_grob_property ("use-breve-rest"); + if (measures == 1) { - /* - Build a rest from smaller parts. Distances inbetween are - really variable, see Wanske pp. 125 */ + if (sml == SCM_BOOL_T) + { + Molecule s = musfont->find_by_name (Rest::glyph_name (me, -1, "")); - int l = measures; - while (l) + s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS); + + return s ; + } + else + { + Molecule s = musfont->find_by_name (Rest::glyph_name (me, 0, "")); + + /* + 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); + } +} + + +/* + WIDTH can also be 0 to determine the minimum size of the object. + */ +Molecule +Multi_measure_rest::big_rest (Grob *me, Real width) +{ + Real thick_thick =robust_scm2double (me->get_grob_property ("thick-thickness"), 1.0); + Real hair_thick = robust_scm2double (me->get_grob_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 * 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_grob_property ("use-breve-rest"); + + while (l) + { + if (sml == SCM_BOOL_T) + { + int k; + if (l >= 2) + { + l-=2; + k = -2; + } + else + { + l -= 1; + k = -1; + } + + Molecule r (musfont->find_by_name ("rests-" + to_string (k))); + symbols_width += r.extent (X_AXIS).length (); + mols = gh_cons (r.smobbed_copy (), mols); + } + else { int k; if (l >= 4) @@ -100,93 +260,67 @@ Multi_measure_rest::do_brew_molecule () const l --; } - Real pad = s.empty_b () - ? 0.0 : paper_l ()->get_var ("multi_measure_rest_padding"); - - Molecule r (lookup_l ()->afm_find ("rests-" + to_str (k))); + Molecule 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 = gh_cons (r.smobbed_copy (), mols); } - - - s.align_to (X_AXIS, CENTER); - } - else - { - String idx = ("rests-") + to_str (-4); - s = lookup_l ()->afm_find (idx); + count ++; } + - mol.add_molecule (s); - if (measures > 1) + Real outer_padding_factor = 1.5; // make outer padding this much bigger. + Real inner_padding = (space - symbols_width) / (2 * outer_padding_factor + (count-1)); + if (inner_padding < 0) { - Molecule s (lookup_l ()->text ("number", to_str (measures), paper_l ())); - s.align_to (X_AXIS, CENTER); - s.translate_axis (3.0 * staff_space, Y_AXIS); - mol.add_molecule (s); + inner_padding = 1.0; } - mol.translate_axis (x_off, X_AXIS); - return mol; -} - -/* - UGH. JUNKME elt prop "columns" isn't really needed. - */ - -void -Multi_measure_rest::do_add_processing () -{ - if (gh_pair_p (get_elt_property ("columns"))) + + Molecule mol; + for (SCM s = mols; gh_pair_p (s); s = gh_cdr(s)) { - Link_array column_arr (Group_interface__extract_elements (this, (Item*)0, "columns")); - - set_bound (LEFT, column_arr[0 >? column_arr.size () - 2]); - set_bound (RIGHT, column_arr.top ()); + mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding, 0); } + mol.align_to (X_AXIS, LEFT); + mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); - // set columns to SCM_EOL? -} - -void -Multi_measure_rest::do_post_processing () -{ - if (!gh_pair_p (get_elt_property ("columns"))) - set_elt_property ("transparent", SCM_BOOL_T); + return mol; } - - void -Multi_measure_rest::add_column (Item* c) +Multi_measure_rest::add_column (Grob*me,Item* c) { - Group_interface gi (this, "columns"); - gi.add_element (c); - - - add_dependency (c); + add_bound_item (dynamic_cast (me),c); } -Array -Multi_measure_rest::get_rods () const +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1); +SCM +Multi_measure_rest::set_spacing_rods (SCM smob) { - Array a; + Grob*me = unsmob_grob (smob); - if (!(get_bound (LEFT) && 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 a; + return SCM_UNSPECIFIED; } - Item * l = get_bound (LEFT)->column_l (); - Item * r = get_bound (RIGHT)->column_l (); - Item * lb = l->find_broken_piece (RIGHT); - Item * rb = r->find_broken_piece (LEFT); + 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}}; + + Real sym_width = symbol_molecule (me, 0.0).extent (X_AXIS).length (); + for (int i=0; i < 4; i++) { Item * l = combinations[i][0]; @@ -199,15 +333,22 @@ Multi_measure_rest::get_rods () const 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 ("multi_measure_rest_x_minimum"); + + rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER] + + sym_width + 2.0; // 2.0 = magic! - a.push (rod); + Real minlen = robust_scm2double (me->get_grob_property ("minimum-length"), 0.0); + rod.distance_ = max(rod.distance_, + minlen); + rod.add_to_cols (); } - - return a; + 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"); +