X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftype-swallow-translator.cc;h=87510de0d4ec67788a8218242311a5784692920c;hb=2b5cabd0f53c8fc3e553fee7b3aa5c3352e1106a;hp=42581746228fcdd28460f6b49527eebd7c7cd8c0;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 4258174622..87510de0d4 100644
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,29 +3,67 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
-#include "event.hh"
+#include "music.hh"
 
-class Skip_req_swallow_translator : public virtual Translator
+#include "translator.icc"
+
+class Skip_event_swallow_translator : public Translator
+{
+protected:
+  virtual bool try_music (Music *) { return true; }
+
+public:
+  TRANSLATOR_DECLARATIONS (Skip_event_swallow_translator);
+};
+
+class Rest_swallow_translator : public Translator
+{
+protected:
+  virtual bool try_music (Music *) { return true; }
+
+public:
+  TRANSLATOR_DECLARATIONS (Rest_swallow_translator);
+};
+
+Skip_event_swallow_translator::Skip_event_swallow_translator ()
+{
+}
+
+ADD_TRANSLATOR (Skip_event_swallow_translator,
+		"Swallow \\skip.",
+		"",
+		"",
+		"");
+
+Rest_swallow_translator::Rest_swallow_translator (){}
+
+ADD_TRANSLATOR (Rest_swallow_translator,
+		"Swallow rest",
+		"",
+		"",
+		"");
+
+class Note_swallow_translator : public Translator
 {
 protected:
-  virtual bool try_music (Music*) { return true; }
+  virtual bool try_music (Music *) { return true; }
 
-public:  
-  TRANSLATOR_DECLARATIONS(Skip_req_swallow_translator);
+public:
+  TRANSLATOR_DECLARATIONS (Note_swallow_translator);
 };
 
+Note_swallow_translator::Note_swallow_translator ()
+{
+}
+
+ADD_TRANSLATOR (Note_swallow_translator,
+		"Swallow notes",
+		"",
+		"",
 
-Skip_req_swallow_translator::Skip_req_swallow_translator(){}
+		"");
 
-ENTER_DESCRIPTION(Skip_req_swallow_translator,
-		  "Swallow \\skip.",
-		  "",
-		  "skip-event",
-		  "",
-		  "",
-		  "");
-