source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "span-bar.hh"
if (!scm_is_string (glyph))
return SCM_EOL;
- String glyph_string = ly_scm2string (glyph);
+ string glyph_string = ly_scm2string (glyph);
/* compose span_bar_mol */
- Array<Interval> extents;
+ vector<Interval> extents;
+ vector<bool> make_span_bar;
Grob *model_bar = 0;
- for (int i = elements.size (); i--;)
+ 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 (ext);
+ extents.push_back (ext);
+ make_span_bar.push_back (to_boolean (bar->get_property ("allow-span-bar")));
model_bar = bar;
}
if (!model_bar)
model_bar = me;
- extents.sort (&Interval::left_comparison);
+ vector_sort (extents, Interval::left_less);
Stencil span_bar;
- for (int i = 1; i < extents.size (); i++)
+ for (vsize i = 1; i < extents.size (); i++)
{
Interval prev_extent = extents[i - 1];
Interval ext = extents[i];
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. */
}
if (!me->is_live ())
return ly_interval2scm (Interval ());
- String gl = ly_scm2string (gn);
+ string gl = ly_scm2string (gn);
/*
urg.
{
Grob *me = unsmob_grob (smob);
extract_grob_set (me, "elements", elements);
- if (elements.is_empty ())
+ if (elements.empty ())
me->suicide ();
return SCM_UNSPECIFIED;
Grob *me = unsmob_grob (smob);
extract_grob_set (me, "elements", elements);
SCM gl = SCM_EOL;
- for (int i = elements.size ();
+ for (vsize i = elements.size ();
i-- && !scm_is_string (gl);)
gl = elements[i]->get_property ("glyph-name");
return SCM_UNSPECIFIED;
}
- String type = ly_scm2string (gl);
+ string type = ly_scm2string (gl);
if (type == "|:")
type = ".|";
else if (type == ":|")
type = "|.";
else if (type == ":|:")
type = ".|.";
+ else if (type == ":|.|:")
+ type = "|.|";
+ else if (type == ":|.:")
+ type = "|.";
- return scm_makfrom0str (type.to_str0 ());
+ return ly_string2scm (type);
}
Interval
return scm_from_double (iv.length ());
}
-ADD_INTERFACE (Span_bar, "span-bar-interface",
- "A bar line that spanned between other barlines. This interface is "
- " used for bar lines that connect different staves.",
+ADD_INTERFACE (Span_bar,
+ "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 "
+ );