* mf/merge.pe.in: Set font names, version, license GPL.

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index 20815715bf9f6d386bcf51e67f2bafea4864f137..bdc155fb891b4c00e9f63ecdd48e67d7c7a611fe 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -14,17 +14,16 @@
 
 */
 
+#include <cstdio>
+#include <math.h> // rint
 
-#include <stdio.h>
+#include "custos.hh"
 #include "direction.hh"
 #include "staff-symbol-referencer.hh"
-#include "custos.hh"
-#include "stencil.hh"
 #include "warn.hh"
 #include "note-head.hh"
 #include "item.hh"
 #include "font-interface.hh"
-#include "math.h" // rint
 
 MAKE_SCHEME_CALLBACK (Custos,print,1);
 SCM
@@ -34,7 +33,7 @@ Custos::print (SCM smob)
 
   SCM scm_style = me->get_property ("style");
   String style;
-  if (ly_symbol_p (scm_style))
+  if (scm_is_symbol (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
@@ -85,20 +84,8 @@ Custos::print (SCM smob)
       me->warning (_f ("custos `%s' not found", font_char));
       return SCM_EOL;
     }
-  else
-    {
-      // add ledger lines
-      int pos = Staff_symbol_referencer::get_rounded_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",