release: 1.3.11

[lilypond.git] / lily / staff-symbol-referencer.cc

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index f2532f0d43e0cbda93eef0d2356e565a8f7d4ef0..8bd451109a9f864ffd326ccebe1311899f6ce7fa 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -13,56 +13,70 @@
 #include "paper-def.hh"
 #include "dimension-cache.hh"
 
-Staff_symbol_referencer::Staff_symbol_referencer ()
+Staff_symbol_referencer_interface::Staff_symbol_referencer_interface (Score_element const *sc)
 {
-  set_elt_property ("staff-position", gh_double2scm (0.0));
-  dim_cache_[Y_AXIS]->off_callbacks_.push (callback);
+  elt_l_ = (Score_element*)sc;
+}
+
+void
+Staff_symbol_referencer_interface::set_interface ()
+{
+  elt_l_->set_elt_property ("staff-position", gh_double2scm (0.0));
+  elt_l_->dim_cache_[Y_AXIS]->off_callbacks_.push (callback);
+}
+
+
+bool
+Staff_symbol_referencer_interface::has_interface_b ()
+{
+  return unsmob_element (elt_l_->get_elt_property ("staff-symbol"))
+    || gh_number_p (elt_l_->get_elt_property ("staff-position"));
 }
 
 
 int
-Staff_symbol_referencer::lines_i () const
+Staff_symbol_referencer_interface::lines_i () const
 {
   Staff_symbol *st = staff_symbol_l ();
   return st  ?  st->no_lines_i_ : 5;
 }
 
 Staff_symbol*
-Staff_symbol_referencer::staff_symbol_l () const
+Staff_symbol_referencer_interface::staff_symbol_l () const
 {
-  SCM st = get_elt_property ("staff-symbol");
+  SCM st = elt_l_->get_elt_property ("staff-symbol");
   return dynamic_cast<Staff_symbol* > (unsmob_element(st));
 }
 
 Real
-Staff_symbol_referencer::staff_line_leading_f () const
+Staff_symbol_referencer_interface::staff_line_leading_f () const
 {
   Staff_symbol * st = staff_symbol_l ();
   if (st)
     return st->staff_line_leading_f_;
-  else if (pscore_l_ && paper_l ())
-    paper_l ()->get_var ("interline");
+  else if (elt_l_->pscore_l_ && elt_l_->paper_l ())
+    elt_l_->paper_l ()->get_var ("interline");
  
   return 0.0;
 }
 
 
 Real
-Staff_symbol_referencer::position_f () const
+Staff_symbol_referencer_interface::position_f () const
 {
   Real p =0.0;
-  SCM pos = get_elt_property ("staff-position");
+  SCM pos = elt_l_->get_elt_property ("staff-position");
   if (gh_number_p (pos))
     p = gh_scm2double (pos);
 
   Staff_symbol * st = staff_symbol_l ();
   if (st)
     {
-      Score_element * c = common_refpoint (st, Y_AXIS);
-      Real y = relative_coordinate (c, Y_AXIS)
+      Score_element * c = elt_l_->common_refpoint (st, Y_AXIS);
+      Real y = elt_l_->relative_coordinate (c, Y_AXIS)
        - st->relative_coordinate (c, Y_AXIS);
 
-      p += 2.0 * y / staff_line_leading_f ();
+      p += 2.0 * y / st->staff_line_leading_f ();
     }
   return  p;
 }
@@ -73,15 +87,17 @@ Staff_symbol_referencer::position_f () const
   should use offset callback!
  */
 Real
-Staff_symbol_referencer::callback (Dimension_cache const * c)
+Staff_symbol_referencer_interface::callback (Dimension_cache const * c)
 {
   Score_element * sc = dynamic_cast<Score_element*> (c->element_l ());
-  Staff_symbol_referencer * ref = dynamic_cast<Staff_symbol_referencer*> (sc);
+
+  
   SCM pos = sc->get_elt_property ("staff-position");
   Real off =0.0;
   if (gh_number_p (pos))
     {
-      off = gh_scm2double (pos) * ref->staff_line_leading_f () /2.0;
+      Real space = staff_symbol_referencer_interface (sc).staff_line_leading_f ();
+      off = gh_scm2double (pos) * space/2.0;
     }
   sc->set_elt_property ("staff-position", gh_double2scm (0.0));
 
@@ -90,20 +106,31 @@ Staff_symbol_referencer::callback (Dimension_cache const * c)
 
 
 void
-Staff_symbol_referencer::set_position (Real p)
+Staff_symbol_referencer_interface::set_position (Real p)
 {
-  Real halfspace = staff_line_leading_f ()* 0.5;
-  
-  translate_axis (- halfspace * position_f (), Y_AXIS);
-  Staff_symbol *st = staff_symbol_l ();
-  if (st)
-    translate_axis (halfspace * p, Y_AXIS);
+  Staff_symbol * st = staff_symbol_l ();
+  if (st && elt_l_->common_refpoint(st, Y_AXIS))
+    {
+      Real oldpos = position_f ();
+      elt_l_->set_elt_property ("staff-position", gh_double2scm (p - oldpos));
+    }
   else
     {
-      //      SCM pos = get_elt_property ("staff-position");
-      set_elt_property ("staff-position",
-                       gh_double2scm (p));
-                       //                      gh_double2scm (p + gh_scm2double (pos)));
+      elt_l_->set_elt_property ("staff-position",
+                               gh_double2scm (p));
+
     }
+
+  Array<Offset_cache_callback> &callbacks (elt_l_->dim_cache_[Y_AXIS]->off_callbacks_);
+  for (int i=0; i < callbacks.size ();i++)
+    if (callbacks[i] == callback)
+      return ;
+
+  callbacks.push (callback);
 }
 
+Staff_symbol_referencer_interface
+staff_symbol_referencer_interface (Score_element const*e)
+{
+  return e;                    // gee, I'm so smart!
+}