release commit

[lilypond.git] / lily / translator-property.cc

diff --git a/lily/translator-property.cc b/lily/translator-property.cc
index 2c433a008619eda8e823908dfb2b76dd61b23422..b3918d9ae1081ccf631c739b67f15e16e971bde8 100644 (file)
--- a/lily/translator-property.cc
+++ b/lily/translator-property.cc
@@ -33,7 +33,7 @@ void
 execute_pushpop_property (Context * trg,
                          SCM prop, SCM eltprop, SCM val)
 {
-  if (ly_c_symbol_p (prop) && ly_c_symbol_p (eltprop))
+  if (scm_is_symbol (prop) && scm_is_symbol (eltprop))
     {
       if (val != SCM_UNDEFINED)
        {
@@ -55,7 +55,7 @@ execute_pushpop_property (Context * trg,
          else
            prev = trg->internal_get_property (prop);
          
-         if (!ly_c_pair_p (prev))
+         if (!scm_is_pair (prev))
            {
              programming_error ("Grob definition should be cons.");
              return ;
@@ -63,7 +63,7 @@ execute_pushpop_property (Context * trg,
 
          SCM prev_alist = ly_car (prev);
          
-         if (ly_c_pair_p (prev_alist) || prev_alist == SCM_EOL)
+         if (scm_is_pair (prev_alist) || prev_alist == SCM_EOL)
            {
              bool ok = type_check_assignment (eltprop, val, ly_symbol2scm ("backend-type?"));
 
@@ -125,7 +125,7 @@ void
 apply_property_operations (Context *tg, SCM pre_init_ops)
 {
   SCM correct_order = scm_reverse (pre_init_ops);
-  for (SCM s = correct_order; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = correct_order; scm_is_pair (s); s = ly_cdr (s))
     {
       SCM entry = ly_car (s);
       SCM type = ly_car (entry);
@@ -134,7 +134,7 @@ apply_property_operations (Context *tg, SCM pre_init_ops)
       if (type == ly_symbol2scm ("push") || type == ly_symbol2scm ("poppush"))
        {
          SCM val = ly_cddr (entry);
-         val = ly_c_pair_p (val) ? ly_car (val) : SCM_UNDEFINED;
+         val = scm_is_pair (val) ? ly_car (val) : SCM_UNDEFINED;
 
          execute_pushpop_property (tg, ly_car (entry), ly_cadr (entry), val);
        }
@@ -152,7 +152,7 @@ apply_property_operations (Context *tg, SCM pre_init_ops)
 SCM
 updated_grob_properties (Context * tg, SCM sym)
 {
-  assert (ly_c_symbol_p (sym));
+  assert (scm_is_symbol (sym));
   
   tg = tg->where_defined (sym);
   if (!tg)
@@ -165,7 +165,7 @@ updated_grob_properties (Context * tg, SCM sym)
   
   SCM props  = tg->internal_get_property (sym);
 
-  if (!ly_c_pair_p (props))
+  if (!scm_is_pair (props))
     {
       programming_error ("grob props not a pair?");
       return SCM_EOL;
@@ -185,7 +185,7 @@ updated_grob_properties (Context * tg, SCM sym)
        {
          *tail = scm_cons (ly_car (p), daddy_props);
          tail = SCM_CDRLOC (*tail);
-         p = SCM_CDR (p);
+         p = ly_cdr (p);
        }
       
       scm_set_car_x (props, copy);