Run `make grand-replace'.

[lilypond.git] / lily / type-swallow-translator.cc

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index b5832f93cecc04e0c19179d3c2ddf30a33ab5a31..9aeae1ee6d6c6b2186f4d7b6cabb09953132c2a6 100644 (file)
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,71 +3,90 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
-#include "event.hh"
+#include "music.hh"
 
-class Skip_event_swallow_translator : public virtual Translator
+#include "translator.icc"
+
+class Skip_event_swallow_translator : public Translator
 {
 protected:
-  virtual bool try_music (Music*) { return true; }
+  virtual bool try_music (Music *) { return true; }
 
-public:  
-  TRANSLATOR_DECLARATIONS(Skip_event_swallow_translator);
+public:
+  TRANSLATOR_DECLARATIONS (Skip_event_swallow_translator);
 };
 
-
-class Rest_swallow_translator : public virtual Translator
+class Rest_swallow_translator : public Translator
 {
 protected:
-  virtual bool try_music (Music*) { return true; }
+  virtual bool try_music (Music *) { return true; }
 
-public:  
-  TRANSLATOR_DECLARATIONS(Rest_swallow_translator);
+public:
+  TRANSLATOR_DECLARATIONS (Rest_swallow_translator);
 };
 
+Skip_event_swallow_translator::Skip_event_swallow_translator ()
+{
+}
+
+ADD_TRANSLATOR (Skip_event_swallow_translator,
+               /* doc */
+               "Swallow @code{\\skip}.",
+
+               /* create */
+               "",
+
+               /* read */
+               "",
 
-Skip_event_swallow_translator::Skip_event_swallow_translator(){}
+               /* write */
+               ""
+               );
 
-ENTER_DESCRIPTION(Skip_event_swallow_translator,
-                 "Swallow \\skip.",
-                 "",
-                 "skip-event",
-                 "",
-                 "",
-                 "");
+Rest_swallow_translator::Rest_swallow_translator (){}
 
+ADD_TRANSLATOR (Rest_swallow_translator,
+               /* doc */
+               "Swallow rest.",
 
-Rest_swallow_translator::Rest_swallow_translator(){}
+               /* create */
+               "",
 
-ENTER_DESCRIPTION(Rest_swallow_translator,
-                 "Swallow rest",
-                 "",
-                 "rest-event",
-                 "",
-                 "",
-       
+               /* read */
+               "",
 
-         "");
+               /* write */
+               ""
+               );
 
-class Note_swallow_translator : public virtual Translator
+class Note_swallow_translator : public Translator
 {
 protected:
-  virtual bool try_music (Music*) { return true; }
+  virtual bool try_music (Music *) { return true; }
 
-public:  
-  TRANSLATOR_DECLARATIONS(Note_swallow_translator);
+public:
+  TRANSLATOR_DECLARATIONS (Note_swallow_translator);
 };
 
-Note_swallow_translator::Note_swallow_translator(){}
+Note_swallow_translator::Note_swallow_translator ()
+{
+}
+
+ADD_TRANSLATOR (Note_swallow_translator,
+               /* doc */
+               "Swallow notes.",
+
+               /* create */
+               "",
+
+               /* read */
+               "",
+
+               /* write */
+               ""
+               );
 
-ENTER_DESCRIPTION(Note_swallow_translator,
-                 "Swallow notes",
-                 "",
-                 "note-event",
-                 "",
-                 "",
-                 "");
-