* lily/context.cc (Context): take key argument in ctor.

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 414d8904cdf1d24e9bd1935ac85df630a9d07874..9a41fb20c6c7a2e981f8aac5e97eb512cd4bd90b 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -34,7 +34,7 @@ Custos::print (SCM smob)
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (gh_symbol_p (scm_style))
+  if (scm_is_symbol (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
@@ -48,20 +48,13 @@ Custos::print (SCM smob)
    * staffline or not, or shall we use individual font characters
    * for both cases?
    */
-  bool adjust
-    = to_boolean (me->get_property ("adjust-if-on-staffline"));
-
-  int neutral_pos;
-  SCM ntr_pos = me->get_property ("neutral-position");
-  if (gh_number_p (ntr_pos))
-    neutral_pos = gh_scm2int (ntr_pos);
-  else
-    neutral_pos = 0;
+  bool adjust = true; 
 
+  int neutral_pos = robust_scm2int (me->get_property ("neutral-position"), 0);
   Direction neutral_direction =
     to_dir (me->get_property ("neutral-direction"));
 
-  int pos = (int)rint (Staff_symbol_referencer::get_position (me));
+  int pos = Staff_symbol_referencer::get_rounded_position (me);
   int sz = Staff_symbol_referencer::line_count (me)-1;
 
   String font_char = "custodes-" + style + "-";
@@ -92,22 +85,10 @@ Custos::print (SCM smob)
       me->warning (_f ("custos `%s' not found", font_char));
       return SCM_EOL;
     }
-  else
-    {
-      // add ledger lines
-      int pos = (int)rint (Staff_symbol_referencer::get_position (me));
-      int interspaces = Staff_symbol_referencer::line_count (me)-1;
-      if (abs (pos) - interspaces > 1)
-       {
-         Stencil ledger_lines =
-           Note_head::brew_ledger_lines (me, pos, interspaces,
-                                         stencil.extent (X_AXIS), 0, true);
-         stencil.add_stencil (ledger_lines);
-       }
-      return stencil.smobbed_copy ();
-    }
+
+  return stencil.smobbed_copy ();
 }
 
 ADD_INTERFACE (Custos, "custos-interface",
   "A custos object.",
-  "style adjust-if-on-staffline neutral-direction neutral-position");
+  "style neutral-position neutral-direction");