#include "hairpin.hh"
#include "axis-group-interface.hh"
-#include "bar-line.hh"
#include "dimensions.hh"
#include "directional-element-interface.hh"
#include "international.hh"
Item *r_bound = me->get_bound (RIGHT);
if (r_bound->break_status_dir () != -1)
{
- me->warning ("Asking for broken bound padding at a non-broken bound.");
+ me->warning (_ ("Asking for broken bound padding at a non-broken bound."));
return scm_from_double (0.0);
}
{
extract_grob_set (vertical_axis_groups[d], "elements", elts);
for (vsize i = elts.size (); i--;)
- if (Bar_line::has_interface (elts[i])
+ if (elts[i]->internal_has_interface (ly_symbol2scm ("bar-line-interface"))
&& dynamic_cast<Item *> (elts[i])->break_status_dir () == -1)
{
SCM hsb = elts[i]->get_property ("has-span-bar");
span_bars[d] = unsmob_grob ((d == UP ? scm_car : scm_cdr) (hsb));
break;
}
+
if (!span_bars[d])
return scm_from_double (0.0);
}
broken[d] = bounds[d]->break_status_dir () != CENTER;
}
- broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT);
- broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT)->is_live ();
-
if (broken[RIGHT])
{
Spanner *next = me->broken_neighbor (RIGHT);
- Stencil *s = next->get_stencil ();
- if (!s || s->is_empty ())
+ // Hairpin-parts suicide in after-line-breaking if they need not be drawn
+ if (next)
+ {
+ (void) next->get_property ("after-line-breaking");
+ broken[RIGHT] = next->is_live ();
+ }
+ else
broken[RIGHT] = false;
}
for (LEFT_and_RIGHT (d))
{
Item *b = bounds[d];
- 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);
+ Interval e = Axis_group_interface::generic_bound_extent (b, common, X_AXIS);
x_points[d] = b->relative_coordinate (common, X_AXIS);
if (broken [d])
}
else
{
- if (Note_column::has_interface (b)
+ if (d == RIGHT // end at the left edge of a rest
+ && Note_column::has_interface (b)
&& Note_column::has_rests (b))
x_points[d] = e[-d];
else