X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Ftranslator-group.cc;h=ca8c7b326a0a0c27a9bf2d582675dd5e1024310c;hb=2536405e9584f63d559653183971c0fec57ba037;hp=113a4595a85b7c01fdf5e00aaf2719c6ba750f1c;hpb=a033b0430d27807f0f7617381d2f021a495b1a58;p=lilypond.git

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 113a4595a8..ca8c7b326a 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -27,8 +27,8 @@ Translator_group::get_daddy_translator () const
 void
 translator_each (SCM list, Translator_method method)
 {
-  for (SCM p = list; scm_is_pair (p); p = scm_cdr (p))
-    (unsmob_translator (scm_car (p))->*method) ();
+  for (SCM p = list; scm_is_pair (p); p = ly_cdr (p))
+    (unsmob_translator (ly_car (p))->*method) ();
 }
 
 
@@ -45,9 +45,9 @@ translator_accepts_any_of (Translator*tr, SCM ifaces)
 {
   SCM ack_ifs = scm_assoc (ly_symbol2scm ("events-accepted"),
 			   tr->translator_description ());
-  ack_ifs = scm_cdr (ack_ifs);
-  for (SCM s = ifaces; scm_is_pair (s); s = scm_cdr (s))
-    if (scm_c_memq (scm_car (s), ack_ifs) != SCM_BOOL_F)
+  ack_ifs = ly_cdr (ack_ifs);
+  for (SCM s = ifaces; scm_is_pair (s); s = ly_cdr (s))
+    if (scm_c_memq (ly_car (s), ack_ifs) != SCM_BOOL_F)
       return true;
   return false;
 }
@@ -56,9 +56,9 @@ SCM
 find_accept_translators (SCM gravlist, SCM ifaces)
 {
   SCM l = SCM_EOL;
-  for (SCM s = gravlist; scm_is_pair (s);  s = scm_cdr (s))
+  for (SCM s = gravlist; scm_is_pair (s);  s = ly_cdr (s))
     {
-      Translator* tr = unsmob_translator (scm_car (s));
+      Translator* tr = unsmob_translator (ly_car (s));
       if (translator_accepts_any_of (tr, ifaces))
 	l = scm_cons (tr->self_scm (), l); 
     }
@@ -77,7 +77,7 @@ Translator_group::try_music (Music* m)
   if (!scm_is_pair (name))
     return false;
 
-  name = scm_cdr (name);
+  name = ly_cdr (name);
   SCM accept_list = scm_hashq_ref (tab, name, SCM_UNDEFINED);
   if (accept_list == SCM_BOOL_F)
     {
@@ -86,9 +86,9 @@ Translator_group::try_music (Music* m)
       scm_hashq_set_x (tab, name, accept_list);
     }
 
-  for (SCM p = accept_list; scm_is_pair (p); p = scm_cdr (p))
+  for (SCM p = accept_list; scm_is_pair (p); p = ly_cdr (p))
     {
-      Translator * t = unsmob_translator (scm_car (p));
+      Translator * t = unsmob_translator (ly_car (p));
       if (t && t->try_music (m))
 	return true;
     }
@@ -121,9 +121,9 @@ recurse_over_translators (Context * c, Translator_method ptr, Direction dir)
     }
 
   for (SCM s = c->children_contexts () ; scm_is_pair (s);
-       s =scm_cdr (s))
+       s =ly_cdr (s))
     {
-      recurse_over_translators (unsmob_context (scm_car (s)), ptr, dir);
+      recurse_over_translators (unsmob_context (ly_car (s)), ptr, dir);
     }
 
   if (dir == UP)