release: 1.5.19

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index b91088d5a0989babd468bb83472e1868445121de..aac575c38bd7e33085857ee39c567e951e9315a3 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -52,9 +52,9 @@ Translator_group::check_removal ()
   SCM next = SCM_EOL; 
   for (SCM p = trans_group_list_; gh_pair_p (p); p = next)
     {
-      next = gh_cdr (p);
+      next = ly_cdr (p);
 
-      Translator_group *trg =  dynamic_cast<Translator_group*> (unsmob_translator (gh_car (p)));
+      Translator_group *trg =  dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
 
       trg->check_removal ();
       if (trg->removable_b ())
@@ -98,9 +98,9 @@ Translator_group::find_existing_translator_l (String n, String id)
     return this;
 
   Translator_group* r = 0;
-  for (SCM p = trans_group_list_; !r && gh_pair_p (p); p = gh_cdr (p))
+  for (SCM p = trans_group_list_; !r && gh_pair_p (p); p = ly_cdr (p))
     {
-      Translator *  t = unsmob_translator (gh_car (p));
+      Translator *  t = unsmob_translator (ly_car (p));
       
       r = dynamic_cast<Translator_group*> (t)->find_existing_translator_l (n, id);
     }
@@ -130,10 +130,12 @@ Translator_group::find_create_translator_l (String n, String id)
        {
          Translator_group * new_group = path[i]->instantiate (output_def_l_);
 
+         if (i == path.size () -1)
+           new_group->id_str_ = id;      
          current->add_group_translator (new_group);
          current = new_group;
        }
-      current->id_str_ = id;
+
       return current;
     }
 
@@ -153,9 +155,9 @@ Translator_group::try_music_on_nongroup_children (Music *m)
 {
   bool hebbes_b =false;
   
-  for (SCM p = simple_trans_list_; !hebbes_b && gh_pair_p (p); p = gh_cdr (p))
+  for (SCM p = simple_trans_list_; !hebbes_b && gh_pair_p (p); p = ly_cdr (p))
     {
-      hebbes_b = unsmob_translator (gh_car (p))->try_music (m);
+      hebbes_b = unsmob_translator (ly_car (p))->try_music (m);
     }
   return hebbes_b;
 }
@@ -244,8 +246,8 @@ Translator_group::get_default_interpreter ()
 static void
 static_each (SCM list, Method_pointer method)
 {
-  for (SCM p = list; gh_pair_p (p); p = gh_cdr (p))
- (unsmob_translator (gh_car (p))->*method) ();
+  for (SCM p = list; gh_pair_p (p); p = ly_cdr (p))
+ (unsmob_translator (ly_car (p))->*method) ();
   
 }
 
@@ -275,27 +277,21 @@ Translator_group::where_defined (SCM sym) const
   return SCM_EOL when not found.
 */
 SCM
-Translator_group::get_property (SCM sym) const
+Translator_group::internal_get_property (SCM sym) const
 {
   SCM val =SCM_EOL;
   if (properties_dict ()->try_retrieve (sym, &val))
     return val;
 
   if (daddy_trans_l_)
-    return daddy_trans_l_->get_property (sym);
+    return daddy_trans_l_->internal_get_property (sym);
   
   return val;
 }
 
-void
-Translator_group::set_property (String id, SCM val)
-{
-  set_property (ly_symbol2scm (id.ch_C ()), val);
-}
-
 
 void
-Translator_group::set_property (SCM sym, SCM val)
+Translator_group::internal_set_property (SCM sym, SCM val)
 {
   properties_dict ()->set (sym, val);
 }
@@ -321,18 +317,16 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va
     {
       if (val != SCM_UNDEFINED)
        {
-         SCM prev = get_property (prop);
+         SCM prev = internal_get_property (prop);
 
          if (gh_pair_p (prev) || prev == SCM_EOL)
            {
              bool ok = type_check_assignment (val, eltprop, ly_symbol2scm ("backend-type?"));
              
-
-             
              if (ok)
                {
                  prev = gh_cons (gh_cons (eltprop, val), prev);
-                 set_property (prop, prev);
+                 internal_set_property (prop, prev);
                }
            }
          else
@@ -343,19 +337,19 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va
        }
       else
        {
-         SCM prev = get_property (prop);
+         SCM prev = internal_get_property (prop);
 
          SCM newprops= SCM_EOL ;
-         while (gh_pair_p (prev) && gh_caar (prev) != eltprop)
+         while (gh_pair_p (prev) && ly_caar (prev) != eltprop)
            {
-             newprops = gh_cons (gh_car (prev), newprops);
-             prev = gh_cdr (prev);
+             newprops = gh_cons (ly_car (prev), newprops);
+             prev = ly_cdr (prev);
            }
          
          if (gh_pair_p (prev))
            {
-             newprops = scm_reverse_x (newprops, gh_cdr (prev));
-             set_property (prop, newprops);
+             newprops = scm_reverse_x (newprops, ly_cdr (prev));
+             internal_set_property (prop, newprops);
            }
        }
     }
@@ -446,7 +440,7 @@ ly_get_trans_property (SCM context, SCM name)
       warning (_ ("ly-get-trans-property: expecting a Translator_group argument"));
       return SCM_EOL;
     }
-  return tr->get_property (name);
+  return tr->internal_get_property (name);
   
 }
 SCM
@@ -457,7 +451,7 @@ ly_set_trans_property (SCM context, SCM name, SCM val)
   Translator_group* tr=   dynamic_cast<Translator_group*> (t);
   if (tr)
     {
-      tr->set_property (name, val);
+      tr->internal_set_property (name, val);
     }
   return SCM_UNSPECIFIED;
 }