source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#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.
- Interval sp_iv;
- Direction d = LEFT;
- do
- {
- Item *col = sp->get_bound (d)->get_column ();
-
- Interval coldim = col->extent (0, X_AXIS);
-
- sp_iv[d] = coldim[-d];
- }
- while ((flip (&d)) != LEFT);
+ 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.
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 = (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);
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 ("linethickness"));
+ 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));
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);
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)
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);
add_bound_item (dynamic_cast<Spanner *> (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)
{
- Grob *me = unsmob_grob (smob);
-
Spanner *sp = dynamic_cast<Spanner *> (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 *li = sp->get_bound (LEFT)->get_column ();
{li, rb},
{lb, rb}};
- Real sym_width = symbol_stencil (me, 0.0).extent (X_AXIS).length ();
-
for (int i = 0; i < 4; i++)
{
Item *li = combinations[i][0];
rod.item_drul_[LEFT] = li;
rod.item_drul_[RIGHT] = ri;
- rod.distance_ = li->extent (li, X_AXIS)[BIGGER]
- - ri->extent (ri, X_AXIS)[SMALLER]
- /* 2.0 = magic! */
- + sym_width + 2.0;
+ 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 ();
}
- return SCM_UNSPECIFIED;
}
-/*
- Ugh. Cut & paste.
- */
+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);
-
- Spanner *sp = dynamic_cast<Spanner *> (me);
- if (! (sp->get_bound (LEFT) && sp->get_bound (RIGHT)))
- {
- programming_error ("Multi_measure_rest::get_rods (): I am not spanned!");
- return SCM_UNSPECIFIED;
- }
-
- 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}};
-
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);
- for (int i = 0; i < 4; i++)
- {
- Item *li = combinations[i][0];
- Item *ri = combinations[i][1];
-
- if (!li || !ri)
- continue;
-
- Rod rod;
- rod.item_drul_[LEFT] = li;
- rod.item_drul_[RIGHT] = ri;
-
- rod.distance_ = len;
-
- Real minlen = robust_scm2double (me->get_property ("minimum-length"), 0);
- rod.distance_ = max (rod.distance_, minlen);
- rod.add_to_cols ();
- }
return SCM_UNSPECIFIED;
}
-
-ADD_INTERFACE (Multi_measure_rest, "multi-measure-rest-interface",
+ADD_INTERFACE (Multi_measure_rest,
"A rest that spans a whole number of measures.",
/* properties */
"hair-thickness "
"thick-thickness "
"use-breve-rest "
- "minimum-length");
+ "bound-padding "
+ "minimum-length "
+ );
projects / lilypond.git / blobdiff