new file, move from

[lilypond.git] / lily / ambitus.cc

diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index 33c8122e420abfd8ed871249a8267bbd85939f27..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"
 
 /*
@@ -90,7 +90,7 @@ number_accidentals (SCM key_signature, Pitch *pitch,
                     key_signature);
 
   /* should really be true unless prev == SCM_BOOL_F */
-  if (ly_pair_p (prev) && ly_pair_p (ly_cdr (prev)))
+  if (ly_c_pair_p (prev) && ly_c_pair_p (ly_cdr (prev)))
     {
       prev = scm_cons (ly_car (prev), ly_cadr (prev));
     }
@@ -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 = ly_number_p (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,12 +144,12 @@ 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;
-  if (ly_symbol_p (scm_note_head_style))
+  if (ly_c_symbol_p (scm_note_head_style))
     {
       String note_head_style =
        ly_symbol2string (scm_note_head_style);
@@ -195,7 +195,7 @@ Ambitus::print (SCM smob)
     }
 
   SCM c0 = me->get_property ("c0-position");
-  if (ly_number_p (c0))
+  if (ly_c_number_p (c0))
     {
       p_min += ly_scm2int (c0);
       p_max += ly_scm2int (c0);
@@ -244,7 +244,7 @@ Ambitus::print (SCM smob)
   SCM key_signature = me->get_property ("key-signature");
   SCM scm_accidentals_style = me->get_property ("accidentals-style");
   String accidentals_style;
-  if (ly_symbol_p (scm_accidentals_style))
+  if (ly_c_symbol_p (scm_accidentals_style))
     {
       accidentals_style =
        ly_symbol2string (scm_accidentals_style);