release: 1.3.32

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

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 5b1f6bba8c8d8f5b62a939ed818126cc0f30b585..0557fce059f8c2931e6ea9c032509d85d180c829 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -35,10 +35,10 @@ Staff_symbol_referencer_interface::has_interface_b ()
 
 
 int
-Staff_symbol_referencer_interface::lines_i () const
+Staff_symbol_referencer_interface::line_count () const
 {
   Staff_symbol *st = staff_symbol_l ();
-  return st  ?  st->no_lines_i_ : 5;
+  return st  ?  st->line_count () : 0;
 }
 
 Staff_symbol*
@@ -53,9 +53,9 @@ Staff_symbol_referencer_interface::staff_space () const
 {
   Staff_symbol * st = staff_symbol_l ();
   if (st)
-    return st->staff_space_;
+    return st->staff_space ();
   else if (elt_l_->pscore_l_ && elt_l_->paper_l ())
-    elt_l_->paper_l ()->get_var ("interline");
+    return elt_l_->paper_l ()->get_var ("interline");
  
   return 0.0;
 }
@@ -99,7 +99,7 @@ Staff_symbol_referencer_interface::callback (Dimension_cache const * c)
   Real off =0.0;
   if (gh_number_p (pos))
     {
-      Real space = staff_symbol_referencer_interface (sc).staff_space ();
+      Real space = staff_symbol_referencer (sc).staff_space ();
       off = gh_scm2double (pos) * space/2.0;
     }
   sc->set_elt_property ("staff-position", gh_double2scm (0.0));
@@ -107,7 +107,9 @@ Staff_symbol_referencer_interface::callback (Dimension_cache const * c)
   return off;
 }
 
-
+/*
+  Huh? -- jcn
+ */
 void
 Staff_symbol_referencer_interface::set_position (Real p)
 {
@@ -115,6 +117,7 @@ Staff_symbol_referencer_interface::set_position (Real p)
   if (st && elt_l_->common_refpoint(st, Y_AXIS))
     {
       Real oldpos = position_f ();
+      // Aargh!
       elt_l_->set_elt_property ("staff-position", gh_double2scm (p - oldpos));
     }
   else
@@ -133,7 +136,7 @@ Staff_symbol_referencer_interface::set_position (Real p)
 }
 
 Staff_symbol_referencer_interface
-staff_symbol_referencer_interface (Score_element const*e)
+staff_symbol_referencer (Score_element const*e)
 {
   return e;                    // gee, I'm so smart!
 }