patch::: 1.1.27.jcn4: jcn4

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 35ef5a7abe321d92a688f50169b65c0e16d69e99..2e20760894acadee45d66b2d6966d50e5c882bc3 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -10,7 +10,7 @@
 #include "translator.hh"
 #include "debug.hh"
 #include "translator-group.hh"
-#include "dictionary-iter.hh"
+
 #include "rational.hh"
 
 Translator::~Translator ()
@@ -30,7 +30,6 @@ Translator::Translator (Translator const &s)
   status = ORPHAN;
   daddy_trans_l_ =0;
   output_def_l_ = s.output_def_l_;
-  properties_dict_ = s.properties_dict_;
   type_str_ = s.type_str_;
 }
 
@@ -48,9 +47,9 @@ Translator::do_try_music (Music *)
                            
 
 Moment
-Translator::now_moment () const
+Translator::now_mom () const
 {
-  return daddy_trans_l_->now_moment ();
+  return daddy_trans_l_->now_mom ();
 }
 
 
@@ -76,10 +75,6 @@ Translator::print () const
   DOUT << classname (this) << " {";
   if (classname (this) != type_str_)
     DOUT << "type = " << type_str_;
-  for (Dictionary_iter<Scalar> i (properties_dict_); i.ok (); i++)
-    {
-      DOUT << i.key () << "=" << i.val () << '\n';
-    }
   do_print ();
   DOUT << "}\n";
 #endif
@@ -154,25 +149,6 @@ Translator::pre_move_processing ()
   status = CREATION_INITED;
 }
 
-Scalar
-Translator::get_property (String id)
-{
-  if (properties_dict_.elem_b (id))
-    {
-      return properties_dict_[id];
-    }
-  
-  if (daddy_trans_l_)
-    return daddy_trans_l_->get_property (id);
-
-  return "";
-}
-
-void
-Translator::set_property (String id, Scalar val)
-{
-  properties_dict_[id] = val;
-}
 
 
 Music_output_def *
@@ -180,3 +156,10 @@ Translator::output_def_l () const
 {
   return output_def_l_;
 }
+
+Scalar
+Translator::get_property (String id, Translator_group **where_l) const
+{
+  return daddy_trans_l_->get_property (id, where_l);
+}
+