/*
- 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--2010 Jan Nieuwenhuizen <janneke@gnu.org>
- (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "multi-measure-rest.hh"
#include "misc.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"
+Interval
+Multi_measure_rest::bar_width (Spanner *me)
+{
+ Interval iv;
+ Direction d = LEFT;
+ do
+ {
+ Item *col = me->get_bound (d)->get_column ();
+
+ Interval coldim = Paper_column::break_align_width (col);
+
+ iv[d] = coldim[-d];
+ }
+ while ((flip (&d)) != LEFT);
+
+ return iv;
+}
+
MAKE_SCHEME_CALLBACK (Multi_measure_rest, percent, 1);
SCM
Multi_measure_rest::percent (SCM smob)
Grob *me = unsmob_grob (smob);
Spanner *sp = dynamic_cast<Spanner *> (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);
// 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);
Grob *me = unsmob_grob (smob);
Spanner *sp = dynamic_cast<Spanner *> (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 = 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);
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)
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);
"thick-thickness "
"use-breve-rest "
"bound-padding "
- "minimum-length");
+ "minimum-length "
+ );