X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=e0a44196a0053e772222289682acd9fa92239150;hb=1021b8a64727e747c36d9e56ab8cefa93b2ea5d1;hp=00b647e6a164656f762d674187f43b7f7d64cb3f;hpb=a2fefe82bdf6411042104d995c4de00078e1c3a7;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 00b647e6a1..e0a44196a0 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,118 +3,346 @@ source file of the GNU LilyPond music typesetter - (c) 1998--1999, 1999 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #include "multi-measure-rest.hh" -#include "debug.hh" +#include "warn.hh" #include "paper-def.hh" -#include "p-col.hh" // urg -#include "bar.hh" -#include "lookup.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 "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "text-item.hh" +#include "percent-repeat-item.hh" +#include "lookup.hh" - -Multi_measure_rest::Multi_measure_rest () +MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1); +SCM +Multi_measure_rest::percent (SCM smob) { - measures_i_ = 0; -} + Grob *me = unsmob_grob (smob); + Spanner *sp = dynamic_cast (me); + + Molecule r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); -void -Multi_measure_rest::do_print () const -{ - DOUT << "measures_i_ " << measures_i_; + // ugh copy & paste. + + Interval sp_iv; + Direction d = LEFT; + do + { + Item * col = sp->get_bound (d)->get_column (); + + Interval coldim = col->extent (0, X_AXIS); + + sp_iv[d] = coldim[-d] ; + } + while ((flip (&d)) != LEFT); + 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; + + /* + center between stuff. + */ + x_off += sp_iv.length ()/ 2; + + r.translate_axis (x_off,X_AXIS); + + + return r.smobbed_copy (); } -Molecule* -Multi_measure_rest::do_brew_molecule_p () const +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 * col = sp->get_bound (d)->get_column (); + + 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); /* - [TODO] 17 - * variable-sized multi-measure rest symbol: |====| ?? - * build 3, 5, 6, 7, 8 symbols (how far, property?) - from whole, brevis and longa rests + we gotta stay clear of sp_iv, so move a bit to the right if + needed. */ - Molecule* mol_p = new Molecule; - if (!column_arr_.size ()) - return mol_p; + Real x_off = (sp_iv[LEFT] - rx) >? 0; - Molecule s; - if (measures_i_ == 1 || measures_i_ == 2 || measures_i_ == 4) + + 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)) { - s = (lookup_l ()->rest (- intlog2(measures_i_), 0, "")); - s.translate_axis (-s.extent ()[X_AXIS].length () / 2, X_AXIS); + measures = gh_scm2int (m); } - else + + mol.translate_axis (x_off, X_AXIS); + return mol.smobbed_copy (); +} + + + +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)) { - s = (lookup_l ()->rest (-4, 0, "")); + measures = gh_scm2int (m); } - mol_p->add_molecule (s); - Real interline_f = staff_line_leading_f (); - if (measures_i_ == 1) + if (measures <= 0) + return Molecule(); + + + SCM limit = me->get_grob_property ("expand-limit"); + if (measures > gh_scm2int (limit)) { - mol_p->translate_axis (interline_f, Y_AXIS); + Real padding = 0.15; + Molecule s = big_rest (me, (1.0 - 2*padding) * space); + s.translate_axis (padding * space, X_AXIS); + return s; } - if (measures_i_ > 1) + SCM alist_chain = Font_interface::font_alist_chain (me); + + Real staff_space = Staff_symbol_referencer::staff_space (me); + Font_metric *musfont + = Font_interface::get_font (me,alist_chain); + + SCM sml = me->get_grob_property ("use-breve-rest"); + if (measures == 1) { - Text_def text; - text.text_str_ = to_str (measures_i_); - text.style_str_ = "number"; - text.align_dir_ = CENTER; - Molecule s = text.get_molecule (paper_l (), UP); - s.translate_axis (3.0 * interline_f, Y_AXIS); - mol_p->add_molecule (s); - } + if (sml == SCM_BOOL_T) + { + Molecule s = musfont->find_by_name (Rest::glyph_name (me, -1, "")); - return mol_p; -} + 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, "")); -void -Multi_measure_rest::do_add_processing () -{ - if (column_arr_.size ()) + /* + 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 { - set_bounds (LEFT, column_arr_[0 >? column_arr_.size () - 2]); - set_bounds (RIGHT, column_arr_[column_arr_.size () - 1]); + return church_rest (me, musfont, measures, space); } } - -void -Multi_measure_rest::do_post_processing () + + + +Molecule +Multi_measure_rest::big_rest (Grob *me, Real width) { - if (column_arr_.size ()) - translate_axis (extent (X_AXIS).length () / 2, X_AXIS); + Real tthick = gh_scm2double (me->get_grob_property ("thick-thickness")); + Real hair_thick = gh_scm2double (me->get_grob_property ("hair-thickness")); + + + Real ss = Staff_symbol_referencer::staff_space (me); + + Real slt = me->get_paper ()->get_var ("linethickness"); + Real y = slt * tthick/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))); + + 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; } -void -Multi_measure_rest::do_substitute_element_pointer (Score_element* o, Score_element* n) +/* + Kirchenpause (?) + */ +Molecule +Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, + Real space) { - Staff_symbol_referencer::do_substitute_element_pointer (o,n); - if (Item* c = dynamic_cast (o)) - column_arr_.substitute (c, dynamic_cast (n)); -} + SCM mols = SCM_EOL; + + /* + see Wanske pp. 125 + */ + int l = measures; + int count = 0; + Real symbols_width = 0.0; + + SCM sml = me->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) + { + l-=4; + k = -2; + } + else if (l>= 2) + { + l -= 2; + k = -1; + } + else + { + k = 0; + l --; + } + + Molecule 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); + } + 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)); + 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); + } + mol.align_to (X_AXIS, LEFT); + mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); + + return mol; +} + void -Multi_measure_rest::add_column (Item* c) +Multi_measure_rest::add_column (Grob*me,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,1); + +SCM +Multi_measure_rest::set_spacing_rods (SCM smob) { - Array a; - Rod r; - r.item_l_drul_ = spanned_drul_; - r.distance_f_ = paper_l ()->get_var ("mmrest_x_minimum"); - a.push (r); - return a; + return SCM_UNSPECIFIED; + + Grob*me = unsmob_grob (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)->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]; + Item *r = combinations[i][1]; + + if (!l || !r) + continue; + + Rod rod; + rod.item_l_drul_[LEFT] = l; + rod.item_l_drul_[RIGHT] = r; + + + rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER] + + sym_width + 2.0; // 2.0 = magic! + + rod.add_to_cols (); + } + 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"); +