*** empty log message ***

[lilypond.git] / lily / ambitus.cc

diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 30c1a9f281f1a69705b6771d1596daed6833e302..e864fa0bbd0cf6d4366a6702d422a80d62b85370 100644 (file)
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -13,7 +13,7 @@
 #include "note-head.hh"
 #include "item.hh"
 #include "font-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "lookup.hh"
 
 /*
@@ -100,7 +100,7 @@ number_accidentals (SCM key_signature, Pitch *pitch,
     prev = scm_assoc (scm_int2num (notename), key_signature);
 
   SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
-  int sig_alteration = is_number (prev_acc) ? ly_scm2int (prev_acc) : 0;
+  int sig_alteration = ly_c_number_p (prev_acc) ? ly_scm2int (prev_acc) : 0;
 
   if (alteration == sig_alteration) // no accidental at all needed
     return 0;
@@ -144,8 +144,8 @@ MAKE_SCHEME_CALLBACK (Ambitus,print,1);
 SCM
 Ambitus::print (SCM smob)
 {
-  Item *me = (Item *)unsmob_grob (smob);
-  Stencil stencil = Stencil ();
+  Item *me = (Item*) unsmob_grob (smob);
+  Stencil stencil;
 
   SCM scm_note_head_style = me->get_property ("note-head-style");
   String note_head_style;
@@ -195,7 +195,7 @@ Ambitus::print (SCM smob)
     }
 
   SCM c0 = me->get_property ("c0-position");
-  if (is_number (c0))
+  if (ly_c_number_p (c0))
     {
       p_min += ly_scm2int (c0);
       p_max += ly_scm2int (c0);