X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=a36d7c01ed071a53bd627c0c4aadd027617b6c60;hb=a7d058d67feb06da25298c3df77e0740f8069d62;hp=e8d4565e2eccf3094f628429589bd18c2304b70e;hpb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index e8d4565e2e..a36d7c01ed 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -1,103 +1,244 @@ -/* - multi-measure-rest.cc -- implement Multi_measure_rest - - source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Jan Nieuwenhuizen - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2010 Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #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-metric.hh" +#include "font-interface.hh" #include "rest.hh" -#include "molecule.hh" #include "misc.hh" -#include "group-interface.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" -#include "text-item.hh" +#include "system.hh" +#include "text-interface.hh" +#include "percent-repeat-item.hh" +#include "lookup.hh" +#include "separation-item.hh" -void -Multi_measure_rest::set_interface (Score_element*me) +Interval +Multi_measure_rest::bar_width (Spanner *me) { - me->set_interface (ly_symbol2scm ("multi-measure-rest-interface")); -} + Interval iv; + Direction d = LEFT; + do + { + Item *col = me->get_bound (d)->get_column (); -bool -Multi_measure_rest::has_interface (Score_element*me) -{ - return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface")); + Interval coldim = Paper_column::break_align_width (col); + + iv[d] = coldim[-d]; + } + while ((flip (&d)) != LEFT); + + return iv; } - /* - [TODO] 17 - * variable-sized multi-measure rest symbol: |====| ?? -*/ -MAKE_SCHEME_CALLBACK(Multi_measure_rest,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1); SCM -Multi_measure_rest::brew_molecule (SCM smob) +Multi_measure_rest::percent (SCM smob) { - Score_element *me = unsmob_element (smob); - Spanner * sp = dynamic_cast (me); - Real staff_space = Staff_symbol_referencer::staff_space (me); + Grob *me = unsmob_grob (smob); + Spanner *sp = dynamic_cast (me); - Interval sp_iv; - Direction d = LEFT; - do - { - Item * col = sp->get_bound (d)->column_l (); + Stencil r = Percent_repeat_item_interface::x_percent (me, 1); - Interval coldim = col->extent (0, X_AXIS); + // ugh copy & paste. - sp_iv[d] = coldim[-d] ; - } - while ((flip (&d)) != LEFT); - Molecule mol; + Grob *common_x = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), + X_AXIS); + Interval sp_iv = bar_width (sp); Real x_off = 0.0; - Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); + Real rx = sp->get_bound (LEFT)->relative_coordinate (common_x, 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; + */ + x_off += max (sp_iv[LEFT] - rx, 0.0); /* center between stuff. - */ - x_off += sp_iv.length ()/ 2; + */ + x_off += sp_iv.length () / 2; - - Molecule s; + r.translate_axis (x_off, X_AXIS); + + return r.smobbed_copy (); +} + +MAKE_SCHEME_CALLBACK (Multi_measure_rest, print, 1); +SCM +Multi_measure_rest::print (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Spanner *sp = dynamic_cast (me); + + Interval sp_iv = bar_width (sp); + Real space = sp_iv.length (); - int measures = 1; - SCM m (me->get_elt_property ("measure-count")); - if (gh_number_p (m)) + 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. + */ + Real x_off = max (sp_iv[LEFT] - rx, 0.0); + + Stencil mol; + mol.add_stencil (symbol_stencil (me, space)); + + int measures = 0; + SCM m (me->get_property ("measure-count")); + if (scm_is_number (m)) + measures = scm_to_int (m); + + mol.translate_axis (x_off, X_AXIS); + return mol.smobbed_copy (); +} + +Stencil +Multi_measure_rest::symbol_stencil (Grob *me, Real space) +{ + int measures = 0; + SCM m (me->get_property ("measure-count")); + if (scm_is_number (m)) + measures = scm_to_int (m); + if (measures <= 0) + return Stencil (); + + SCM limit = me->get_property ("expand-limit"); + if (measures > scm_to_int (limit)) { - measures = gh_scm2int (m); + Real padding = 0.15; + Stencil s = big_rest (me, (1.0 - 2 * padding) * space); + s.translate_axis (padding * space, X_AXIS); + return s; } - - SCM limit = me->get_elt_property ("expand-limit"); - if (measures <= gh_scm2int (limit)) + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Font_metric *musfont = Font_interface::get_default_font (me); + + SCM sml = me->get_property ("use-breve-rest"); + if (measures == 1) { - /* - Build a rest from smaller parts. Distances inbetween are - really variable, see Wanske pp. 125 */ + if (to_boolean (sml)) + { + Stencil s = musfont->find_by_name (Rest::glyph_name (me, -1, "", false)); + + s.translate_axis ((space - s.extent (X_AXIS).length ()) / 2, X_AXIS); - int l = measures; - while (l) + return s; + } + else + { + Stencil s = musfont->find_by_name (Rest::glyph_name (me, 0, "", true)); + + /* + 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 + return church_rest (me, musfont, measures, space); +} + +/* + 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_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->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + Real y = slt * thick_thick / 2 * ss; + Real ythick = hair_thick * slt * ss; + Box b (Interval (0.0, max (0.0, (width - 2 * ythick))), Interval (-y, y)); + + Real blot = width ? (.8 * min (y, ythick)) : 0.0; + + Stencil m = Lookup::round_filled_box (b, blot); + Stencil yb = Lookup::round_filled_box (Box (Interval (-0.5, 0.5) * ythick, Interval (-ss, ss)), blot); + + 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; +} + +/* + Kirchenpause (?) +*/ +Stencil +Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, + Real space) +{ + SCM mols = SCM_EOL; + + /* See Wanske pp. 125 */ + int l = measures; + int count = 0; + Real symbols_width = 0.0; + + bool use_breve = to_boolean (me->get_property ("use-breve-rest")); + + while (l) + { + if (use_breve) + { + 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 { int k; if (l >= 4) { - l-=4; + l -= 4; k = -2; } - else if (l>= 2) + else if (l >= 2) { l -= 2; k = -1; @@ -105,100 +246,123 @@ Multi_measure_rest::brew_molecule (SCM smob) else { k = 0; - l --; + l--; } - Real pad = s.empty_b () - ? 0.0 : gh_scm2double (me->get_elt_property ("padding")) * staff_space; - - Molecule r (me->get_default_font ()->find_by_name ("rests-" + to_str (k))); + Stencil r (musfont->find_by_name ("rests." + to_string (k))); if (k == 0) - r.translate_axis (staff_space, Y_AXIS); - - s.add_at_edge (X_AXIS, RIGHT, r, pad); + { + 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); } + count++; + } + /* Make outer padding this much bigger. */ + Real outer_padding_factor = 1.5; + Real inner_padding = (space - symbols_width) + / (2 * outer_padding_factor + (count - 1)); + if (inner_padding < 0) + inner_padding = 1.0; - s.align_to (X_AXIS, CENTER); - } - else - { - String idx = ("rests-") + to_str (-4); - s = me->get_default_font ()->find_by_name (idx); - } - - mol.add_molecule (s); + Stencil mol; + for (SCM s = mols; scm_is_pair (s); s = scm_cdr (s)) + mol.add_at_edge (X_AXIS, LEFT, *unsmob_stencil (scm_car (s)), + inner_padding); + mol.align_to (X_AXIS, LEFT); + mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); - 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); - 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; } -/* - 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); - - add_bound_item (dynamic_cast (me),c); + add_bound_item (dynamic_cast (me), c); } - -MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1); - -SCM -Multi_measure_rest::set_spacing_rods (SCM smob) +void +Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) { - Score_element*me = unsmob_element (smob); - - Spanner*sp = dynamic_cast (me); - if (!(sp->get_bound (LEFT) && sp->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 SCM_UNSPECIFIED; + return ; } - 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 *li = sp->get_bound (LEFT)->get_column (); + Item *ri = sp->get_bound (RIGHT)->get_column (); + Item *lb = li->find_prebroken_piece (RIGHT); + Item *rb = ri->find_prebroken_piece (LEFT); + + Item *combinations[4][2] = {{li, ri}, + {lb, ri}, + {li, rb}, + {lb, rb}}; + + for (int i = 0; i < 4; i++) { - Item * l = combinations[i][0]; - Item *r = combinations[i][1]; + Item *li = combinations[i][0]; + Item *ri = combinations[i][1]; - if (!l || !r) + if (!li || !ri) continue; Rod rod; - rod.item_l_drul_[LEFT] = l; - rod.item_l_drul_[RIGHT] = r; - - /* - 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; - + rod.item_drul_[LEFT] = li; + rod.item_drul_[RIGHT] = ri; + + rod.distance_ = Paper_column::minimum_distance (li, ri) + + length + + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0); + + Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0); + rod.distance_ = max (rod.distance_, minlen); rod.add_to_cols (); } +} + +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods, 1); +SCM +Multi_measure_rest::set_spacing_rods (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); + calculate_spacing_rods (me, sym_width); + + return SCM_UNSPECIFIED; +} + +MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1); +SCM +Multi_measure_rest::set_text_rods (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Stencil *stil = me->get_stencil (); + + /* FIXME uncached */ + Real len = (stil && !stil->extent (X_AXIS).is_empty ()) + ? stil->extent (X_AXIS).length () + : 0.0; + calculate_spacing_rods (me, len); + return SCM_UNSPECIFIED; } +ADD_INTERFACE (Multi_measure_rest, + "A rest that spans a whole number of measures.", + + /* properties */ + "expand-limit " + "measure-count " + "hair-thickness " + "thick-thickness " + "use-breve-rest " + "bound-padding " + "minimum-length " + ); +