X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos.cc;h=584dcaba4962a8c645db60d9432865c961084aa3;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f312e4a8abbaebebfba22bf585fbcf8eb2e6f7ce;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/custos.cc b/lily/custos.cc
index f312e4a8ab..584dcaba49 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Juergen Reuter <reuter@ipd.uka.de>
+  Copyright (C) 2000--2015 Juergen Reuter <reuter@ipd.uka.de>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ MAKE_SCHEME_CALLBACK (Custos, print, 1);
 SCM
 Custos::print (SCM smob)
 {
-  Item *me = (Item *)unsmob_grob (smob);
+  Item *me = (Item *)Grob::unsmob (smob);
 
   SCM scm_style = me->get_property ("style");
   string style;
@@ -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";
 
@@ -93,12 +92,12 @@ Custos::print (SCM smob)
 }
 
 ADD_INTERFACE (Custos,
-	       "A custos object.  @code{style} can have four valid values:"
-	       " @code{mensural}, @code{vaticana}, @code{medicaea}, and"
-	       " @code{hufnagel}.  @code{mensural} is the default style.",
-
-	       /* properties */
-	       "style "
-	       "neutral-position "
-	       "neutral-direction "
-	       );
+               "A custos object.  @code{style} can have four valid values:"
+               " @code{mensural}, @code{vaticana}, @code{medicaea}, and"
+               " @code{hufnagel}.  @code{mensural} is the default style.",
+
+               /* properties */
+               "style "
+               "neutral-position "
+               "neutral-direction "
+              );