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"
extract_grob_set (me, "elements", elements);
Grob *refp = common_refpoint_of_array (elements, me, Y_AXIS);
- Span_bar::evaluate_glyph (me);
- SCM glyph = me->get_property ("glyph");
+ SCM glyph = me->get_property ("glyph-name");
/* glyph may not be a string, when ME is killed by Hara Kiri in
between. */
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. */
}
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 element_smob, SCM scm_axis)
+Span_bar::width (SCM smob)
{
- Grob *se = unsmob_grob (element_smob);
- (void) scm_axis;
-
- assert ((Axis) scm_to_int (scm_axis) == X_AXIS);
- String gl = ly_scm2string (se->get_property ("glyph"));
+ Grob *me = unsmob_grob (smob);
+ SCM gn = me->get_property ("glyph-name");
+ if (!me->is_live ())
+ return ly_interval2scm (Interval ());
+
+ string gl = ly_scm2string (gn);
/*
urg.
*/
- Stencil m = Bar_line::compound_barline (se, gl, 40 PT, false);
+ Stencil m = Bar_line::compound_barline (me, gl, 40 PT, false);
return ly_interval2scm (m.extent (X_AXIS));
}
SCM
Span_bar::before_line_breaking (SCM smob)
{
- Grob *g = unsmob_grob (smob);
- evaluate_empty (g);
- evaluate_glyph (g);
+ Grob *me = unsmob_grob (smob);
+ extract_grob_set (me, "elements", elements);
+ if (elements.empty ())
+ me->suicide ();
- /* No need to call Bar_line::before_line_breaking (), because the info
- in ELEMENTS already has been procced by
- Bar_line::before_line_breaking (). */
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
return scm_from_double (i.center ());
}
-void
-Span_bar::evaluate_empty (Grob *me)
-{
- /* TODO: filter all hara-kiried out of ELEMENS list, and then
- optionally do suicide. Call this cleanage function from
- center_on_spanned_callback () as well. */
- extract_grob_set (me, "elements", elements);
- if (elements.is_empty ())
- me->suicide ();
-}
-void
-Span_bar::evaluate_glyph (Grob *me)
+MAKE_SCHEME_CALLBACK(Span_bar, calc_glyph_name, 1);
+SCM
+Span_bar::calc_glyph_name (SCM smob)
{
- SCM gl = me->get_property ("glyph");
-
- if (scm_is_string (gl))
- return;
-
+ Grob *me = unsmob_grob (smob);
extract_grob_set (me, "elements", elements);
- for (int i = elements.size ();
+ SCM gl = SCM_EOL;
+ 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))
{
me->suicide ();
- return;
+ 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 = "|.";
- gl = scm_makfrom0str (type.to_str0 ());
- if (scm_equal_p (me->get_property ("glyph"), gl)
- != SCM_BOOL_T)
- me->set_property ("glyph", gl);
+ 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, get_bar_size, 1);
+MAKE_SCHEME_CALLBACK (Span_bar, calc_bar_size, 1);
SCM
-Span_bar::get_bar_size (SCM smob)
+Span_bar::calc_bar_size (SCM smob)
{
Grob *me = unsmob_grob (smob);
Interval iv (get_spanned_interval (me));
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.",
- "elements");
+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 "
+ );
projects / lilypond.git / blobdiff