source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.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;
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);
if (ext.is_empty ())
continue;
- extents.push (ext);
+ extents.push_back (ext);
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];
return span_bar.smobbed_copy ();
}
-MAKE_SCHEME_CALLBACK (Span_bar, width_callback, 2);
+MAKE_SCHEME_CALLBACK (Span_bar, width, 1);
SCM
-Span_bar::width_callback (SCM smob, SCM scm_axis)
+Span_bar::width (SCM smob)
{
Grob *me = unsmob_grob (smob);
- (void) scm_axis;
-
- assert ((Axis) scm_to_int (scm_axis) == X_AXIS);
SCM gn = me->get_property ("glyph-name");
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;
}
-MAKE_SCHEME_CALLBACK (Span_bar, center_on_spanned_callback, 2);
+MAKE_SCHEME_CALLBACK (Span_bar, center_on_spanned_callback, 1);
SCM
-Span_bar::center_on_spanned_callback (SCM element_smob, SCM axis)
+Span_bar::center_on_spanned_callback (SCM smob)
{
- Grob *me = unsmob_grob (element_smob);
- (void) axis;
- assert (scm_to_int (axis) == Y_AXIS);
+ Grob *me = unsmob_grob (smob);
Interval i (get_spanned_interval (me));
/* Bar_line::print delivers a barline of y-extent (-h/2, h/2), so
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");
+ gl = elements[i]->get_property ("glyph-name");
if (!scm_is_string (gl))
{
return SCM_UNSPECIFIED;
}
- String type = ly_scm2string (gl);
+ string type = ly_scm2string (gl);
if (type == "|:")
type = ".|";
else if (type == ":|")
else if (type == ":|:")
type = ".|.";
- return scm_makfrom0str (type.to_str0 ());
+ return ly_string2scm (type);
}
Interval
Span_bar::get_spanned_interval (Grob *me)
{
- return ly_scm2interval (Axis_group_interface::group_extent_callback
- (me->self_scm (), scm_from_int (Y_AXIS)));
+ return ly_scm2interval (Axis_group_interface::generic_group_extent (me, Y_AXIS));
}
MAKE_SCHEME_CALLBACK (Span_bar, calc_bar_size, 1);
return scm_from_double (iv.length ());
}
-ADD_INTERFACE (Span_bar, "span-bar-interface",
+ADD_INTERFACE (Span_bar,
"A bar line that spanned between other barlines. This interface is "
" used for bar lines that connect different staves.",