release: 1.1.6

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 5655da8a1592175968086058a6f35a4823c57894..35ef5a7abe321d92a688f50169b65c0e16d69e99 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -41,7 +41,7 @@ Translator::is_alias_b (String s) const
 }
 
 bool
-Translator::do_try_request (Request *)
+Translator::do_try_music (Music *)
 {
   return false;
 }
@@ -73,12 +73,12 @@ void
 Translator::print () const
 {
 #ifndef NPRINT
-  DOUT << name () << " {";
-  if (name () != type_str_)
+  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";
+      DOUT << i.key () << "=" << i.val () << '\n';
     }
   do_print ();
   DOUT << "}\n";
@@ -90,7 +90,7 @@ Translator::do_print () const
 {
 }
 
-IMPLEMENT_IS_TYPE_B(Translator);
+
 
 
 void
@@ -127,12 +127,12 @@ Translator::removal_processing ()
 
 
 bool
-Translator::try_request (Request * r)
+Translator::try_music (Music * r)
 {
   if (status < MOVE_INITED)
     post_move_processing ();
 
-  return do_try_request (r);
+  return do_try_music (r);
 }
 
 void
@@ -157,7 +157,7 @@ Translator::pre_move_processing ()
 Scalar
 Translator::get_property (String id)
 {
-  if (properties_dict_.elt_b (id))
+  if (properties_dict_.elem_b (id))
     {
       return properties_dict_[id];
     }