* lily/include/context.hh (class Context): make members protected.

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 7b17db61b97d19e9f9b195749ece6af8a0e933ac..69b09852ad931bb47dfb2bb8d3c21177e6b405e5 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;
@@ -35,55 +35,38 @@ public:                                                     \
 class Translator
 {
   void init ();
+  
 public:
-  Music_output_def * output_def_;
+  Context * get_parent_context () const { return daddy_context_; }
   
-  bool is_alias (SCM) const;
   Translator (Translator const &);
 
-  
-  Translator_group * daddy_trans_ ;
   void removal_processing ();
-  Music_output_def *get_output_def () const;
-
   SCM internal_get_property (SCM symbol) const;
   
+  virtual Music_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;
-  // ugir.
-  //   friend SCM Translator_group::get_simple_trans_list ();
-
-
-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_ ;
+  SCM simple_trans_list_;
+  friend class Context_def;
+  friend class Context;
 };
 
-
 /**
   A macro to automate administration of translators.
  */