release: 1.1.43

[lilypond.git] / lily / include / translator.hh

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index f089df51b417f464f570999971bb6e25d7dcca74..5c3cfec42b649ccb6a1f052ef006d5811049ced9 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef TRANSLATOR_HH
 #define TRANSLATOR_HH
-
+#include "global-ctor.hh"
 #include "string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
@@ -25,11 +25,10 @@
 class Translator : public Input {
 public:
   Music_output_def * output_def_l_;
-  String  type_str_;
-
-  bool is_alias_b (String) const;
+  String type_str_;
   
-
+  virtual const char *name() const;
+  bool is_alias_b (String) const;
     
   VIRTUAL_COPY_CONS(Translator);
   Translator (Translator const &);
@@ -61,7 +60,7 @@ public:
     */
   Music_output_def *output_def_l () const;
   Scalar get_property (String, Translator_group **) const;
-  virtual Moment now_moment () const;  
+  virtual Moment now_mom () const;  
 
 protected:
    enum { 
@@ -90,32 +89,21 @@ protected:
 };
 
 
-template<class T>
-class Translator_adder
-{
-public:
-  static Translator *ctor ()
-    {
-      T *t = new T;
-      t->type_str_ = classname (t);
-      return t;
-    }
-  Translator_adder () {        
-    add_constructor (ctor);
-  }                            
-};
-
 /**
   A macro to automate administration of translators.
  */
-#define ADD_THIS_TRANSLATOR(c)                         \
-  Translator_adder<c> _ ## c ## init;
+#define ADD_THIS_TRANSLATOR(T)                         \
+static void  _ ## T ## _adder () {\
+      T *t = new T;\
+      t->type_str_ = classname (t);\
+      add_translator (t);\
+}\
+ADD_GLOBAL_CTOR(_ ## T ## _adder);
+
 
-typedef Translator *(*Translator_ctor) ();
 
 extern Dictionary<Translator*> *global_translator_dict_p;
 void add_translator (Translator*trans_p);
-void add_constructor (Translator_ctor ctor);
 
 Translator*get_translator_l (String s);