* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

[lilypond.git] / lily / accidental-engraver.cc

diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc
index ef374b50140e6740d185e8876cc40bc4a1955525..73314fb4eac282ab23749a71894b426a525f1540 100644 (file)
--- a/lily/accidental-engraver.cc
+++ b/lily/accidental-engraver.cc
@@ -135,16 +135,16 @@ number_accidentals_from_sig (bool *different,
   
   /* If an accidental was not found or the accidental was too old */
   if (prev == SCM_BOOL_F ||
-      (is_number (lazyness) && curbarnum_i > accbarnum_i + ly_scm2int (lazyness)))
+      (ly_c_number_p (lazyness) && curbarnum_i > accbarnum_i + ly_scm2int (lazyness)))
     prev = scm_assoc (scm_int2num (n), sig);
 
 
   SCM prev_acc = (prev == SCM_BOOL_F) ? scm_int2num (0) : ly_cdr (prev);
 
-  int p = is_number (prev_acc) ? ly_scm2int (prev_acc) : 0;
+  int p = ly_c_number_p (prev_acc) ? ly_scm2int (prev_acc) : 0;
 
   int num;
-  if (a == p && is_number (prev_acc))
+  if (a == p && ly_c_number_p (prev_acc))
     num = 0;
   else if ( (abs (a)<abs (p) || p*a<0) && a != 0 )
     num = 2;
@@ -223,7 +223,7 @@ Accidental_engraver::get_bar_num ()
       
   Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
   if (mp.main_part_ < Rational (0)
-      && is_number (barnum))
+      && ly_c_number_p (barnum))
     barnum = scm_int2num (ly_scm2int (barnum) - 1);
       
   return barnum ;