Add cautionary-style to interface.

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

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 4ce9df6761ae4118309790159514c86e2d3fb6fc..e68aaf660a4456b815870e6a2dfc76acdbd01cfc 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -67,7 +67,7 @@ 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->get_parent (a);
+
 
   /*
     As this is only used as a callback, this is called only once. We
@@ -79,13 +79,7 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte
     
   */
   SCM support = me->get_grob_property ("side-support-elements");
-    // me->remove_grob_property ("side-support-elements");
-  for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
-    {
-      Grob * e  = unsmob_grob (ly_car (s));
-      if (e)
-       common = common->common_refpoint (e, a);
-    }
+  Grob *common = common_refpoint_of_list (support, me->get_parent (a), a);
   
   Interval dim;
   for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
@@ -145,43 +139,6 @@ 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
-Side_position_interface::aligned_on_self (SCM element_smob, SCM axis)
-{
-  Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
-  String s ("self-alignment-");
-
-  s += (a == X_AXIS) ? "X" : "Y";
-
-  SCM align (me->get_grob_property (s.ch_C ()));
-  if (gh_number_p (align))
-    {
-      Interval ext (me->extent (me,a));
-
-      if (ext.empty_b ())
-       {
-         programming_error ("I'm empty. Can't align on self");
-         return gh_double2scm (0.0);
-       }
-      else
-       {
-         return gh_double2scm (- ext.linear_combination (gh_scm2double (align)));
-       }
-    }
-  else if (unsmob_grob (align))
-    {
-      return gh_double2scm (- unsmob_grob (align)->relative_coordinate (me,  a));
-    }
-  return gh_double2scm (0.0);
-}
-
 
 
 Real
@@ -258,21 +215,6 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis)
   return gh_double2scm (o);
 }
 
-/*
-  Position centered on parent.
- */
-MAKE_SCHEME_CALLBACK (Side_position_interface,centered_on_parent,2);
-SCM
-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->get_parent (a);
-
-  return gh_double2scm (him->extent (him,a).center ());  
-}
-
-
 void
 Side_position_interface::add_staff_support (Grob*me)
 {
@@ -321,11 +263,6 @@ Side_position_interface::set_padding (Grob*me, Real p)
   me->set_grob_property ("padding", gh_double2scm (p));
 }
 
-bool
-Side_position_interface::has_interface (Grob*me) 
-{
-  return me->has_interface (ly_symbol2scm ("side-position-interface"));
-}
 
 bool
 Side_position_interface::supported_b (Grob*me) 
@@ -341,4 +278,4 @@ ADD_INTERFACE (Side_position_interface,"side-position-interface",
   "Position a victim object (this one) next to other objects (the support).
 #'direction = where to put the victim object (left or right?)
 ",
-  "side-support-elements direction-source direction side-relative-direction minimum-space padding self-alignment-X self-alignment-Y");
+  "side-support-elements direction-source direction side-relative-direction minimum-space padding");