patch::: 1.3.48.jcn1

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

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index f80b2c49de598672e9b21968e9fc269d0c48bde8..d4ac8ff52862595f8bf23dcf1249803345737a34 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -207,7 +207,7 @@ Translator_group::find_create_translator_l (String n, String id)
     ret = daddy_trans_l_->find_create_translator_l (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'", n, id));
       ret =0;
     }
   return ret;
@@ -260,7 +260,6 @@ Translator_group::ancestor_l (int level)
 void
 Translator_group::terminate_translator (Translator*r_l)
 {
-  DEBUG_OUT << "Removing " << classname (r_l) << " at " << now_mom () << '\n';
   r_l->removal_processing();
   Translator * trans_p =remove_translator_p (r_l);
 
@@ -320,7 +319,7 @@ Translator_group::get_default_interpreter()
       Translator*t = output_def_l ()->find_translator_l (accepts_str_arr_[0]);
       if (!t)
        {
-         warning (_f ("Can't find or create: `%s'", accepts_str_arr_[0]));
+         warning (_f ("can't find or create: `%s'", accepts_str_arr_[0]));
          t = this;
        }
       Translator_group * g= dynamic_cast <Translator_group*>(t->clone ());
@@ -389,9 +388,9 @@ Translator_group::do_post_move_processing ()
 }
 
 void
-Translator_group::do_process_requests ()
+Translator_group::do_process_music ()
 {
-  each (&Translator::process_requests);
+  each (&Translator::process_music);
 }
 
 void
@@ -414,7 +413,7 @@ Translator_group::do_add_processing ()
       String s = consists_str_arr_[i];
       Translator * t = output_def_l ()->find_translator_l (s);
       if (!t)
-       warning (_f ("Can't find: `%s'", s));
+       warning (_f ("can't find: `%s'", s));
       else
        add_translator (t->clone ());
     }
@@ -423,27 +422,34 @@ Translator_group::do_add_processing ()
        String s = consists_end_str_arr_[i];
        Translator * t = output_def_l ()->find_translator_l (s);
        if (!t)
-        warning (_f ("Can't find: `%s'", s));
+        warning (_f ("can't find: `%s'", s));
        else
         add_translator (t->clone ());
     }
 }
 
+Translator_group*
+Translator_group::where_defined (SCM sym) const
+{
+  if (properties_dict_.elem_b (sym))
+    {
+      return (Translator_group*)this;
+    }
+
+  return (daddy_trans_l_) ? daddy_trans_l_->where_defined (sym) : 0;
+}
+
 SCM
-Translator_group::get_property (SCM sym, Translator_group **where_l) const
+Translator_group::get_property (SCM sym) const
 {
   if (properties_dict_.elem_b (sym))
     {
-      if (where_l)
-       *where_l = (Translator_group*) this; // ugh
       return properties_dict_.get (sym);
     }
 
   if (daddy_trans_l_)
-    return daddy_trans_l_->get_property (sym, where_l);
+    return daddy_trans_l_->get_property (sym);
   
-  if (where_l)
-    *where_l = 0;
 
   return SCM_UNDEFINED;
 }
@@ -453,3 +459,4 @@ Translator_group::set_property (String id, SCM val)
 {
   properties_dict_.set (ly_symbol2scm (id.ch_C()), val);
 }
+