X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=e3748f89f8da69f33c6b714e1b747b9267808a5e;hb=867530093ed5374d6e28d2c11a933f3b991c226e;hp=279b6b9b362573717a8f4212b23d824e07845b4a;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 279b6b9b36..e3748f89f8 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,57 +3,199 @@ source file of the GNU LilyPond music typesetter - (c) 1998 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen */ #include "multi-measure-rest.hh" #include "debug.hh" #include "paper-def.hh" -#include "lookup.hh" -#include "dimension.hh" +#include "paper-column.hh" // urg +#include "font-interface.hh" #include "rest.hh" -#include "script.hh" -#include "text-def.hh" #include "molecule.hh" +#include "misc.hh" +#include "group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "text-item.hh" -IMPLEMENT_IS_TYPE_B1 (Multi_measure_rest, Item); - -Multi_measure_rest::Multi_measure_rest () +void +Multi_measure_rest::set_interface (Score_element*me) { - measures_i_ = 0; + me->set_interface (ly_symbol2scm ("multi-measure-rest-interface")); } -void -Multi_measure_rest::do_print () const +bool +Multi_measure_rest::has_interface (Score_element*me) { - DOUT << "measures_i_ " << measures_i_; + return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface")); } -Molecule* -Multi_measure_rest::brew_molecule_p () const + /* + [TODO] 17 + * variable-sized multi-measure rest symbol: |====| ?? +*/ +MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule,1); +SCM +Multi_measure_rest::brew_molecule (SCM smob) { + Score_element *me = unsmob_element (smob); + Spanner * sp = dynamic_cast (me); + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Interval sp_iv; + Direction d = LEFT; + do + { + Item * col = sp->get_bound (d)->column_l (); + + 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 = 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; + /* - [TODO] 3 - * make real multi-measure rest symbol: |---| - * make two,four,eight-measure-rest symbols + center between stuff. */ + x_off += sp_iv.length ()/ 2; + + + Molecule s; + + int measures = 1; + SCM m (me->get_elt_property ("measure-count")); + if (gh_number_p (m)) + { + measures = gh_scm2int (m); + } + + + SCM limit = me->get_elt_property ("expand-limit"); + if (measures <= gh_scm2int (limit)) + { + /* + Build a rest from smaller parts. Distances inbetween are + really variable, see Wanske pp. 125 */ + + int l = measures; + while (l) + { + int k; + if (l >= 4) + { + l-=4; + k = -2; + } + else if (l>= 2) + { + l -= 2; + k = -1; + } + else + { + k = 0; + l --; + } + + Real pad = s.empty_b () + ? 0.0 : gh_scm2double (me->get_elt_property ("padding")) * staff_space; + + Molecule r (Font_interface::get_default_font (me)->find_by_name ("rests-" + to_str (k))); + if (k == 0) + r.translate_axis (staff_space, Y_AXIS); + + s.add_at_edge (X_AXIS, RIGHT, r, pad); + } + - Atom s (lookup_l ()->rest (0, 0)); - Molecule* mol_p = new Molecule ( Atom (s)); - Real interline_f = paper ()->interline_f (); - mol_p->translate_axis (interline_f, Y_AXIS); + s.align_to (X_AXIS, CENTER); + } + else + { + String idx = ("rests-") + to_str (-4); + s = Font_interface::get_default_font (me)->find_by_name (idx); + } + + mol.add_molecule (s); - if (measures_i_ > 1) + if (measures > 1) { - Text_def text; - text.text_str_ = to_str (measures_i_); - text.style_str_ = "number"; - Atom s = text.get_atom (paper (), UP); - s.translate_axis (3.0 * interline_f, Y_AXIS); - mol_p->add_atom (s); + SCM properties = Font_interface::font_alist_chain (me); + Molecule s = Text_item::text2molecule (me, + ly_str02scm (to_str (measures).ch_C ()), + properties); + 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.create_scheme(); +} + +/* + UGH. JUNKME elt prop "columns" isn't really needed. + */ +void +Multi_measure_rest::add_column (Score_element*me,Item* c) +{ + Pointer_group_interface::add_element (me, "columns",c); + + add_bound_item (dynamic_cast (me),c); +} + + +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1); - return mol_p; +SCM +Multi_measure_rest::set_spacing_rods (SCM smob) +{ + Score_element*me = unsmob_element (smob); + + 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; + } + + 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* 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 * l = combinations[i][0]; + Item *r = combinations[i][1]; + + if (!l || !r) + 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_elt_property ("minimum-width")) * staff_space; + + rod.add_to_cols (); + } + return SCM_UNSPECIFIED; }