/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Grob *my_vertical_axis_group = Grob::get_vertical_axis_group (me);
Drul_array<Grob *> vertical_axis_groups;
- Direction d = DOWN;
- do
+ for (DOWN_and_UP (d))
vertical_axis_groups[d] = d == dir
? sys->get_neighboring_staff (d, my_vertical_axis_group, Interval_t<int> (me->spanned_rank_interval ()))
: my_vertical_axis_group;
- while (flip (&d) != DOWN);
if (!vertical_axis_groups[dir])
return scm_from_double (0.0);
Drul_array<Grob *> span_bars (0, 0);
- d = DOWN;
- do
+ for (DOWN_and_UP (d))
{
extract_grob_set (vertical_axis_groups[d], "elements", elts);
for (vsize i = elts.size (); i--;)
if (!span_bars[d])
return scm_from_double (0.0);
}
- while (flip (&d) != DOWN);
if (span_bars[DOWN] != span_bars[UP])
return scm_from_double (0.0);
Drul_array<bool> broken;
Drul_array<Item *> bounds;
- Direction d = LEFT;
- do
+ for (LEFT_and_RIGHT (d))
{
bounds[d] = me->get_bound (d);
broken[d] = bounds[d]->break_status_dir () != CENTER;
}
- while (flip (&d) != LEFT);
broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT);
broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT)->is_live ();
thick = robust_scm2double (me->get_property ("thickness"), 1.0)
* Staff_symbol_referencer::line_thickness (me);
- do
+ for (LEFT_and_RIGHT (d))
{
Item *b = bounds[d];
- Interval e = (Axis_group_interface::has_interface (b)
- ? Axis_group_interface::generic_bound_extent (b, common, X_AXIS)
- : robust_relative_extent (b, common, X_AXIS));
+ Interval e = (Paper_column::has_interface (b) && b->break_status_dir ())
+ ? Axis_group_interface::generic_bound_extent (b, common, X_AXIS)
+ : robust_relative_extent (b, common, X_AXIS);
x_points[d] = b->relative_coordinate (common, X_AXIS);
if (broken [d])
x_points[d] = e[-d];
else
{
- Real broken_bound_padding = 0.0;
+ Real broken_bound_padding
+ = robust_scm2double (me->get_property ("broken-bound-padding"), 0.0);
extract_grob_set (me, "concurrent-hairpins", chp);
for (vsize i = 0; i < chp.size (); i++)
{
}
}
}
- while (flip (&d) != LEFT);
Real width = x_points[RIGHT] - x_points[LEFT];
}
bool continued = broken[Direction (-grow_dir)];
+ bool continuing = broken[Direction (grow_dir)];
Real starth = 0;
Real endh = 0;
if (grow_dir < 0)
{
- starth = height;
- endh = continued ? height / 2 : 0.0;
+ starth = continuing ? 2 * height / 3 : height;
+ endh = continued ? height / 3 : 0.0;
}
else
{
- starth = continued ? height / 2 : 0.0;
- endh = height;
+ starth = continued ? height / 3 : 0.0;
+ endh = continuing ? 2 * height / 3 : height;
}
/*