* python/lilylib.py (make_ps_images): only compute bbox when needed.

[lilypond.git] / lily / event.cc

diff --git a/lily/event.cc b/lily/event.cc
index baec1ce0d7e5191444ac69db9d73ac2d72714191..1c1112379bf68a5dd2a8fd478fe6965351e85997 100644 (file)
--- a/lily/event.cc
+++ b/lily/event.cc
@@ -63,7 +63,7 @@ Event::to_relative_octave (Pitch last)
       new_pit = new_pit.to_relative_octave (last);
 
       SCM check = get_property ("absolute-octave");
-      if (is_number (check) &&
+      if (ly_c_number_p (check) &&
          new_pit.get_octave () != ly_scm2int (check))
        {
          Pitch expected_pit (ly_scm2int (check),
@@ -142,11 +142,11 @@ LY_DEFINE (ly_transpose_key_alist, "ly:transpose-key-alist",
   SCM newlist = SCM_EOL;
   Pitch *p = unsmob_pitch (pit);
   
-  for (SCM s = l; is_pair (s); s = ly_cdr (s))
+  for (SCM s = l; ly_c_pair_p (s); s = ly_cdr (s))
     {
       SCM key = ly_caar (s);
       SCM alter = ly_cdar (s);
-      if (is_pair (key))
+      if (ly_c_pair_p (key))
        {
          Pitch orig (ly_scm2int (ly_car (key)),
                      ly_scm2int (ly_cdr (key)),
@@ -160,7 +160,7 @@ 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));
          orig = orig.transposed (*p);
@@ -188,14 +188,14 @@ bool
 alist_equal_p (SCM a, SCM b)
 {
   for (SCM s = a;
-       is_pair (s); s = ly_cdr (s))
+       ly_c_pair_p (s); s = ly_cdr (s))
     {
       SCM key = ly_caar (s);
       SCM val = ly_cdar (s);
       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;
     }