* Documentation/user/tutorial.itely: Revised (continued).

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index fe4d51aaa5e9b5cbcda1284b28be3eee2e332772..57e3257a2ff94ea8268b04f38413df1f043906c8 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -23,8 +23,8 @@
 
 #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;
@@ -39,46 +39,35 @@ public:
   Music_output_def * output_def_;
   
   Translator (Translator const &);
+  Context * daddy_context_ ;
 
-  
-  Translator_group * daddy_trans_ ;
   void removal_processing ();
   virtual Music_output_def *get_output_def () const;
-
   SCM internal_get_property (SCM symbol) 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;
+  Score_context * get_score_context () const;
+  Global_context * get_global_context () 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 ();
 };
 
-
 /**
   A macro to automate administration of translators.
  */