/* compose span_bar_mol */
vector<Interval> extents;
+ vector<bool> make_span_bar;
Grob *model_bar = 0;
for (vsize i = elements.size (); i--;)
{
Grob *bar = elements[i];
- Interval ext = bar->extent (refp, Y_AXIS);
+ Interval ext = Bar_line::bar_y_extent (bar, refp);
if (ext.is_empty ())
continue;
extents.push_back (ext);
+ make_span_bar.push_back (to_boolean (bar->get_property ("allow-span-bar")));
model_bar = bar;
}
Interval l (prev_extent [UP],
ext[DOWN]);
- if (l.is_empty ())
+ if (l.is_empty () || !make_span_bar[i])
{
/* There is overlap between the bar lines. Do nothing. */
}
type = "|.";
else if (type == ":|:")
type = ".|.";
+ else if (type == ":|.|:")
+ type = "|.|";
+ else if (type == ":|.:")
+ type = "|.";
return ly_string2scm (type);
}
}
ADD_INTERFACE (Span_bar,
- "A bar line that spanned between other barlines. This interface is "
- " used for bar lines that connect different staves.",
+ "A bar line that is spanned between other barlines. This"
+ " interface is used for bar lines that connect different"
+ " staves.",
/* properties */
"glyph-name "
- "elements");
+ "elements "
+ );