(DECLARE_EVENT_SWALLOWER): ENTER_DESCRIPTION -> ADD_TRANSLATOR

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index fa8d1d2b037b7798cfaf82082f19ad40fff65792..90b903eb16ec0b9e1b25a31b357c5428336d0032 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -14,17 +14,18 @@
 #include "string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
-#include "lily-guile.hh"
 #include "input.hh"
 #include "smobs.hh"
 
-#define get_property(x) internal_get_property(ly_symbol2scm(x))
-
+/* copied from lily-guile.hh */
+#ifndef get_property
+#define get_property(x) internal_get_property (ly_symbol2scm (x))
+#endif
 
 #define TRANSLATOR_DECLARATIONS(NAME)                  \
 public:                                                        \
-  NAME();\
-  VIRTUAL_COPY_CONS (Translator);                              \
+  NAME ();                                             \
+  VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME);         \
   static SCM static_description_;                      \
   virtual SCM static_translator_description () const;  \
   virtual SCM translator_description () const;
@@ -35,50 +36,43 @@ public:                                                     \
 class Translator
 {
   void init ();
+
+protected:
+  bool must_be_last_;
+
 public:
-  Music_output_def * output_def_;
+  bool must_be_last () const;
   
-  bool is_alias (SCM) const;
-  Translator (Translator const &);
-
+  Context * context () const { return daddy_context_; }
   
-  Translator_group * daddy_trans_ ;
-  void removal_processing ();
-  Music_output_def *get_output_def () const;
+  Translator (Translator const &);
 
   SCM internal_get_property (SCM symbol) const;
   
+  virtual Output_def *get_output_def () const;
+  virtual Translator_group* get_daddy_translator ()const;
   virtual Moment now_mom () const;  
-
-  /*
-    ugh: bubbled up.
-   */
-  SCM definition_;
-  SCM properties_scm_;
-  SCM trans_group_list_;
-  SCM accepts_list_;
-  virtual SCM get_simple_trans_list ();
-public:
-  DECLARE_SMOBS (Translator, dummy);
-private:
-  /*
-    ugh: bubbled up from Translator_group. 
-   */
-
-protected:                     // should be private.
-  SCM simple_trans_list_;
-  friend class Context_def;
-public:
-  Global_translator * top_translator () const;
-  TRANSLATOR_DECLARATIONS(Translator);
   virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void do_announces () ;
   virtual void initialize () ;
+  virtual void process_music ();
+  virtual void do_announces ();
   virtual void finalize ();
-};
+  
+  Score_context * get_score_context () const;
+  Global_context * get_global_context () const;
 
+  
+  TRANSLATOR_DECLARATIONS(Translator);
+  DECLARE_SMOBS (Translator, dummy);
+protected:                     // should be private.
+  Context * daddy_context_ ;
+  virtual void derived_mark () const;
+  
+  friend class Context_def;
+  friend class Context;
+};
 
 /**
   A macro to automate administration of translators.
@@ -100,30 +94,30 @@ ADD_GLOBAL_CTOR (_ ## T ## _adder);
 
 
 
-#define ENTER_DESCRIPTION(classname,desc,grobs,accepted,acked,read,write)                                              \
+#define ADD_TRANSLATOR(classname,desc,grobs,accepted,acked,read,write)                                         \
 ADD_THIS_TRANSLATOR (classname);\
 SCM                                                                                            \
 classname::static_translator_description () const \
 {                                                                                              \
-  SCM  static_properties= SCM_EOL;                                                             \
-  /*  static_properties= acons (name ,gh_str02scm (Translator::name (self_scm ())),            \
+  SCM  static_properties = SCM_EOL;                                                            \
+  /*  static_properties = acons (name ,gh_str02scm (Translator::name (self_scm ())),           \
                              static_properties_);                                              \
   */                                                                                           \
-  static_properties= scm_acons (ly_symbol2scm ("grobs-created"),                               \
+  static_properties = scm_acons (ly_symbol2scm ("grobs-created"),                              \
                              parse_symbol_list (grobs), static_properties);    \
                                                                                                \
-  static_properties= scm_acons (ly_symbol2scm ("description"),                                 \
+  static_properties = scm_acons (ly_symbol2scm ("description"),                                        \
                              scm_makfrom0str (desc), static_properties);                               \
                                                                                                \
-  static_properties= scm_acons (ly_symbol2scm ("interfaces-acked"),                            \
+  static_properties = scm_acons (ly_symbol2scm ("interfaces-acked"),                           \
                              parse_symbol_list (acked), static_properties);                    \
-  static_properties= scm_acons (ly_symbol2scm ("events-accepted"),                             \
+  static_properties = scm_acons (ly_symbol2scm ("events-accepted"),                            \
                              parse_symbol_list (accepted), static_properties);                 \
                                                                                                \
-  static_properties= scm_acons (ly_symbol2scm ("properties-read"),                             \
+  static_properties = scm_acons (ly_symbol2scm ("properties-read"),                            \
                              parse_symbol_list (read), static_properties);                     \
                                                                                                \
-  static_properties= scm_acons (ly_symbol2scm ("properties-written"),                          \
+  static_properties = scm_acons (ly_symbol2scm ("properties-written"),                         \
                                parse_symbol_list (write), static_properties);                  \
                                                                                                \
   return static_properties;                                                                    \