X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=60fbcd8a697bec83e633ed95f7d7f659e0eaede1;hb=07a5ed85c189a97d04c550679826dfc5eca2eb18;hp=c52646506a7d0da5a91224e79b4dbe9a1fce6c23;hpb=a8651b61fa25aee299bbc846d180a942568d6075;p=lilypond.git

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index c52646506a..60fbcd8a69 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -9,46 +9,39 @@
 #include <math.h>		// ceil.
 
 #include "side-position-interface.hh"
-#include "staff-symbol.hh"
 #include "debug.hh"
 #include "warn.hh"
 #include "dimensions.hh"
-#include "dimension-cache.hh"
 #include "staff-symbol-referencer.hh"
 #include "group-interface.hh"
 
-Side_position_interface::Side_position_interface (Score_element const *e)
-{
-  elt_l_ = (Score_element*)e;
-}
-
 void
-Side_position_interface::add_support (Score_element*e)
+Side_position::add_support (Grob*me, Grob*e)
 {
-  Pointer_group_interface (elt_l_, "side-support-elements").add_element (e);
+  Pointer_group_interface::add_element (me, "side-support-elements",e);
 }
 
 
 
 Direction
-Side_position_interface::get_direction () const
+Side_position::get_direction (Grob*me)
 {
-  SCM d = elt_l_->get_elt_property ("direction");
+  SCM d = me->get_grob_property ("direction");
   if (isdir_b (d))
     return to_dir (d) ? to_dir (d) : DOWN;
 
   Direction relative_dir = UP;
-  SCM reldir = elt_l_->get_elt_property ("side-relative-direction");	// should use a lambda.
+  SCM reldir = me->get_grob_property ("side-relative-direction");	// should use a lambda.
   if (isdir_b (reldir))
     {
       relative_dir = to_dir (reldir);
     }
   
-  SCM other_elt = elt_l_->get_elt_pointer ("direction-source");
-  Score_element * e = unsmob_element(other_elt);
+  SCM other_elt = me->get_grob_property ("direction-source");
+  Grob * e = unsmob_grob(other_elt);
   if (e)
     {
-      return (Direction)(relative_dir * Side_position_interface (e).get_direction ());
+      return (Direction)(relative_dir * Side_position::get_direction (e));
     }
   
   return DOWN;
@@ -58,29 +51,30 @@ Side_position_interface::get_direction () const
    Callback that does the aligning. Puts the element next to the support
  */
 
-Real
-Side_position_interface::side_position (Score_element *cme, Axis axis)
+MAKE_SCHEME_CALLBACK(Side_position,side_position,2);
+SCM
+Side_position::side_position (SCM element_smob, SCM axis)
 {
-  Score_element* me = (Score_element*)cme;
-  Score_element *common = me->parent_l (axis);
-  SCM support = me->get_elt_pointer ("side-support-elements");
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+
+  Grob *common = me->parent_l (a);
+  SCM support = me->get_grob_property ("side-support-elements");
   for (SCM s = support; s != SCM_EOL; s = gh_cdr (s))
     {
-      Score_element * e  = unsmob_element (gh_car (s));
+      Grob * e  = unsmob_grob (gh_car (s));
       if (e)
-	common = common->common_refpoint (e, axis);
+	common = common->common_refpoint (e, a);
     }
   
   Interval dim;
   for (SCM s = support; s != SCM_EOL; s = gh_cdr (s))
     {
 
-      Score_element * e  = unsmob_element ( gh_car (s));
+      Grob * e  = unsmob_grob ( gh_car (s));
       if (e)
 	{
-	  Real coord = e->relative_coordinate (common, axis);
-
-	  dim.unite (coord + e->extent (axis));
+	  dim.unite (e->extent (common, a));
 	}
     }
 
@@ -89,13 +83,13 @@ Side_position_interface::side_position (Score_element *cme, Axis axis)
       dim = Interval(0,0);
     }
 
-  Direction dir = Side_position_interface (me).get_direction ();
+  Direction dir = Side_position::get_direction (me);
     
-  Real off =  me->parent_l (axis)->relative_coordinate (common, axis);
-  SCM minimum = me->remove_elt_property ("minimum-space");
+  Real off =  me->parent_l (a)->relative_coordinate (common, a);
+  SCM minimum = me->remove_grob_property ("minimum-space");
 
   Real total_off = dim[dir] + off;
-  SCM padding = me->remove_elt_property ("padding");
+  SCM padding = me->remove_grob_property ("padding");
   if (gh_number_p (padding))
     {
       total_off += gh_scm2double (padding) * dir;
@@ -107,38 +101,42 @@ Side_position_interface::side_position (Score_element *cme, Axis axis)
   if (fabs (total_off) > 100 CM)
     programming_error ("Huh ? Improbable staff side dim.");
 
-  return total_off;
+  return gh_double2scm (total_off);
 }
 
 /**
   callback that centers the element on itself
  */
-Real
-Side_position_interface::aligned_on_self (Score_element *elm, Axis ax)
+MAKE_SCHEME_CALLBACK(Side_position,aligned_on_self,2);
+SCM
+Side_position::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 +=  (ax == X_AXIS) ? "X" : "Y";
+  s +=  (a == X_AXIS) ? "X" : "Y";
 
-  SCM align (elm->get_elt_property (s));
-  if (isdir_b (align))
+  SCM align (me->get_grob_property (s.ch_C()));
+  if (gh_number_p (align))
     {
-      Direction d = to_dir (align);
-      Interval ext(elm->extent (ax));
+      Interval ext(me->extent (me,a));
 
       if (ext.empty_b ())
 	{
 	  programming_error ("I'm empty. Can't align on self");
-	  return 0.0;
+	  return gh_double2scm (0.0);
 	}
-      else if (d)
+      else
 	{
-	  return - ext[d];
+	  return gh_double2scm (- ext.linear_combination (gh_scm2double (align)));
 	}
-      return - ext.center ();
     }
-  else
-    return 0.0;
+  else if (unsmob_grob (align))
+    {
+      return gh_double2scm (- unsmob_grob (align)->relative_coordinate (me,  a));
+    }
+    return gh_double2scm (0.0);
 }
 
 
@@ -154,99 +152,102 @@ directed_round (Real f, Direction d)
 
 /*
   Callback that quantises in staff-spaces, rounding in the direction
-  of the elements "direction" elt property. */
-Real
-Side_position_interface::quantised_position (Score_element *me, Axis a)
+  of the elements "direction" elt property.
+
+  Only rounds when we're inside the staff, as determined by
+  Staff_symbol_referencer::staff_radius() */
+MAKE_SCHEME_CALLBACK(Side_position,quantised_position,2);
+SCM
+Side_position::quantised_position (SCM element_smob, SCM )
 {
-  Side_position_interface s(me);
-  Direction d = s.get_direction ();
+  Grob *me = unsmob_grob (element_smob);
+  
+  
+  Direction d = Side_position::get_direction (me);
 
-  if (Staff_symbol_referencer_interface::has_interface_b (me))
+  if (Staff_symbol_referencer::has_interface (me))
     {
-      Staff_symbol_referencer_interface si (me);
-      Real p = si.position_f ();
+      Real p = Staff_symbol_referencer::position_f (me);
       Real rp = directed_round (p, d);
-
+      Real rad = Staff_symbol_referencer::staff_radius (me) *2 ;
       int ip = int  (rp);
-      if ((ip % 2) == 0)
+
+      if (abs (ip) < rad && Staff_symbol_referencer::on_staffline (me,ip))
 	{
 	  ip += d;
 	  rp += d;
 	}
 
-      return (rp - p) * si.staff_space () / 2.0;
+      return gh_double2scm ((rp - p) * Staff_symbol_referencer::staff_space (me) / 2.0);
     }
-  return 0.0;
+  return gh_double2scm (0.0);
 }
 
 /*
   Position next to support, taking into account my own dimensions and padding.
  */
-Real
-Side_position_interface::aligned_side (Score_element *me, Axis ax)
+MAKE_SCHEME_CALLBACK(Side_position,aligned_side,2);
+SCM
+Side_position::aligned_side (SCM element_smob, SCM axis)
 {
-  Side_position_interface s(me);
-  Direction d = s.get_direction ();
-  Real o = side_position (me,ax);
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  
+  Direction d = Side_position::get_direction (me);
+  Real o = gh_scm2double (side_position (element_smob,axis));
 
-  Interval iv =  me->extent (ax);
+  Interval iv =  me->extent (me, a);
 
   if (!iv.empty_b ())
     {
       o += - iv[-d];
 
-      SCM pad = me->get_elt_property ("padding");
+      SCM pad = me->get_grob_property ("padding");
       if (gh_number_p (pad))
 	o += d *gh_scm2double (pad) ; 
     }
-  return o;
+  return gh_double2scm (o);
 }
 
 /*
   Position centered on parent.
  */
-Real
-Side_position_interface::centered_on_parent (Score_element * me, Axis a)
+MAKE_SCHEME_CALLBACK(Side_position,centered_on_parent,2);
+SCM
+Side_position::centered_on_parent (SCM element_smob, SCM axis)
 {
-  Score_element *him = me->parent_l (a);
+  Grob *me = unsmob_grob (element_smob);
+  Axis a = (Axis) gh_scm2int (axis);
+  Grob *him = me->parent_l (a);
 
-  return him->extent (a).center ();  
+  return gh_double2scm (him->extent (him,a).center ());  
 }
 
 
 void
-Side_position_interface::add_staff_support ()
+Side_position::add_staff_support (Grob*me)
 {
-  Staff_symbol_referencer_interface si (elt_l_);
-  if (si.staff_symbol_l ())
+  Grob* st = Staff_symbol_referencer::staff_symbol_l (me);
+  if (st)
     {
-      add_support (si.staff_symbol_l ());
+      add_support (me,st);
     }
 }
 
 void
-Side_position_interface::set_axis (Axis a)
+Side_position::set_axis (Grob*me, Axis a)
 {
-  // prop transparent ? 
-  if (elt_l_->get_elt_pointer ("side-support-elements") == SCM_UNDEFINED)
-    elt_l_->set_elt_pointer ("side-support-elements" ,SCM_EOL);
-
-  if (!elt_l_->has_offset_callback_b (aligned_side, a))
-    elt_l_->add_offset_callback (aligned_side, a);
+  me->add_offset_callback (Side_position::aligned_side_proc, a);
 }
 
 
-void
-Side_position_interface::set_quantised (Axis a)
-{
-  elt_l_->add_offset_callback (quantised_position, a);
-}
 
+// ugh. doesn't cactch all variants. 
 Axis
-Side_position_interface::get_axis () const
+Side_position::get_axis (Grob*me)
 {
-  if (elt_l_->has_offset_callback_b (&side_position, X_AXIS)
-      || elt_l_->has_offset_callback_b (&aligned_side , X_AXIS))
+  if (me->has_offset_callback_b (Side_position::aligned_side_proc, X_AXIS)
+      || me->has_offset_callback_b (Side_position::aligned_side_proc , X_AXIS))
     return X_AXIS;
 
   
@@ -254,34 +255,34 @@ Side_position_interface::get_axis () const
 }
 
 void
-Side_position_interface::set_direction (Direction d) 
+Side_position::set_direction (Grob*me, Direction d)
 {
-  elt_l_->set_elt_property ("direction", gh_int2scm (d));
+  me->set_grob_property ("direction", gh_int2scm (d));
 }
 
 void
-Side_position_interface::set_minimum_space (Real m)
+Side_position::set_minimum_space (Grob*me, Real m)
 {
-  elt_l_->set_elt_property ("minimum-space", gh_double2scm (m));
+  me->set_grob_property ("minimum-space", gh_double2scm (m));
 }
 
 void
-Side_position_interface::set_padding (Real p)
+Side_position::set_padding (Grob*me, Real p)
 {
-  elt_l_->set_elt_property ("padding", gh_double2scm (p));
+  me->set_grob_property ("padding", gh_double2scm (p));
 }
 
 bool
-Side_position_interface::has_interface_b () const
+Side_position::has_interface (Grob*me) 
 {
-  return elt_l_->get_elt_pointer ("side-support-elements") != SCM_UNDEFINED;
+  return me->has_interface (ly_symbol2scm ("side-position-interface"));
 }
 
 bool
-Side_position_interface::supported_b () const
+Side_position::supported_b (Grob*me) 
 {
-  SCM s =elt_l_->get_elt_pointer  ("side-support-elements"); 
-  return s != SCM_UNDEFINED && s != SCM_EOL;
+  SCM s = me->get_grob_property  ("side-support-elements"); 
+  return gh_pair_p(s);
 }