release: 1.5.29

[lilypond.git] / lily / side-position-interface.cc

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 5c947d8b20e90ab2f3ce3e4ecef7d8d03a1b2210..2e83ee183c082527306229df7f1c409f2a85f741 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>              // ceil.
@@ -19,7 +19,7 @@
 void
 Side_position_interface::add_support (Grob*me, Grob*e)
 {
-  Pointer_group_interface::add_element (me, "side-support-elements",e);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("side-support-elements"), e);
 }
 
 
@@ -67,19 +67,30 @@ Side_position_interface::aligned_on_support_extents (SCM element_smob, SCM axis)
 SCM
 Side_position_interface::general_side_position (Grob * me, Axis a, bool use_extents)
 {
-  Grob *common = me->parent_l (a);
+  Grob *common = me->get_parent (a);
+
+  /*
+    As this is only used as a callback, this is called only once. We
+    could wipe SIDE-SUPPORT-ELEMENTS after we retrieve it to conserve
+    memory; however -- we should look more into benefits of such actions?
+
+    The benefit is small, it seems: total GC times taken don't
+    differ. Would this also hamper Generational GC ?
+    
+  */
   SCM support = me->get_grob_property ("side-support-elements");
-  for (SCM s = support; s != SCM_EOL; s = gh_cdr (s))
+    // me->remove_grob_property ("side-support-elements");
+  for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
     {
-      Grob * e  = unsmob_grob (gh_car (s));
+      Grob * e  = unsmob_grob (ly_car (s));
       if (e)
        common = common->common_refpoint (e, a);
     }
   
   Interval dim;
-  for (SCM s = support; s != SCM_EOL; s = gh_cdr (s))
+  for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
     {
-      Grob * e  = unsmob_grob (gh_car (s));
+      Grob * e  = unsmob_grob (ly_car (s));
       if (e)
        if (use_extents)
          dim.unite (e->extent (common, a));
@@ -97,7 +108,7 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte
 
   Direction dir = Side_position_interface::get_direction (me);
     
-  Real off =  me->parent_l (a)->relative_coordinate (common, a);
+  Real off =  me->get_parent (a)->relative_coordinate (common, a);
   SCM minimum = me->remove_grob_property ("minimum-space");
 
   Real total_off = dim.linear_combination (dir) + off;
@@ -136,6 +147,8 @@ Side_position_interface::aligned_on_support_refpoints (SCM smob, SCM axis)
 
 /**
   callback that centers the element on itself
+
+  Requires that self-alignment-{X,Y} be set.
  */
 MAKE_SCHEME_CALLBACK (Side_position_interface,aligned_on_self,2);
 SCM
@@ -166,7 +179,7 @@ Side_position_interface::aligned_on_self (SCM element_smob, SCM axis)
     {
       return gh_double2scm (- unsmob_grob (align)->relative_coordinate (me,  a));
     }
-    return gh_double2scm (0.0);
+  return gh_double2scm (0.0);
 }
 
 
@@ -254,7 +267,7 @@ Side_position_interface::centered_on_parent (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
   Axis a = (Axis) gh_scm2int (axis);
-  Grob *him = me->parent_l (a);
+  Grob *him = me->get_parent (a);
 
   return gh_double2scm (him->extent (him,a).center ());  
 }
@@ -264,7 +277,7 @@ void
 Side_position_interface::add_staff_support (Grob*me)
 {
   Grob* st = Staff_symbol_referencer::staff_symbol_l (me);
-  if (st)
+  if (st && get_axis (me) == Y_AXIS)
     {
       add_support (me,st);
     }