X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftype-swallow-translator.cc;h=2f0c0bc3ea5440d9715c86aec06caed1a2d46b4a;hb=18037c60a42e96cf61b13006bb391e3699bdc45e;hp=c14581e099d91aa6b07e9f14c5c8692e65929bd0;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index c14581e099..2f0c0bc3ea 100644
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,71 +3,70 @@
 
   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>
 */
 
 #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:  
+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:  
+public:
   TRANSLATOR_DECLARATIONS (Rest_swallow_translator);
 };
 
+Skip_event_swallow_translator::Skip_event_swallow_translator ()
+{
+}
 
-Skip_event_swallow_translator::Skip_event_swallow_translator (){}
-
-ENTER_DESCRIPTION (Skip_event_swallow_translator,
-		  "Swallow \\skip.",
-		  "",
-		  "skip-event",
-		  "",
-		  "",
-		  "");
-
+ADD_TRANSLATOR (Skip_event_swallow_translator,
+		"Swallow \\skip.",
+		"",
+		"skip-event",
+		"",
+		"");
 
 Rest_swallow_translator::Rest_swallow_translator (){}
 
-ENTER_DESCRIPTION (Rest_swallow_translator,
-		  "Swallow rest",
-		  "",
-		  "rest-event",
-		  "",
-		  "",
-	
+ADD_TRANSLATOR (Rest_swallow_translator,
+		"Swallow rest",
+		"",
+		"rest-event",
+		"",
+		"");
 
-	  "");
-
-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:  
+public:
   TRANSLATOR_DECLARATIONS (Note_swallow_translator);
 };
 
-Note_swallow_translator::Note_swallow_translator (){}
+Note_swallow_translator::Note_swallow_translator ()
+{
+}
+
+ADD_TRANSLATOR (Note_swallow_translator,
+		"Swallow notes",
+		"",
+		"note-event",
+		"",
+
+		"");
 
-ENTER_DESCRIPTION (Note_swallow_translator,
-		  "Swallow notes",
-		  "",
-		  "note-event",
-		  "",
-		  "",
-		  "");
-