release: 1.5.29

[lilypond.git] / lily / align-interface.cc

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 8211c349af283717552e9abeba981fac6f614c2b..15f8ec254b9f1aa5c1038ce641c5bd3a7fdc7ed3 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,6 +11,7 @@
 #include "grob.hh"
 #include "group-interface.hh"
 #include "axis-group-interface.hh"
+#include "hara-kiri-group-spanner.hh"
 #include "paper-def.hh"
 
 MAKE_SCHEME_CALLBACK (Align_interface,alignment_callback,2);
@@ -19,7 +20,7 @@ Align_interface::alignment_callback (SCM element_smob, SCM axis)
 {
   Grob * me = unsmob_grob (element_smob);
   Axis ax = (Axis)gh_scm2int (axis);
-  Grob * par = me->parent_l (ax);
+  Grob * par = me->get_parent (ax);
   if (par && !to_boolean (par->get_grob_property ("alignment-done")))
     {
       Align_interface::align_elements_to_extents (par, ax);
@@ -33,7 +34,7 @@ Align_interface::fixed_distance_alignment_callback (SCM element_smob, SCM axis)
 {
   Grob * me = unsmob_grob (element_smob);
   Axis ax = (Axis)gh_scm2int (axis);
-  Grob * par = me->parent_l (ax);
+  Grob * par = me->get_parent (ax);
   if (par && !to_boolean (par->get_grob_property ("alignment-done")))
     {
       Align_interface::align_to_fixed_distance (par, ax);
@@ -50,13 +51,11 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
   me->set_grob_property ("alignment-done", SCM_BOOL_T);
   
   SCM d =   me->get_grob_property ("stacking-dir");
-
   
   Direction stacking_dir = gh_number_p (d) ? to_dir (d) : CENTER;
   if (!stacking_dir)
     stacking_dir = DOWN;
 
-
   SCM force = me->get_grob_property ("forced-distance");
 
   Real dy = 0.0;
@@ -66,7 +65,7 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
     }
   
   Link_array<Grob> elems
-    = Pointer_group_interface__extract_elements (me, (Grob*) 0, "elements");
+    = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
 
   Real where_f=0;
 
@@ -74,7 +73,26 @@ Align_interface::align_to_fixed_distance (Grob *me , Axis a)
   v.set_empty ();
   Array<Real> translates;
   
-  for (int j=0 ;  j < elems.size (); j++) 
+  for (int j= elems.size (); j--; ) 
+    {
+      /*
+       This is not very elegant, in that we need special support for
+       hara kiri. Unfortunately, the generic wiring of
+       force_hara_kiri_callback () (extent and offset callback) is
+       such that we might get into a loop if we call extent() or
+       offset() the elements.
+       
+        
+       */
+      if (a == Y_AXIS
+         && Hara_kiri_group_spanner::has_interface (elems[j]))
+       Hara_kiri_group_spanner::consider_suicide (elems[j]);
+
+      if (!ly_pair_p (elems[j]-> immutable_property_alist_))
+       elems.del(j);
+    }
+
+  for (int j =0; j < elems.size (); j++)
     {
       where_f += stacking_dir * dy;
       translates.push (where_f);
@@ -132,7 +150,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
 
   Link_array<Grob> elems;
   Link_array<Grob> all_grobs
-    = Pointer_group_interface__extract_elements (me, (Grob*) 0, "elements");
+    = Pointer_group_interface__extract_grobs (me, (Grob*) 0, "elements");
   for (int i=0; i < all_grobs.size (); i++) 
     {
       Interval y = all_grobs[i]->extent (me, a);