release: 1.5.9

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 41111b075e6c48a7fc5012c56c406986779b347f..03adb249f91a22bb4065e746183fab71e21248e4 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -10,14 +10,15 @@
 #include "translator.hh"
 #include "debug.hh"
 #include "translator-group.hh"
+#include "translator-def.hh"
 
 #include "moment.hh"
 #include "ly-smobs.icc"
 
 char const*
-Translator::name() const
+Translator::name () const
 {
-  return classname(this);
+  return classname (this);
 }
 
 Translator::~Translator ()
@@ -55,7 +56,13 @@ Translator::Translator (Translator const &s)
 bool
 Translator::is_alias_b (String s) const
 {
-  return s == type_str_;
+  bool b  = s == type_str_;
+
+  for (SCM a = unsmob_translator_def (definition_)->type_aliases_;
+       !b && gh_pair_p (a); a = gh_cdr (a))
+    b = b || s == ly_scm2string (gh_car (a));
+
+  return b;
 }
 
 bool
@@ -75,11 +82,6 @@ Translator::now_mom () const
 
 
 
-void
-Translator::post_move_processing ()
-{
-  start_translation_timestep ();
-}
 
 void
 Translator::removal_processing ()
@@ -95,14 +97,6 @@ Translator::announces ()
 }
 
 
-void
-Translator::pre_move_processing ()
-{
-  stop_translation_timestep ();
-}
-
-
-
 Music_output_def *
 Translator::output_def_l () const
 {
@@ -155,7 +149,7 @@ Translator::finalize ()
 SCM
 Translator::mark_smob (SCM sm)
 {
-  Translator * me = (Translator*) SCM_CELL_WORD_1(sm);
+  Translator * me = (Translator*) SCM_CELL_WORD_1 (sm);
   scm_gc_mark (me->simple_trans_list_);
   scm_gc_mark (me->trans_group_list_);
   scm_gc_mark (me->definition_);  
@@ -177,14 +171,10 @@ Translator::print_smob (SCM s, SCM port, scm_print_state *)
     don't try to print properties, that is too much hassle.
    */
   scm_puts (" >", port);
-
-  
   
   return 1;
 }
 
-
-
-IMPLEMENT_UNSMOB(Translator, translator);
-IMPLEMENT_SMOBS(Translator);
-IMPLEMENT_DEFAULT_EQUAL_P(Translator);
+IMPLEMENT_UNSMOB (Translator, translator);
+IMPLEMENT_SMOBS (Translator);
+IMPLEMENT_DEFAULT_EQUAL_P (Translator);