X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-group-spanner.cc;h=b5071cc8155e3a64429bc6f3a2a6fe6bd70b08f8;hb=c484fb1da7751d35734194e623cb823b559e190f;hp=3161032716697aba99f4b6980d71030a37b47919;hpb=fdfd147f1233eef6ea8b176290221b5a4ec38868;p=lilypond.git

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 3161032716..b5071cc815 100644
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,54 +3,53 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "axis-group-interface.hh"
+#include "spanner.hh"
 #include "hara-kiri-group-spanner.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "item.hh"
 
-/*
- */
-Hara_kiri_group_spanner::Hara_kiri_group_spanner(SCM s)
-  : Spanner (s)
-{
-  set_elt_pointer ("items-worth-living", SCM_EOL);
-}
 
-void 
-Hara_kiri_group_spanner::add_interesting_item (Item* n)
+MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner,y_extent,2);
+SCM
+Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis)
 {
-  add_dependency (n);
-  Pointer_group_interface (this, "items-worth-living").add_element (n);
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (scm_axis);
 
+  assert (a == Y_AXIS);
+  consider_suicide (me);
+  return  Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis);
 }
 
-GLUE_SCORE_ELEMENT(Hara_kiri_group_spanner,after_line_breaking);
-SCM 
-Hara_kiri_group_spanner::member_after_line_breaking ()
+
+void
+Hara_kiri_group_spanner::consider_suicide (Grob*me)
 {
-  SCM worth = get_elt_pointer ("items-worth-living");
+  Spanner*sp = dynamic_cast<Spanner*> (me);
+  SCM worth = me->get_grob_property ("items-worth-living");
   if (gh_pair_p (worth))
-    return SCM_UNDEFINED;
+    return ;
 
-  Link_array<Score_element> childs = Axis_group_interface (this).get_children ();
-  for (int i = 0; i < childs.size (); i++)
+  if (!to_boolean (me->get_grob_property ("remove-first"))
+      && broken_spanner_index (sp) == 0)
     {
-      Score_element* s = childs[i];
-
-      if ( line_l () != s->line_l ())
-	programming_error ("Killing other children too");
-      s->suicide ();
+      return ;
     }
+  
+  Link_array<Grob> childs = Axis_group_interface::get_children (me);
+  for (int i = 0; i < childs.size (); i++)
+    childs[i]->suicide ();
+
 
   /*
     very appropriate name here :-)
    */
-  suicide ();
-  return SCM_UNDEFINED;
+  me->suicide ();
 }
 
 
@@ -59,19 +58,52 @@ Hara_kiri_group_spanner::member_after_line_breaking ()
   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.  */
-Real
-Hara_kiri_group_spanner::force_hara_kiri_callback (Score_element const  *elt, Axis a)
+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)
 {
-  while (elt && !dynamic_cast<Hara_kiri_group_spanner const*> (elt))
-    elt = elt->parent_l(a);
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  assert (a == Y_AXIS);
+  consider_suicide (me);
+  return gh_double2scm (0.0);
+}
+
+
+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)
+{
+  Grob *daughter = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  assert (a == Y_AXIS);
+  force_hara_kiri_callback (daughter->get_parent (a)->self_scm (), axis);
+  return gh_double2scm (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);
+}
 
-  if (elt)
-    {
-      Hara_kiri_group_spanner const  * seppuku = dynamic_cast<Hara_kiri_group_spanner const*> (elt);
 
-      ((Hara_kiri_group_spanner*)seppuku)->member_after_line_breaking ();
-    }
-  
 
-  return 0.0;
+
+
+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);
 }
+
+
+ADD_INTERFACE (Hara_kiri_group_spanner,"hara-kiri-group-interface",
+  "  As Vertical_group_spanner, but keep track of interesting items.  If	\
+we don't contain any interesting items after linebreaking, then			\
+gracefully commit suicide.  Objective: don't disgrace Lily by			\
+typesetting empty lines in orchestral scores.",					\
+  "items-worth-living remove-first");
+