Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 754bfba73a9acdf6afc39652bea8459c06457e01..398a32ce063bc76593d0b49518dc12b3d5b257d3 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -3,18 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 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 "input.hh"
 #include "smobs.hh"
+#include "std-vector.hh"
 
 struct Acknowledge_information
 {
@@ -22,29 +23,39 @@ struct Acknowledge_information
   Engraver_void_function_engraver_grob_info function_;
 };
 
-#define TRANSLATOR_DECLARATIONS(NAME)                  \
-  public:                                              \
-  NAME ();                                             \
-  VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME);         \
-  static SCM static_description_;                      \
-  static Array<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,
-};
+#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.
@@ -52,7 +63,7 @@ enum Translator_precompute_index {
 class Translator
 {
   void init ();
-  
+
 protected:
   bool must_be_last_;
 
@@ -68,7 +79,7 @@ public:
   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);
   virtual void initialize ();
   virtual void finalize ();
@@ -77,7 +88,7 @@ public:
   void start_translation_timestep ();
   void process_music ();
   void process_acknowledged ();
-  
+
   Score_context *get_score_context () const;
   Global_context *get_global_context () const;