*** empty log message ***

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

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index c476b32b7d84c89fe6f6379ccd2b82acf7c43e3a..a974a4495844c270bd6a41c0437ff1216ff1f781 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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <math.h>              // ceil.
@@ -69,8 +69,18 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte
   Real ss = Staff_symbol_referencer::staff_space (me);
   SCM support = me->get_grob_property ("side-support-elements");
   Grob *common = common_refpoint_of_list (support, me->get_parent (a), a);
-  
+  Grob * st = Staff_symbol_referencer::get_staff_symbol (me);
+  bool include_staff = (st
+                       && a == Y_AXIS
+                       && gh_number_p (me->get_grob_property ("staff-padding")));
+
   Interval dim;
+  if (include_staff)
+    {
+      common = st->common_refpoint (common, Y_AXIS);
+      dim = st->extent (common, Y_AXIS);
+    }
+    
   for (SCM s = support; s != SCM_EOL; s = ly_cdr (s))
     {
       Grob * e  = unsmob_grob (ly_car (s));
@@ -107,6 +117,9 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte
   if (fabs (total_off) > 100 CM)
     programming_error ("Huh ? Improbable staff side dim.");
 
+
+  
+  
   return gh_double2scm (total_off);
 }
 
@@ -193,48 +206,32 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis)
        }
       o += - iv[-d];
     }
-  return gh_double2scm (o);
-}
 
-/*
+  /*
   Maintain a minimum distance to the staff. This is similar to side
   position with padding, but it will put adjoining objects on a row if
   stuff sticks out of the staff a little.
  */
-MAKE_SCHEME_CALLBACK (Side_position_interface,out_of_staff,2);
-SCM
-Side_position_interface::out_of_staff (SCM element_smob, SCM axis)
-{
-  Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) gh_scm2int (axis);
-
   Grob * st = Staff_symbol_referencer::get_staff_symbol (me);
-
-  if (!st)
-    return gh_int2scm (0);
-
-  Real padding=
-    Staff_symbol_referencer::staff_space (me)
-    * robust_scm2double (me->get_grob_property ("staff-padding"), 0);
-  
-  Grob *common = me->common_refpoint (st, Y_AXIS);
-  Direction d = Side_position_interface::get_direction (me);
-  Interval staff_size = st->extent (common, Y_AXIS);
-  Interval me_ext = me->extent (common, a);
-  Real diff =  d*staff_size[d] + padding - d*me_ext[-d];
-  return gh_double2scm (d*  (diff >? 0));
-}
-
-void
-Side_position_interface::add_staff_support (Grob*me)
-{
-  Grob* st = Staff_symbol_referencer::get_staff_symbol (me);
-  if (st && get_axis (me) == Y_AXIS)
+  if (st && a == Y_AXIS
+      && gh_number_p (me->get_grob_property ("staff-padding")))
     {
-      add_support (me,st);
+      Real padding=
+      Staff_symbol_referencer::staff_space (me)
+      * gh_scm2double (me->get_grob_property ("staff-padding"));
+  
+      Grob *common = me->common_refpoint (st, Y_AXIS);
+      
+      Interval staff_size = st->extent (common, Y_AXIS);
+      Interval me_ext = me->extent (common, a);
+      Real diff =  d*staff_size[d] + padding - d*(o + iv[-d]);
+      o += (d*  (diff >? 0));
     }
+      
+  return gh_double2scm (o);
 }
 
+
 void
 Side_position_interface::set_axis (Grob*me, Axis a)
 {
@@ -243,7 +240,7 @@ Side_position_interface::set_axis (Grob*me, Axis a)
 
 
 
-// ugh. doesn't cactch all variants. 
+// ugh. doesn't catch all variants. 
 Axis
 Side_position_interface::get_axis (Grob*me)
 {
@@ -255,38 +252,15 @@ Side_position_interface::get_axis (Grob*me)
   return Y_AXIS;
 }
 
-void
-Side_position_interface::set_direction (Grob*me, Direction d)
-{
-  me->set_grob_property ("direction", gh_int2scm (d));
-}
-
-void
-Side_position_interface::set_minimum_space (Grob*me, Real m)
-{
-  me->set_grob_property ("minimum-space", gh_double2scm (m));
-}
-
-void
-Side_position_interface::set_padding (Grob*me, Real p)
-{
-  me->set_grob_property ("padding", gh_double2scm (p));
-}
-
-
-bool
-Side_position_interface::supported_b (Grob*me) 
-{
-  SCM s = me->get_grob_property ("side-support-elements"); 
-  return gh_pair_p (s);
-}
-
 
 
 
 ADD_INTERFACE (Side_position_interface,"side-position-interface",
-  "Position a victim object (this one) next to other objects (the "
-"support).  In this case, the property @code{direction} signifies where to put the  "
-"victim object relative to the support (left or right, up or down?) "
-,
-  "staff-padding side-support-elements direction-source direction side-relative-direction minimum-space padding");
+              "Position a victim object (this one) next to other objects (the "
+              "support).  In this case, the property @code{direction} signifies where to put the  "
+              "victim object relative to the support (left or right, up or down?)\n\n "
+              "The routine also takes the size the staff into account if "
+              "@code{staff-padding} is set. If undefined, the staff symbol is ignored." 
+              ,
+              "staff-padding side-support-elements direction-source "
+              "direction side-relative-direction minimum-space padding");