2003 -> 2004

[lilypond.git] / lily / include / type-swallow-translator.hh

diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh
index b352473e4e35185874a3fc339fc1ae9476a7565a..ec53a7019f1cebd529a4a979bfd2dcd76e36f94a 100644 (file)
--- a/lily/include/type-swallow-translator.hh
+++ b/lily/include/type-swallow-translator.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,27 +12,32 @@
 
 #include "translator.hh"
 
-/** eat a certain type of request.
+/** eat a certain type of event
  (Duh, it's good for your skin)
  */
 class Type_swallow_translator : public virtual Translator
 {
 protected:
-  String swallow_str_;
+  String swallow_string_;
   bool try_music (Music*);
 public:  
   VIRTUAL_COPY_CONS (Translator);
 };
 
-#define DECLARE_REQUEST_SWALLOWER(TYPE)  \
-struct TYPE ## _swallow_translator : public Type_swallow_translator {\
-  TYPE ## _swallow_translator () { \
-      swallow_str_ =  #TYPE;\
-  }\
-  \
-  VIRTUAL_COPY_CONS (Translator);\
-};\
-ADD_THIS_TRANSLATOR (TYPE ## _swallow_translator);\
+#define DECLARE_EVENT_SWALLOWER(TYPE)                                  \
+struct TYPE ## _swallow_translator : public Type_swallow_translator {  \
+  TRANSLATOR_DECLARATIONS (TYPE ## _swallow_translator);  \
+};                                                                     \
+  TYPE ## _swallow_translator :: TYPE ## _swallow_translator() {\
+      swallow_string_ =  #TYPE;                                                \
+  }                                                                    \
+ENTER_DESCRIPTION(TYPE ## _swallow_translator,                         \
+                 "Swallow events of " #TYPE " type.",          \
+                 "",                                                   \
+       "general-music",\
+                 "",                                                   \
+                 "",                                                   \
+                 "");
 
 #endif // TYPESWALLOW_GRAV_HH