X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest.cc;h=9628402a5ecec1ce899d4ef1d4ea57002b7529af;hb=6156bb1b68443fdb3dcf8321eb8b85e6e384ffbb;hp=44d699b7ce1bcd0b35137945f03c1ad490c008cf;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 44d699b7ce..9628402a5e 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -1,25 +1,59 @@ /* - multi-measure-rest.cc -- implement Multi_measure_rest + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1998--2011 Jan Nieuwenhuizen - (c) 1998--2006 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 "warn.hh" +#include "font-interface.hh" +#include "lookup.hh" +#include "misc.hh" #include "output-def.hh" #include "paper-column.hh" // urg -#include "font-interface.hh" +#include "percent-repeat-item.hh" #include "rest.hh" -#include "misc.hh" +#include "separation-item.hh" #include "spanner.hh" #include "staff-symbol-referencer.hh" +#include "system.hh" #include "text-interface.hh" -#include "percent-repeat-item.hh" -#include "lookup.hh" -#include "separation-item.hh" +#include "warn.hh" + +Interval +Multi_measure_rest::bar_width (Spanner *me) +{ + SCM spacing_pair = me->get_property ("spacing-pair"); + Interval iv; + Direction d = LEFT; + do + { + Item *col = me->get_bound (d)->get_column (); + SCM align_sym + = (scm_is_pair (spacing_pair) + ? index_get_cell (spacing_pair, d) + : ly_symbol2scm ("staff-bar")); + Interval coldim = Paper_column::break_align_width (col, align_sym); + + iv[d] = coldim[-d]; + } + while (flip (&d) != LEFT); + + return iv; +} MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1); SCM @@ -28,23 +62,14 @@ Multi_measure_rest::percent (SCM smob) Grob *me = unsmob_grob (smob); Spanner *sp = dynamic_cast (me); - Stencil r = Percent_repeat_item_interface::x_percent (me, 1, 0.75, 1.6); + Stencil r = Percent_repeat_item_interface::x_percent (me, 1); + r.translate_axis (-r.extent (X_AXIS).center (), X_AXIS); // ugh copy & paste. Grob *common_x = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS); - Interval sp_iv; - Direction d = LEFT; - do - { - Item *col = sp->get_bound (d)->get_column (); - - Interval coldim = robust_relative_extent (col, common_x, X_AXIS); - - sp_iv[d] = coldim[-d]; - } - while ((flip (&d)) != LEFT); + Interval sp_iv = bar_width (sp); Real x_off = 0.0; Real rx = sp->get_bound (LEFT)->relative_coordinate (common_x, X_AXIS); @@ -71,22 +96,7 @@ Multi_measure_rest::print (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 *b = sp->get_bound (d); - - Interval coldim = (Separation_item::has_interface (b)) - ? Separation_item::relative_width (b, common) - : b->extent (common, X_AXIS); - - sp_iv[d] = coldim.is_empty () ? b->relative_coordinate (common, X_AXIS) : coldim[-d]; - } - while ((flip (&d)) != LEFT); - + Interval sp_iv = bar_width (sp); Real space = sp_iv.length (); Real rx = sp->get_bound (LEFT)->relative_coordinate (0, X_AXIS); @@ -127,11 +137,9 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space) return s; } - SCM alist_chain = Font_interface::music_font_alist_chain (me); - Real staff_space = Staff_symbol_referencer::staff_space (me); - Font_metric *musfont - = select_font (me->layout (), alist_chain); + + Font_metric *musfont = Font_interface::get_default_font (me); SCM sml = me->get_property ("use-breve-rest"); if (measures == 1) @@ -183,8 +191,8 @@ Multi_measure_rest::big_rest (Grob *me, Real width) 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, 0); - m.add_at_edge (X_AXIS, LEFT, yb, 0, 0); + m.add_at_edge (X_AXIS, RIGHT, yb, 0); + m.add_at_edge (X_AXIS, LEFT, yb, 0); m.align_to (X_AXIS, LEFT); @@ -205,11 +213,11 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, int count = 0; Real symbols_width = 0.0; - SCM sml = me->get_property ("use-breve-rest"); + bool use_breve = to_boolean (me->get_property ("use-breve-rest")); while (l) { - if (sml == SCM_BOOL_T) + if (use_breve) { int k; if (l >= 2) @@ -268,7 +276,7 @@ Multi_measure_rest::church_rest (Grob *me, Font_metric *musfont, int measures, 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, 0); + inner_padding); mol.align_to (X_AXIS, LEFT); mol.translate_axis (outer_padding_factor * inner_padding, X_AXIS); @@ -288,7 +296,7 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT))) { programming_error ("Multi_measure_rest::get_rods (): I am not spanned!"); - return ; + return; } Item *li = sp->get_bound (LEFT)->get_column (); @@ -313,8 +321,7 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length) rod.item_drul_[LEFT] = li; rod.item_drul_[RIGHT] = ri; - rod.distance_ = li->extent (li, X_AXIS)[BIGGER] - - ri->extent (ri, X_AXIS)[SMALLER] + rod.distance_ = Paper_column::minimum_distance (li, ri) + length + 2 * robust_scm2double (me->get_property ("bound-padding"), 1.0); @@ -332,9 +339,9 @@ Multi_measure_rest::set_spacing_rods (SCM smob) Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length (); calculate_spacing_rods (me, sym_width); - return SCM_UNSPECIFIED; + return SCM_UNSPECIFIED; } - + MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_text_rods, 1); SCM Multi_measure_rest::set_text_rods (SCM smob) @@ -355,11 +362,12 @@ ADD_INTERFACE (Multi_measure_rest, "A rest that spans a whole number of measures.", /* properties */ + "bound-padding " "expand-limit " - "measure-count " "hair-thickness " + "measure-count " + "minimum-length " + "spacing-pair " "thick-thickness " "use-breve-rest " - "bound-padding " - "minimum-length"); - + );