line_count fixes

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 00da1d53d1bfee2288287e082d2c5523a641121b..1366202f725013905fb37844b874628bec5e3bf0 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -62,7 +62,6 @@ Custos::print (SCM smob)
     = to_dir (me->get_property ("neutral-direction"));
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
-  int sz = Staff_symbol_referencer::line_count (me) - 1;
 
   string font_char = "custodes." + style + ".";
   if (pos < neutral_pos)
@@ -77,7 +76,7 @@ Custos::print (SCM smob)
     font_char += "d";
 
   if (adjust)
-    font_char += (((pos ^ sz) & 0x1) == 0) ? "1" : "0";
+    font_char += Staff_symbol_referencer::on_line (me, pos) ? "1" : "0";
   else
     font_char += "2";