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 50839a8477013befa0e42b3f20d534f2c9ad50c3..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@xs4all.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
 {
@@ -27,7 +28,7 @@ struct Acknowledge_information
   NAME ();                                                             \
   VIRTUAL_COPY_CONSTRUCTOR (Translator, NAME);                         \
   static SCM static_description_;                                      \
-  static Array<Acknowledge_information> acknowledge_static_array_;     \
+  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;                         \
@@ -35,9 +36,17 @@ struct Acknowledge_information
   {                                                                    \
     return static_get_acknowledger (sym);                              \
   }                                                                    \
-  static Engraver_void_function_engraver_grob_info static_get_acknowledger (SCM 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
   {