(process_acknowledged_grobs): new

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 957ca17f0b38dc6c01dcb056ab65efe2d653366f..e85ced8d6d905edc9adcd1396b8f0fae8dd201bb 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "music-output-def.hh"
@@ -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);
     }
 }
@@ -99,15 +99,15 @@ Translator_group::add_fresh_group_translator (Translator*t)
 
 
 bool
-Translator_group::removable_b () const
+Translator_group::is_removable () const
 {
   return trans_group_list_ == SCM_EOL && ! iterator_count_;
 }
 
 Translator_group *
-Translator_group::find_existing_translator (String n, String id)
+Translator_group::find_existing_translator (SCM n, String id)
 {
-  if ((is_alias_b (n) && (id_string_ == id || id.empty_b ())) || n == "Current")
+  if ((is_alias (n) && (id_string_ == id || id.is_empty ())) || n == ly_symbol2scm ("Current"))
     return this;
 
   Translator_group* r = 0;
@@ -122,17 +122,15 @@ Translator_group::find_existing_translator (String n, String id)
 }
 
 
-
-
 Translator_group*
-Translator_group::find_create_translator (String n, String id)
+Translator_group::find_create_translator (SCM n, String id)
 {
   Translator_group * existing = find_existing_translator (n,id);
   if (existing)
     return existing;
 
   Link_array<Translator_def> path
-    = unsmob_translator_def (definition_)->path_to_acceptable_translator (scm_makfrom0str ((char*)n.to_str0 ()), get_output_def ());
+    = unsmob_translator_def (definition_)->path_to_acceptable_translator (n, get_output_def ());
 
   if (path.size ())
     {
@@ -157,7 +155,7 @@ Translator_group::find_create_translator (String n, String id)
     ret = daddy_trans_->find_create_translator (n,id);
   else
     {
-      warning (_f ("can't find or create `%s' called `%s'", n, id));
+      warning (_f ("can't find or create `%s' called `%s'", ly_symbol2string (n).to_str0 (), id));
       ret =0;
     }
   return ret;
@@ -170,6 +168,7 @@ Translator_group::try_music (Music* m)
   
   if (!hebbes_b && daddy_trans_)
     hebbes_b = daddy_trans_->try_music (m);
+  
   return hebbes_b ;
 }
 
@@ -191,7 +190,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.
    */
@@ -215,8 +214,7 @@ Translator_group::remove_translator (Translator*trans)
 bool
 Translator_group::is_bottom_translator_b () const
 {
-  return !gh_string_p (unsmob_translator_def (definition_)->default_child_context_name ());
-
+  return !gh_symbol_p (unsmob_translator_def (definition_)->default_child_context_name ());
 }
 
 Translator_group*
@@ -316,7 +314,7 @@ Translator_group::unset_property (SCM sym)
   entry from a translator property list by name of PROP
 */
 void
-Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM val)
+Translator_group::execute_pushpop_property (SCM prop, SCM eltprop, SCM val)
 {
   if (gh_symbol_p (prop))
     {
@@ -344,8 +342,12 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va
        {
          SCM prev = internal_get_property (prop);
 
+         /*
+           TODO: should have scm_equal_something () for reverting
+           autobeam properties.
+          */
          SCM newprops= SCM_EOL ;
-         while (gh_pair_p (prev) && ly_caar (prev) != eltprop)
+         while (gh_pair_p (prev) && !SCM_EQ_P(ly_caar (prev), eltprop))
            {
              newprops = gh_cons (ly_car (prev), newprops);
              prev = ly_cdr (prev);
@@ -362,8 +364,6 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va
 
 
 
-
-
 /*
   STUBS
 */
@@ -396,7 +396,7 @@ Translator_group::initialize ()
 void
 Translator_group::finalize ()
 {
-  each (&Translator::removal_processing);
+  each (&Translator::finalize);
 }
 
 
@@ -431,12 +431,13 @@ bool
 Translator_group::try_music_on_nongroup_children (Music *m )
 {
   SCM tab = get_property ("acceptHashTable");
-  SCM name = scm_assq ( ly_symbol2scm ("name"), m->get_property_alist (false));
+  SCM name = scm_sloppy_assq (ly_symbol2scm ("name"),
+                             m->get_property_alist (false));
 
   if (!gh_pair_p (name))
     return false;
 
-  name = gh_car (name);
+  name = gh_cdr (name);
   SCM accept_list = scm_hashq_ref (tab, name, SCM_UNDEFINED);
   if (accept_list == SCM_BOOL_F)
     {
@@ -453,3 +454,16 @@ Translator_group::try_music_on_nongroup_children (Music *m )
     }
   return false;
 }
+
+SCM
+Translator_group::properties_as_alist () const
+{
+  return properties_dict()->to_alist();
+}
+
+String
+Translator_group::context_name () const
+{
+  Translator_def * td = unsmob_translator_def (definition_ );
+  return ly_symbol2string (td->type_name_);
+}