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"
#include "warn.hh"
#include "item.hh"
-MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 2);
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 1);
SCM
-Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis)
+Hara_kiri_group_spanner::y_extent (SCM smob)
{
- Grob *me = unsmob_grob (element_smob);
- (void) scm_axis;
-
- assert (scm_to_int (scm_axis) == Y_AXIS);
+ Grob *me = unsmob_grob (smob);
consider_suicide (me);
- return Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis);
+ return Axis_group_interface::generic_group_extent (me, Y_AXIS);
}
void
Hara_kiri_group_spanner::consider_suicide (Grob *me)
{
Spanner *sp = dynamic_cast<Spanner *> (me);
+ if (!to_boolean (me->get_property ("remove-empty")))
+ return ;
extract_grob_set (me, "items-worth-living", worth);
if (worth.size ())
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;
before asking for offsets. */
MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_callback, 2);
SCM
-Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis)
+Hara_kiri_group_spanner::force_hara_kiri_callback (SCM smob, SCM axis)
{
- Grob *me = unsmob_grob (element_smob);
+ Grob *me = unsmob_grob (smob);
(void) axis;
assert (scm_to_int (axis) == Y_AXIS);
MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, force_hara_kiri_in_parent_callback, 2);
SCM
-Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM element_smob, SCM axis)
+Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM smob, SCM axis)
{
- Grob *daughter = unsmob_grob (element_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);
return scm_from_double (0.0);
}
-void
-Hara_kiri_group_spanner::add_element (Grob *me, Grob *e)
-{
- // e->add_offset_callback (force_hara_kiri_in_parent_callback, Y_AXIS);
- Axis_group_interface::add_element (me, e);
-}
-
void
Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n)
{
- me->add_dependency (n);
Pointer_group_interface::add_grob (me, ly_symbol2scm ("items-worth-living"), n);
}
"A group spanner that keeps track of interesting items. If it "
"doesn't contain any after linebreaking, then it "
"will remove itself and all its children.",
- "items-worth-living remove-first");
+
+
+ /* properties */
+ "items-worth-living "
+ "remove-empty "
+ "remove-first "
+ );
+