X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.hh;h=8566f0e3a27fc141da2ca84f5969e38e5f6fadbf;hb=8347f6f06cd4c56d7a2d2ec482647afaaade1267;hp=112c21496f0e02d286b337dfa61de75286170e54;hpb=1e0b328b0eaf62dc57c6f60463864f2e5cb0e659;p=lilypond.git

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 112c21496f..8566f0e3a2 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,99 +3,99 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef TRANSLATOR_HH
 #define TRANSLATOR_HH
 
 #include "global-ctor.hh"
-#include "string.hh"
+#include "std-string.hh"
 #include "lily-proto.hh"
 #include "virtual-methods.hh"
-#include "lily-guile.hh"
-#include "parray.hh"
 #include "input.hh"
 #include "smobs.hh"
+#include "std-vector.hh"
+
+struct Acknowledge_information
+{
+  SCM symbol_;
+  Engraver_void_function_engraver_grob_info function_;
+};
+
+#define TRANSLATOR_DECLARATIONS(NAME)					\
+  public:								\
+  NAME ();								\
+  VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME);				\
+  static SCM static_description_;					\
+  static vector<Acknowledge_information> acknowledge_static_array_;	\
+  virtual void fetch_precomputable_methods (Translator_void_method_ptr methods[]); \
+  virtual SCM static_translator_description () const;			\
+  virtual SCM translator_description () const;				\
+  virtual Engraver_void_function_engraver_grob_info get_acknowledger (SCM sym) \
+  {									\
+    return static_get_acknowledger (sym);				\
+  }									\
+  static Engraver_void_function_engraver_grob_info static_get_acknowledger (SCM sym);
+
+#define DECLARE_ACKNOWLEDGER(x) public : void acknowledge_ ## x (Grob_info); protected:
+
+enum Translator_precompute_index
+  {
+    START_TRANSLATION_TIMESTEP,
+    STOP_TRANSLATION_TIMESTEP,
+    PROCESS_MUSIC,
+    PROCESS_ACKNOWLEDGED,
+    TRANSLATOR_METHOD_PRECOMPUTE_COUNT,
+  };
 
-/** Make some kind of #Element#s from Requests. Elements are made by
-  hierarchically grouped #Translator#s
-  */
-class Translator : public Input {
+/*
+  Translate music into grobs.
+*/
+class Translator
+{
   void init ();
+
+protected:
+  bool must_be_last_;
+
 public:
-  Music_output_def * output_def_l_;
-  String type_str_;
-  
-  virtual const char *name () const;
-  bool is_alias_b (String) const;
-    
-  VIRTUAL_COPY_CONS (Translator);
-  Translator (Translator const &);
-  Translator ();
-  
-  Translator_group * daddy_trans_l_ ;
- 
-
-  void announces ();
-
-  void removal_processing ();
-  /**
-    ask daddy for a feature
-    */
-  Music_output_def *output_def_l () const;
-
-  SCM get_property (const char *) const;
-  SCM get_property (SCM symbol) const;
-  
-  virtual Moment now_mom () const;  
-
-  /*
-    ugh: bubbled up from Translator_group. 
-   */
-  SCM simple_trans_list_;
-  SCM trans_group_list_;
-  SCM definition_;
-  
-  SCM properties_scm_;
-  DECLARE_SMOBS (Translator, dummy);
-public:
+  bool must_be_last () const;
+
+  Context *context () const { return daddy_context_; }
 
-    /**
-    try to fit the request in this engraver
+  Translator (Translator const &);
 
-    @return
-    false: not noted,  not taken.
+  SCM internal_get_property (SCM symbol) const;
 
-    true: request swallowed. Don't try to put the request elsewhere.
+  virtual Output_def *get_output_def () const;
+  virtual Translator_group *get_daddy_translator ()const;
+  virtual Moment now_mom () const;
 
-    */
-  virtual bool try_music (Music *req_l);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void do_announces () ;
-  virtual void initialize () ;
+  virtual bool try_music (Music *req);
+  virtual void initialize ();
   virtual void finalize ();
-};
 
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
+  void process_music ();
+  void process_acknowledged ();
 
-/**
-  A macro to automate administration of translators.
- */
-#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);
+  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;
 
-extern Dictionary<Translator*> *global_translator_dict_p;
-void add_translator (Translator*trans_p);
+  friend class Context_def;
+  friend class Context;
+};
+void add_translator (Translator *trans);
 
-Translator*get_translator_l (String s);
-Translator *unsmob_translator (SCM);
+Translator *get_translator (SCM s);
+DECLARE_UNSMOB (Translator, translator);
 #endif // TRANSLATOR_HH