source file of the GNU LilyPond music typesetter
- (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "hara-kiri-group-spanner.hh"
bool remove_first = to_boolean (me->get_property ("remove-first"));
if (!remove_first
- && ((sp->original_ && broken_spanner_index (sp) == 0)
+ && ((sp->original () && broken_spanner_index (sp) == 0)
|| Paper_column::get_rank (sp->get_bound (LEFT)->get_column ())
== 0))
return;
- Link_array<Grob> childs;
+ vector<Grob*> childs;
Axis_group_interface::get_children (me, &childs);
- for (int i = 0; i < childs.size (); i++)
+ for (vsize i = 0; i < childs.size (); i++)
childs[i]->suicide ();
/*
We can't rely on offsets and dimensions of elements in a hara-kiri
group. Use a callback to make sure that hara-kiri has been done
before asking for offsets. */
-MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 2);
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, after_line_breaking, 1);
SCM
-Hara_kiri_group_spanner::force_hara_kiri_callback (SCM smob, SCM axis)
+Hara_kiri_group_spanner::after_line_breaking (SCM smob)
{
Grob *me = unsmob_grob (smob);
- (void) axis;
-
- assert (scm_to_int (axis) == Y_AXIS);
consider_suicide (me);
- return scm_from_double (0.0);
+ return SCM_UNSPECIFIED;
}
-MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_parent_callback, 2);
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 1);
SCM
-Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM smob, SCM axis)
+Hara_kiri_group_spanner::force_hara_kiri_callback (SCM smob)
{
- Grob *daughter = unsmob_grob (smob);
- Axis a = (Axis) scm_to_int (axis);
- assert (a == Y_AXIS);
- force_hara_kiri_callback (daughter->get_parent (a)->self_scm (), axis);
+ Grob *me = unsmob_grob (smob);
+ consider_suicide (me);
return scm_from_double (0.0);
}
-void
-Hara_kiri_group_spanner::add_element (Grob *me, Grob *e)
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_y_parent_callback, 1);
+SCM
+Hara_kiri_group_spanner::force_hara_kiri_in_y_parent_callback (SCM smob)
{
- Axis_group_interface::add_element (me, e);
+ Grob *daughter = unsmob_grob (smob);
+ force_hara_kiri_callback (daughter->get_parent (Y_AXIS)->self_scm ());
+ return scm_from_double (0.0);
}
void
Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n)
{
- Pointer_group_interface::add_grob (me, ly_symbol2scm ("items-worth-living"), n);
+ Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("items-worth-living"), n);
}
ADD_INTERFACE (Hara_kiri_group_spanner, "hara-kiri-group-interface",