release commit

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 4a308146e1c98ae6aff83b53283c847cab508475..f0e834f193c95099be4ff1a149fc8706be9bdc4e 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -40,7 +40,7 @@ Separation_item::conditional_width (Grob * me, Grob * left)
   Paper_column * pc = item->get_column ();
   
   
-  for (SCM s =  me->get_property ("conditional-elements"); ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s =  me->get_property ("conditional-elements"); scm_is_pair (s); s = ly_cdr (s))
     {
       SCM elt = ly_car (s);
       if (!unsmob_grob (elt))
@@ -84,7 +84,7 @@ Separation_item::width (Grob *me)
   Paper_column * pc = item->get_column ();
   Interval w;
   
-  for (SCM s =  me->get_property ("elements"); ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s =  me->get_property ("elements"); scm_is_pair (s); s = ly_cdr (s))
     {
       SCM elt = ly_car (s);
       if (!unsmob_grob (elt))
@@ -140,11 +140,11 @@ Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d
   last_ext->set_empty ();
   Grob *last_grob = 0;
   for (SCM s = separation_item->get_property ("elements");
-       ly_c_pair_p (s); s = ly_cdr (s))
+       scm_is_pair (s); s = ly_cdr (s))
     {
       Grob * break_item = unsmob_grob (ly_car (s));
       
-      if (!ly_c_symbol_p (break_item->get_property ("break-align-symbol")))
+      if (!scm_is_symbol (break_item->get_property ("break-align-symbol")))
        continue;
 
       Interval ext = break_item->extent (col, X_AXIS);