X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftranslator.hh;h=398a32ce063bc76593d0b49518dc12b3d5b257d3;hb=b5a990d1282e2f3a16d9ab9e3622dd784f7bdeb4;hp=4b40032ba82bbbe9141dcee0274757ef0cc888be;hpb=769a7f1d6e9c51825936ae78faf6907f2c473f76;p=lilypond.git

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 4b40032ba8..398a32ce06 100644
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,33 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 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 "input.hh"
 #include "smobs.hh"
+#include "std-vector.hh"
 
-/* copied from lily-guile.hh */
-#ifndef get_property
-#define get_property(x) internal_get_property (ly_symbol2scm (x))
-#endif
+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_;			\
-  virtual SCM static_translator_description () const;	\
-  virtual SCM translator_description () const;
+#define TRANSLATOR_DECLARATIONS(NAME)					\
+  public:								\
+  NAME ();								\
+  VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME);				\
+  static SCM static_description_;					\
+  static Drul_array<vector<Acknowledge_information> > acknowledge_static_array_drul_; \
+  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);				\
+  }									\
+  virtual Engraver_void_function_engraver_grob_info get_end_acknowledger (SCM sym) \
+  {									\
+    return static_get_end_acknowledger (sym);				\
+  } \
+  static Engraver_void_function_engraver_grob_info static_get_acknowledger (SCM sym); \
+  static Engraver_void_function_engraver_grob_info static_get_end_acknowledger(SCM); \
+  /* end #define */
+
+
+#define DECLARE_ACKNOWLEDGER(x) public : void acknowledge_ ## x (Grob_info); protected:
+#define DECLARE_END_ACKNOWLEDGER(x) public : void acknowledge_end_ ## x (Grob_info); protected:
+
+enum Translator_precompute_index
+  {
+    START_TRANSLATION_TIMESTEP,
+    STOP_TRANSLATION_TIMESTEP,
+    PROCESS_MUSIC,
+    PROCESS_ACKNOWLEDGED,
+    TRANSLATOR_METHOD_PRECOMPUTE_COUNT,
+  };
 
 /*
   Translate music into grobs.
@@ -43,90 +69,41 @@ protected:
 
 public:
   bool must_be_last () const;
-  
-  Context * context () const { return daddy_context_; }
-  
+
+  Context *context () const { return daddy_context_; }
+
   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;  
+  virtual Translator_group *get_daddy_translator ()const;
+  virtual Moment now_mom () const;
+
   virtual bool try_music (Music *req);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void initialize () ;
-  virtual void process_music ();
-  virtual void do_announces ();
+  virtual void initialize ();
   virtual void finalize ();
-  
-  Score_context * get_score_context () const;
-  Global_context * get_global_context () const;
 
-  
-  TRANSLATOR_DECLARATIONS(Translator);
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
+  void process_music ();
+  void process_acknowledged ();
+
+  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_;
+  Context *daddy_context_;
+  virtual void derived_mark () const;
+
   friend class Context_def;
   friend class Context;
 };
+void add_translator (Translator *trans);
 
-/**
-  A macro to automate administration of translators.
- */
-#define ADD_THIS_TRANSLATOR(T)				\
-SCM T::static_description_ = SCM_EOL;\
-static void  _ ## T ## _adder () {\
-      T *t = new T;\
-      T::static_description_ = t->static_translator_description ();\
-      scm_permanent_object (T::static_description_);\
-      add_translator (t);\
-}\
-SCM T::translator_description() const\
-{ \
-  return static_description_;\
-}\
-ADD_GLOBAL_CTOR (_ ## T ## _adder);
-
-
-
-
-#define ENTER_DESCRIPTION(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 ())),		\
-			      static_properties_);						\
-  */												\
-  static_properties= scm_acons (ly_symbol2scm ("grobs-created"),				\
-			      parse_symbol_list (grobs), static_properties);	\
-			      									\
-  static_properties= scm_acons (ly_symbol2scm ("description"),					\
-			      scm_makfrom0str (desc), static_properties);				\
-												\
-  static_properties= scm_acons (ly_symbol2scm ("interfaces-acked"),				\
-			      parse_symbol_list (acked), static_properties);			\
-  static_properties= scm_acons (ly_symbol2scm ("events-accepted"),				\
-			      parse_symbol_list (accepted), static_properties);			\
-  												\
-  static_properties= scm_acons (ly_symbol2scm ("properties-read"),				\
-			      parse_symbol_list (read), static_properties);			\
-												\
-  static_properties= scm_acons (ly_symbol2scm ("properties-written"),				\
-				parse_symbol_list (write), static_properties);			\
-												\
-  return static_properties;									\
-}
-
-
-
-void add_translator (Translator*trans);
-
-Translator*get_translator (SCM s);
-DECLARE_UNSMOB(Translator,translator);
+Translator *get_translator (SCM s);
+DECLARE_UNSMOB (Translator, translator);
 #endif // TRANSLATOR_HH