X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=9870a13a883dcfc7bf28ec01b1419c42e6616114;hb=8e300d9598c6f54cb18d8bc8cd0458fa1028d8b9;hp=ceb5657642211ad4eace1b44b4e933e6f177add1;hpb=a0f4b682135cf77e168a7201adbb4d083a1972d4;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index ceb5657642..9870a13a88 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--2000 Jan Nieuwenhuizen + (c) 1998--2001 Jan Nieuwenhuizen */ @@ -19,29 +19,92 @@ #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "text-item.hh" +#include "percent-repeat-item.hh" + void -Multi_measure_rest::set_interface (Score_element*me) +Multi_measure_rest::set_interface (Grob*me) { me->set_interface (ly_symbol2scm ("multi-measure-rest-interface")); } bool -Multi_measure_rest::has_interface (Score_element*me) +Multi_measure_rest::has_interface (Grob*me) { return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface")); } +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); + + 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 = sp->get_bound (d)->column_l (); + + 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 (); +} + + +/* [TODO] 17 - * variable-sized multi-measure rest symbol: |====| ?? + variable-sized multi-measure rest symbol: |====| ?? */ -MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1); SCM Multi_measure_rest::brew_molecule (SCM smob) { - Score_element *me = unsmob_element (smob); + Grob *me = unsmob_grob (smob); + if (to_boolean (me->get_grob_property ("skip-timestep"))) + { + me->set_grob_property ("skip-timestep", SCM_EOL); + return SCM_EOL; + } + Spanner * sp = dynamic_cast (me); + + SCM alist_chain = Font_interface::font_alist_chain (me); + + + SCM style_chain = + Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"), + alist_chain); + + Font_metric *musfont + = Font_interface::get_font (me,style_chain); + Real staff_space = Staff_symbol_referencer::staff_space (me); Interval sp_iv; @@ -73,16 +136,28 @@ Multi_measure_rest::brew_molecule (SCM smob) Molecule s; - int measures = 1; - SCM m (me->get_elt_property ("measure-count")); + int measures = 0; + SCM m (me->get_grob_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)) + SCM limit = me->get_grob_property ("expand-limit"); + if (measures <= 0) + return SCM_EOL; + if (measures == 1) + { + s = musfont->find_by_name (Rest::glyph_name (me, 0, "")); + + /* + ugh. + */ + if (Staff_symbol_referencer::position_f (me) == 0.0) + s.translate_axis (Staff_symbol_referencer::staff_space (me), Y_AXIS); + } + else if (measures <= gh_scm2int (limit)) { /* Build a rest from smaller parts. Distances inbetween are @@ -109,9 +184,9 @@ Multi_measure_rest::brew_molecule (SCM smob) } Real pad = s.empty_b () - ? 0.0 : gh_scm2double (me->get_elt_property ("padding")) * staff_space; + ? 0.0 : gh_scm2double (me->get_grob_property ("padding")) * staff_space; - Molecule r (Font_interface::get_default_font (me)->find_by_name ("rests-" + to_str (k))); + Molecule r (musfont->find_by_name ("rests-" + to_str (k))); if (k == 0) r.translate_axis (staff_space, Y_AXIS); @@ -123,34 +198,30 @@ Multi_measure_rest::brew_molecule (SCM smob) } else { - String idx = ("rests-") + to_str (-4); - s = Font_interface::get_default_font (me)->find_by_name (idx); + String idx = ("rests-") + to_str (-4); + s = musfont->find_by_name (idx); } mol.add_molecule (s); if (measures > 1) { - SCM properties = gh_list (me->mutable_property_alist_, - me->immutable_property_alist_, - SCM_UNDEFINED); - Molecule s = - Text_item::text2molecule (me, - ly_str02scm (to_str (measures).ch_C ()), - properties); + Molecule s = Text_item::text2molecule (me, + ly_str02scm (to_str (measures).ch_C ()), + alist_chain); 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(); + return mol.smobbed_copy (); } /* UGH. JUNKME elt prop "columns" isn't really needed. */ void -Multi_measure_rest::add_column (Score_element*me,Item* c) +Multi_measure_rest::add_column (Grob*me,Item* c) { Pointer_group_interface::add_element (me, "columns",c); @@ -163,10 +234,10 @@ MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1); SCM Multi_measure_rest::set_spacing_rods (SCM smob) { - Score_element*me = unsmob_element (smob); + Grob*me = unsmob_grob (smob); Spanner*sp = dynamic_cast (me); - if (!(sp->get_bound (LEFT) && sp->get_bound (RIGHT))) + if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT))) { programming_error ("Multi_measure_rest::get_rods (): I am not spanned!"); return SCM_UNSPECIFIED; @@ -195,7 +266,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob) 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; + + gh_scm2double (me->get_grob_property ("minimum-width")) * staff_space; rod.add_to_cols (); }