X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=49b6c7b63179b15ab7b78413b71881c467bbe5f4;hb=6e8c2c2bbc0526de8a677a18b5b76e6096b59ef6;hp=2659274f816605161cfbf9b9af7e0d7164971542;hpb=f859588498869fb18312f4f2c0bfa23f49cda673;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 2659274f81..49b6c7b631 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,29 +3,24 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2002 Jan Nieuwenhuizen + (c) 1998--2004 Jan Nieuwenhuizen */ #include "multi-measure-rest.hh" -#include "debug.hh" -#include "paper-def.hh" +#include "warn.hh" +#include "output-def.hh" #include "paper-column.hh" // urg #include "font-interface.hh" #include "rest.hh" -#include "molecule.hh" +#include "stencil.hh" #include "misc.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" #include "text-item.hh" #include "percent-repeat-item.hh" #include "lookup.hh" - -bool -Multi_measure_rest::has_interface (Grob*me) -{ - return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface")); -} +#include "separation-item.hh" MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1); SCM @@ -34,7 +29,7 @@ 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); + Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); // ugh copy & paste. @@ -42,7 +37,7 @@ Multi_measure_rest::percent (SCM smob) Direction d = LEFT; do { - Item * col = sp->get_bound (d)->column_l (); + Item * col = sp->get_bound (d)->get_column (); Interval coldim = col->extent (0, X_AXIS); @@ -69,35 +64,30 @@ Multi_measure_rest::percent (SCM smob) return r.smobbed_copy (); } - -/* - [TODO] 17 - variable-sized multi-measure rest symbol: |====| ?? -*/ -MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Multi_measure_rest,print,1); SCM -Multi_measure_rest::brew_molecule (SCM smob) +Multi_measure_rest::print (SCM smob) { Grob *me = unsmob_grob (smob); Spanner * sp = dynamic_cast (me); - SCM alist_chain = Font_interface::font_alist_chain (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)->column_l (); + Item * b = sp->get_bound (d); - Interval coldim = col->extent (common, X_AXIS); + Interval coldim = (Separation_item::has_interface (b)) + ? Separation_item::relative_width (b, common) + : b->extent (common, X_AXIS); - sp_iv[d] = coldim[-d] ; + sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d]; } while ((flip (&d)) != LEFT); - Real space = sp_iv.length(); + Real space = sp_iv.length (); Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); /* @@ -107,81 +97,75 @@ Multi_measure_rest::brew_molecule (SCM smob) Real x_off = (sp_iv[LEFT] - rx) >? 0; - Molecule mol; - mol.add_molecule (symbol_molecule (me, space)); + Stencil mol; + mol.add_stencil (symbol_stencil (me, space)); int measures = 0; - SCM m (me->get_grob_property ("measure-count")); - if (gh_number_p (m)) + SCM m (me->get_property ("measure-count")); + if (ly_c_number_p (m)) { - measures = gh_scm2int (m); + measures = ly_scm2int (m); } - SCM s = me->get_grob_property ("number-threshold"); - if (measures > gh_scm2int (s)) - { - Molecule s = Text_item::text2molecule (me, - ly_str02scm (to_str (measures).ch_C ()), - alist_chain); - - s.align_to (X_AXIS, CENTER); - s.translate_axis (gh_scm2double (me->get_grob_property ("padding")) + 2, - Y_AXIS); - - s.translate_axis (mol.extent (X_AXIS).center (), X_AXIS); - mol.add_molecule (s); - } mol.translate_axis (x_off, X_AXIS); return mol.smobbed_copy (); } -Molecule -Multi_measure_rest::symbol_molecule (Grob *me, Real space) + +Stencil +Multi_measure_rest::symbol_stencil (Grob *me, Real space) { int measures = 0; - SCM m (me->get_grob_property ("measure-count")); - if (gh_number_p (m)) + SCM m (me->get_property ("measure-count")); + if (ly_c_number_p (m)) { - measures = gh_scm2int (m); + measures = ly_scm2int (m); } - - - SCM limit = me->get_grob_property ("expand-limit"); if (measures <= 0) - return Molecule(); + return Stencil (); + - if (measures > gh_scm2int (limit)) + SCM limit = me->get_property ("expand-limit"); + if (measures > ly_scm2int (limit)) { Real padding = 0.15; - Molecule s = big_rest (me, (1.0 - 2*padding) * space); + Stencil s = big_rest (me, (1.0 - 2*padding) * space); s.translate_axis (padding * space, X_AXIS); return s; } - SCM alist_chain = Font_interface::font_alist_chain (me); - - SCM style_chain = - Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"), - alist_chain); + SCM alist_chain = Font_interface::text_font_alist_chain (me); Real staff_space = Staff_symbol_referencer::staff_space (me); Font_metric *musfont - = Font_interface::get_font (me,style_chain); + = select_font (me->get_paper (), alist_chain); + SCM sml = me->get_property ("use-breve-rest"); if (measures == 1) { - Molecule s = musfont->find_by_name (Rest::glyph_name (me, 0, "")); + if (to_boolean (sml)) + { + Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "")); + + s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS); + + return s ; + } + else + { + Stencil s = musfont->find_by_name (Rest::glyph_name (me, 0, "")); - /* - ugh. - */ - if (Staff_symbol_referencer::position_f (me) == 0.0) - s.translate_axis (staff_space, Y_AXIS); + /* + 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); + s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS); - return s ; + return s ; + } } else { @@ -190,23 +174,29 @@ Multi_measure_rest::symbol_molecule (Grob *me, Real space) } - -Molecule +/* + WIDTH can also be 0 to determine the minimum size of the object. + */ +Stencil Multi_measure_rest::big_rest (Grob *me, Real width) { - Real thick = gh_scm2double (me->get_grob_property ("thickness")); + Real thick_thick =robust_scm2double (me->get_property ("thick-thickness"), 1.0); + Real hair_thick = robust_scm2double (me->get_property ("hair-thickness"), .1); + + Real ss = Staff_symbol_referencer::staff_space (me); + Real slt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); + Real y = slt * thick_thick/2 * ss; + Real ythick = hair_thick * slt * ss; + Box b (Interval (0, 0 >? (width - 2 * ythick)), Interval (-y, y)); - Real slt = me->paper_l ()->get_var ("linethickness"); - Real y = slt * thick/2 * ss; - Box b(Interval (0, width), Interval (-y, y)); - Real ythick = slt * ss; + Real blot = width ? (.8 * (y get_property ("use-breve-rest"); + while (l) { - int k; - if (l >= 4) - { - l-=4; - k = -2; - } - else if (l>= 2) + if (sml == SCM_BOOL_T) { - l -= 2; - k = -1; + int k; + if (l >= 2) + { + l-=2; + k = -2; + } + else + { + l -= 1; + k = -1; + } + + Stencil r (musfont->find_by_name ("rests-" + to_string (k))); + symbols_width += r.extent (X_AXIS).length (); + mols = scm_cons (r.smobbed_copy (), mols); } - else - { - k = 0; - l --; - } - - Molecule r (musfont->find_by_name ("rests-" + to_str (k))); - if (k == 0) + else { - Real staff_space = Staff_symbol_referencer::staff_space (me); - r.translate_axis (staff_space, Y_AXIS); + int k; + if (l >= 4) + { + l-=4; + k = -2; + } + else if (l>= 2) + { + l -= 2; + k = -1; + } + else + { + k = 0; + l --; + } + + Stencil 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 = scm_cons (r.smobbed_copy (), mols); } - symbols_width += r.extent (X_AXIS).length (); - mols = gh_cons (r.smobbed_copy (), mols); count ++; } @@ -267,10 +281,10 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures, inner_padding = 1.0; } - Molecule mol; - for (SCM s = mols; gh_pair_p (s); s = gh_cdr(s)) + Stencil mol; + for (SCM s = mols; ly_c_pair_p (s); s = ly_cdr (s)) { - mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding); + mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (ly_car (s)), inner_padding, 0); } mol.align_to (X_AXIS, LEFT); mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); @@ -286,12 +300,9 @@ Multi_measure_rest::add_column (Grob*me,Item* c) MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1); - SCM Multi_measure_rest::set_spacing_rods (SCM smob) { - return SCM_UNSPECIFIED; - Grob*me = unsmob_grob (smob); Spanner*sp = dynamic_cast (me); @@ -301,18 +312,21 @@ Multi_measure_rest::set_spacing_rods (SCM smob) return SCM_UNSPECIFIED; } - Item * l = sp->get_bound (LEFT)->column_l (); - Item * r = sp->get_bound (RIGHT)->column_l (); + 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}}; + Item* combinations[4][2] = {{l,r}, + {lb,r}, + {l,rb}, + {lb,rb}}; - Real sym_width = symbol_molecule (me, 0.0).extent (X_AXIS).length (); + Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); for (int i=0; i < 4; i++) { - Item * l = combinations[i][0]; + Item *l = combinations[i][0]; Item *r = combinations[i][1]; if (!l || !r) @@ -323,9 +337,12 @@ Multi_measure_rest::set_spacing_rods (SCM smob) rod.item_l_drul_[RIGHT] = r; - rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER] + rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER] + sym_width + 2.0; // 2.0 = magic! + Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0.0); + rod.distance_ = max (rod.distance_, + minlen); rod.add_to_cols (); } return SCM_UNSPECIFIED; @@ -333,10 +350,8 @@ Multi_measure_rest::set_spacing_rods (SCM smob) -ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface", - "A rest that spans a whole number of measures. For typesetting the -numbers, fields from font-interface may be used. +ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface", + "A rest that spans a whole number of measures.", + "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length"); -", - "expand-limit measure-count number-threshold padding thickness");