*** empty log message ***

[lilypond.git] / lily / event.cc

diff --git a/lily/event.cc b/lily/event.cc
index 7a1b9c6a7b2b4f257b74a3931b145d1f92f3bc99..0c60b35f0f441bc754bef5cd3eca73f98e285622 100644 (file)
--- a/lily/event.cc
+++ b/lily/event.cc
@@ -63,10 +63,10 @@ Event::to_relative_octave (Pitch last)
       new_pit = new_pit.to_relative_octave (last);
 
       SCM check = get_property ("absolute-octave");
-      if (is_number (check) &&
-         new_pit.get_octave () != ly_scm2int (check))
+      if (ly_c_number_p (check) &&
+         new_pit.get_octave () != scm_to_int (check))
        {
-         Pitch expected_pit (ly_scm2int (check),
+         Pitch expected_pit (scm_to_int (check),
                              new_pit.get_notename (),
                              new_pit.get_alteration ());
          origin ()->warning (_f ("octave check failed; expected %s, found: %s",
@@ -148,9 +148,9 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist",
       SCM alter = ly_cdar (s);
       if (ly_c_pair_p (key))
        {
-         Pitch orig (ly_scm2int (ly_car (key)),
-                     ly_scm2int (ly_cdr (key)),
-                     ly_scm2int (alter));
+         Pitch orig (scm_to_int (ly_car (key)),
+                     scm_to_int (ly_cdr (key)),
+                     scm_to_int (alter));
 
          orig =orig.transposed (*p);
 
@@ -160,9 +160,9 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist",
          newlist = scm_cons (scm_cons (key, scm_int2num (orig.get_alteration ())),
                             newlist);
        }
-      else if (is_number (key))
+      else if (ly_c_number_p (key))
        {
-         Pitch orig (0, ly_scm2int (key), ly_scm2int (alter));
+         Pitch orig (0, scm_to_int (key), scm_to_int (alter));
          orig = orig.transposed (*p);
 
          key =scm_int2num (orig.get_notename ());
@@ -195,7 +195,7 @@ alist_equal_p (SCM a, SCM b)
       SCM l = scm_assoc (key, b);
 
       if (l == SCM_BOOL_F
-         || !is_equal ( ly_cdr (l), val))
+         || !ly_c_equal_p ( ly_cdr (l), val))
 
        return false;
     }