Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

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

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index 53637c86e5f1bd8fadc39ece6ee3dec4fdbc0f87..d623bd35b35412f93893a5c7c24497181bf54714 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -35,8 +35,7 @@ Staff_symbol_referencer::on_staff_line (Grob *me)
 bool
 Staff_symbol_referencer::on_line (Grob *me, int pos)
 {
-  int sz = line_count (me) - 1;
-  return ((pos + sz) % 2) == 0;
+  return Staff_symbol::on_line (me, pos);
 }
 
 bool
@@ -183,12 +182,11 @@ position_less (Grob *const &a, Grob *const &b)
 }
 
 ADD_INTERFACE (Staff_symbol_referencer,
-              "An object whose Y position is meant relative to a staff "
-              "symbol. "
-              "These usually have @code{Staff_symbol_referencer::callback} "
-              "in their @code{Y-offset-callbacks}. ",
+              "An object whose Y@tie{}position is meant relative to a staff"
+              " symbol.  These usually"
+              " have @code{Staff_symbol_referencer::callback} in their"
+              " @code{Y-offset-callbacks}.",
 
               /* properties */
-              "staff-position");
-
-
+              "staff-position "
+              );