*** empty log message ***

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

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index c45947629e07484ac520ee7b6f21fb2c53b44c3f..12b21171615b84f7cec70bb190ca931b4dd9a438 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -81,9 +81,9 @@ Accidental_placement::split_accidentals (Grob * accs,
                                         Link_array<Grob> *break_reminder,
                                         Link_array<Grob> *real_acc)
 {
-  for (SCM acs =accs->get_property ("accidental-grobs"); is_pair (acs);
+  for (SCM acs =accs->get_property ("accidental-grobs"); ly_c_pair_p (acs);
        acs =ly_cdr (acs))
-    for (SCM s = ly_cdar (acs); is_pair (s); s = ly_cdr (s))
+    for (SCM s = ly_cdar (acs); ly_c_pair_p (s); s = ly_cdr (s))
       {
        Grob *a = unsmob_grob (ly_car (s));
 
@@ -250,7 +250,7 @@ stagger_apes (Link_array<Accidental_placement_entry> *apes)
 SCM
 Accidental_placement::position_accidentals (Grob * me)
 {
-  if (!me->live ())
+  if (!me->is_live ())
     return SCM_UNSPECIFIED;
   
   SCM accs = me->get_property ("accidental-grobs");
@@ -260,12 +260,12 @@ Accidental_placement::position_accidentals (Grob * me)
     Y-position, they share an Ape, and will be printed in overstrike.
    */
   Link_array<Accidental_placement_entry> apes;
-  for (SCM s = accs; is_pair (s); s =ly_cdr (s))
+  for (SCM s = accs; ly_c_pair_p (s); s =ly_cdr (s))
     {
       Accidental_placement_entry *ape = new Accidental_placement_entry;
       ape->notename_ = ly_scm2int (ly_caar (s));
       
-      for (SCM t = ly_cdar (s); is_pair (t); t =ly_cdr (t))
+      for (SCM t = ly_cdar (s); ly_c_pair_p (t); t =ly_cdr (t))
        ape->grobs_.push (unsmob_grob (ly_car (t)));
 
       apes.push (ape);