X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=9870a13a883dcfc7bf28ec01b1419c42e6616114;hb=46340a068e743b3b35175c80b811c0b3860512ea;hp=bf8a009f4552bc2af8852edbc6b1fb06d26312db;hpb=c21d49df60cb97801ab33ab8a1bad6f2c81cd820;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index bf8a009f45..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 */ @@ -11,43 +11,109 @@ #include "debug.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" -Multi_measure_rest::Multi_measure_rest (SCM s) - : Spanner (s) + +void +Multi_measure_rest::set_interface (Grob*me) +{ + me->set_interface (ly_symbol2scm ("multi-measure-rest-interface")); +} + +bool +Multi_measure_rest::has_interface (Grob*me) { - set_elt_pointer ("columns", SCM_EOL); + 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: |====| ?? */ - -GLUE_SCORE_ELEMENT(Multi_measure_rest,brew_molecule); - +MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1); SCM -Multi_measure_rest::member_brew_molecule () const +Multi_measure_rest::brew_molecule (SCM smob) { - Real staff_space - = staff_symbol_referencer (this).staff_space (); + 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; Direction d = LEFT; do { - Item * col = get_bound (d)->column_l (); + Item * col = sp->get_bound (d)->column_l (); - Interval coldim = col->extent (X_AXIS) - + col->relative_coordinate (0, X_AXIS); + Interval coldim = col->extent (0, X_AXIS); sp_iv[d] = coldim[-d] ; } @@ -55,7 +121,7 @@ Multi_measure_rest::member_brew_molecule () const 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. @@ -70,15 +136,28 @@ Multi_measure_rest::member_brew_molecule () const Molecule s; - int measures = 1; - SCM m (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); } - if (measures <= paper_l() ->get_var ("multi_measure_rest_expand_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 @@ -105,9 +184,9 @@ Multi_measure_rest::member_brew_molecule () const } 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))); + ? 0.0 : gh_scm2double (me->get_grob_property ("padding")) * staff_space; + + Molecule r (musfont->find_by_name ("rests-" + to_str (k))); if (k == 0) r.translate_axis (staff_space, Y_AXIS); @@ -119,83 +198,58 @@ Multi_measure_rest::member_brew_molecule () const } else { - String idx = ("rests-") + to_str (-4); - s = lookup_l ()->afm_find (idx); + String idx = ("rests-") + to_str (-4); + s = musfont->find_by_name (idx); } mol.add_molecule (s); if (measures > 1) { - Molecule s (lookup_l ()->text ("number", to_str (measures), paper_l ())); + 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::do_add_processing () +Multi_measure_rest::add_column (Grob*me,Item* c) { - if (gh_pair_p (get_elt_pointer ("columns"))) - { - Link_array column_arr (Pointer_group_interface__extract_elements (this, (Item*)0, "columns")); - - set_bound (LEFT, column_arr[0 >? column_arr.size () - 2]); - set_bound (RIGHT, column_arr.top ()); - } + Pointer_group_interface::add_element (me, "columns",c); - // set columns to SCM_EOL? + add_bound_item (dynamic_cast (me),c); } - -GLUE_SCORE_ELEMENT(Multi_measure_rest,after_line_breaking); -SCM -Multi_measure_rest::member_after_line_breaking () -{ - if (!gh_pair_p (get_elt_pointer ("columns"))) - { - suicide (); - } - return SCM_UNDEFINED; -} +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1); - -void -Multi_measure_rest::add_column (Item* c) -{ - Pointer_group_interface gi (this, "columns"); - gi.add_element (c); - - - add_dependency (c); -} - - -Array -Multi_measure_rest::get_rods () const +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 * 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]; @@ -211,12 +265,11 @@ 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 ("multi_measure_rest_x_minimum"); + rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER] + + gh_scm2double (me->get_grob_property ("minimum-width")) * staff_space; - a.push (rod); + rod.add_to_cols (); } - - return a; + return SCM_UNSPECIFIED; }