* lily/translator-def.cc (get_translator_names): new function

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 655d15f4f54c8118b5f5f598a2b0f19d7a4d0b06..1ce7b11e318fec73ea47606b1daff340852c320d 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -35,7 +35,7 @@ Translator_group::properties_dict () const
 Translator_group::~Translator_group ()
 {
   
-  //assert (removable_b ());
+  //assert (is_removable ());
 }
 
 
@@ -59,7 +59,7 @@ Translator_group::check_removal ()
       Translator_group *trg =  dynamic_cast<Translator_group*> (unsmob_translator (ly_car (p)));
 
       trg->check_removal ();
-      if (trg->removable_b ())
+      if (trg->is_removable ())
        terminate_translator (trg);
     }
 }
@@ -86,20 +86,20 @@ Translator_group::add_used_group_translator (Translator *t)
 
 
 void
-Translator_group::add_fresh_group_translator (Translator*t)
+Translator_group::add_fresh_group_translator (Translator*t, SCM pre_init_ops)
 {
   Translator_group*tg = dynamic_cast<Translator_group*> (t);
   assert (tg);
 
   trans_group_list_ = add_translator (trans_group_list_,t); 
-  unsmob_translator_def (tg->definition_)->apply_property_operations (tg);
+  unsmob_translator_def (tg->definition_)->apply_default_property_operations (tg);
+  apply_property_operations (tg, pre_init_ops);
   t->initialize ();
-  
 }
 
 
 bool
-Translator_group::removable_b () const
+Translator_group::is_removable () const
 {
   return trans_group_list_ == SCM_EOL && ! iterator_count_;
 }
@@ -107,7 +107,7 @@ Translator_group::removable_b () const
 Translator_group *
 Translator_group::find_existing_translator (SCM n, String id)
 {
-  if ((is_alias_b (n) && (id_string_ == id || id.empty_b ())) || n == ly_symbol2scm ("Current"))
+  if ((is_alias (n) && (id_string_ == id || id.is_empty ())) || n == ly_symbol2scm ("Current"))
     return this;
 
   Translator_group* r = 0;
@@ -123,7 +123,7 @@ Translator_group::find_existing_translator (SCM n, String id)
 
 
 Translator_group*
-Translator_group::find_create_translator (SCM n, String id)
+Translator_group::find_create_translator (SCM n, String id, SCM operations)
 {
   Translator_group * existing = find_existing_translator (n,id);
   if (existing)
@@ -141,9 +141,14 @@ Translator_group::find_create_translator (SCM n, String id)
        {
          Translator_group * new_group = path[i]->instantiate (output_def_);
 
+         SCM ops = SCM_EOL; 
          if (i == path.size () -1)
-           new_group->id_string_ = id;   
-         current->add_fresh_group_translator (new_group);
+           {
+             new_group->id_string_ = id;
+             ops = operations;
+           }
+
+         current->add_fresh_group_translator (new_group, ops);
          current = new_group;
        }
 
@@ -152,7 +157,7 @@ Translator_group::find_create_translator (SCM n, String id)
 
   Translator_group *ret = 0;
   if (daddy_trans_)
-    ret = daddy_trans_->find_create_translator (n,id);
+    ret = daddy_trans_->find_create_translator (n, id, operations);
   else
     {
       warning (_f ("can't find or create `%s' called `%s'", ly_symbol2string (n).to_str0 (), id));
@@ -168,6 +173,7 @@ Translator_group::try_music (Music* m)
   
   if (!hebbes_b && daddy_trans_)
     hebbes_b = daddy_trans_->try_music (m);
+  
   return hebbes_b ;
 }
 
@@ -189,7 +195,7 @@ Translator_group::get_ancestor (int level)
 void
 Translator_group::terminate_translator (Translator*r)
 {
-  r->removal_processing ();
+  r->finalize ();
   /*
     Return value ignored. GC does the rest.
    */
@@ -227,11 +233,11 @@ Translator_group::get_default_interpreter ()
       Translator_def *t = unsmob_translator_def (st);
       if (!t)
        {
-         warning (_f ("can't find or create: `%s'", ly_scm2string (nm).to_str0 ()));
+         warning (_f ("can't find or create: `%s'", ly_symbol2string (nm).to_str0 ()));
          t = unsmob_translator_def (this->definition_);
        }
       Translator_group *tg = t->instantiate (output_def_);
-      add_fresh_group_translator (tg);
+      add_fresh_group_translator (tg, SCM_EOL);
 
       if (!tg->is_bottom_translator_b ())
        return tg->get_default_interpreter ();
@@ -263,7 +269,7 @@ Translator_group::each (Method_pointer method)
 Translator_group*
 Translator_group::where_defined (SCM sym) const
 {
-  if (properties_dict ()->elem_b (sym))
+  if (properties_dict ()->contains (sym))
     {
       return (Translator_group*)this;
     }
@@ -395,7 +401,7 @@ Translator_group::initialize ()
 void
 Translator_group::finalize ()
 {
-  each (&Translator::removal_processing);
+  each (&Translator::finalize);
 }
 
 
@@ -464,5 +470,29 @@ String
 Translator_group::context_name () const
 {
   Translator_def * td = unsmob_translator_def (definition_ );
-  return ly_symbol2string (td->type_name_);
+  return ly_symbol2string (td->get_context_name ());
+}
+
+void
+apply_property_operations (Translator_group*tg, SCM pre_init_ops)
+{
+  SCM correct_order = scm_reverse (pre_init_ops);
+  for (SCM s = correct_order; gh_pair_p (s); s = ly_cdr (s))
+    {
+      SCM entry = ly_car (s);
+      SCM type = ly_car (entry);
+      entry = ly_cdr (entry); 
+      
+      if (type == ly_symbol2scm ("push") || type == ly_symbol2scm ("poppush"))
+       {
+         SCM val = ly_cddr (entry);
+         val = gh_pair_p (val) ? ly_car (val) : SCM_UNDEFINED;
+
+         tg->execute_pushpop_property (ly_car (entry), ly_cadr (entry), val);
+       }
+      else if (type == ly_symbol2scm ("assign"))
+       {
+         tg->internal_set_property (ly_car (entry), ly_cadr (entry));
+       }
+    }
 }