X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=bd177cea04372a8b1b9f8d639f7bdf2a09c7c723;hb=027f1aab2ec8fbbc8a20cf421510f8b9a259d6d2;hp=1254eb4c6bb75dc9e460b74777140c43f9f4b3a9;hpb=1a71119277d04b287b3a976c526adba6500239c6;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 1254eb4c6b..bd177cea04 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--1999 Jan Nieuwenhuizen + (c) 1998--2000 Jan Nieuwenhuizen */ @@ -11,44 +11,38 @@ #include "debug.hh" #include "paper-def.hh" #include "paper-column.hh" // urg -#include "bar.hh" #include "lookup.hh" #include "rest.hh" #include "molecule.hh" #include "misc.hh" - - -Multi_measure_rest::Multi_measure_rest () -{ - measures_i_ = 0; -} +#include "group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" void -Multi_measure_rest::do_print () const +Multi_measure_rest::set_interface (Score_element*me) { -#ifndef NPRINT - DEBUG_OUT << "measures_i_ " << measures_i_; -#endif + me->set_elt_property ("columns", SCM_EOL); } - - /* - [TODO] 17 + [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 +MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule); +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 = spanned_drul_[d]->column_l (); + Item * col = sp->get_bound (d)->column_l (); Interval coldim = col->extent (X_AXIS) + col->relative_coordinate (0, X_AXIS); @@ -56,10 +50,10 @@ Multi_measure_rest::do_brew_molecule_p () const sp_iv[d] = coldim[-d] ; } while ((flip (&d)) != LEFT); - Molecule *mol_p = new Molecule; + Molecule mol; Real x_off = 0.0; - Real rx = spanned_drul_[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. @@ -73,88 +67,104 @@ Multi_measure_rest::do_brew_molecule_p () const Molecule s; - bool rest_symbol=true; - SCM alt_symbol_sym =get_elt_property (alt_symbol_scm_sym); - if (alt_symbol_sym != SCM_BOOL_F) + + int measures = 1; + SCM m (me->get_elt_property ("measure-count")); + if (gh_number_p (m)) { - s = lookup_l () -> afm_find (ly_scm2string (SCM_CDR(alt_symbol_sym))); - rest_symbol = false; + measures = gh_scm2int (m); } - else if (measures_i_ == 1 || measures_i_ == 2 || measures_i_ == 4) + + + if (measures <= me->paper_l() ->get_var ("multi_measure_rest_expand_limit")) { - s = lookup_l ()->rest (- intlog2(measures_i_), 0, ""); - s.translate_axis (-s.extent ()[X_AXIS].length () / 2, X_AXIS); + /* + 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 : me->paper_l ()->get_var ("multi_measure_rest_padding"); + + Molecule r (me->lookup_l ()->afm_find ("rests-" + to_str (k))); + if (k == 0) + r.translate_axis (staff_space, Y_AXIS); + + s.add_at_edge (X_AXIS, RIGHT, r, pad); + } + + + s.align_to (X_AXIS, CENTER); } else { - s = lookup_l ()->rest (-4, 0, ""); + String idx = ("rests-") + to_str (-4); + s = me->lookup_l ()->afm_find (idx); } - mol_p->add_molecule (s); - Real interline_f = staff_line_leading_f (); - if (measures_i_ == 1 && rest_symbol) - { - mol_p->translate_axis (interline_f, Y_AXIS); - } - else if (measures_i_ > 1) + + mol.add_molecule (s); + + if (measures > 1) { - Molecule s ( lookup_l ()->text ("number", to_str (measures_i_), paper_l ())); + Molecule s (me->lookup_l ()->text ("number", to_str (measures), me->paper_l ())); s.align_to (X_AXIS, CENTER); - s.translate_axis (3.0 * interline_f, Y_AXIS); - mol_p->add_molecule (s); + s.translate_axis (3.0 * staff_space, Y_AXIS); + mol.add_molecule (s); } - mol_p->translate_axis (x_off, X_AXIS); - return mol_p; + mol.translate_axis (x_off, X_AXIS); + return mol.create_scheme(); } +/* + UGH. JUNKME elt prop "columns" isn't really needed. + */ void -Multi_measure_rest::do_add_processing () -{ - if (column_arr_.size ()) - { - set_bounds (LEFT, column_arr_[0 >? column_arr_.size () - 2]); - set_bounds (RIGHT, column_arr_[column_arr_.size () - 1]); - } -} - -void -Multi_measure_rest::do_post_processing () +Multi_measure_rest::add_column (Score_element*me,Item* c) { - if (!column_arr_.size ()) - set_elt_property (transparent_scm_sym, SCM_BOOL_T); -} - + Pointer_group_interface gi (me, "columns"); + gi.add_element (c); -void -Multi_measure_rest::do_substitute_element_pointer (Score_element* o, Score_element* n) -{ - Staff_symbol_referencer::do_substitute_element_pointer (o,n); - if (Item* c = dynamic_cast (o)) - column_arr_.substitute (c, dynamic_cast (n)); -} - -void -Multi_measure_rest::add_column (Item* c) -{ - column_arr_.push (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); + +SCM +Multi_measure_rest::set_spacing_rods (SCM smob) { - Array a; + Score_element*me = unsmob_element (smob); - if (!(spanned_drul_[LEFT] && spanned_drul_[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 = 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 * 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}}; for (int i=0; i < 4; i++) @@ -173,10 +183,10 @@ Multi_measure_rest::get_rods () const 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"); + + me->paper_l ()->get_var ("multi_measure_rest_x_minimum"); - a.push (rod); + rod.add_to_cols (); } - - return a; + return SCM_UNSPECIFIED; } +