X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftype-swallow-translator.cc;h=c14581e099d91aa6b07e9f14c5c8692e65929bd0;hb=83c0409957c5ff1f35ef918455a7156fd550fa61;hp=b483c39c18eedb551a15835e9fd336b0eede815d;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index b483c39c18..c14581e099 100644
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,19 +3,71 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "type-swallow-translator.hh"
-#include "musical-request.hh"
+#include "translator.hh"
+#include "event.hh"
 
+class Skip_event_swallow_translator : public virtual Translator
+{
+protected:
+  virtual bool try_music (Music*) { return true; }
+
+public:  
+  TRANSLATOR_DECLARATIONS (Skip_event_swallow_translator);
+};
 
-bool
-Type_swallow_translator::try_music (Music*r)
+
+class Rest_swallow_translator : public virtual Translator
 {
-  if (classname (r) == swallow_string_)
-      return true;
-  return false;
-}
+protected:
+  virtual bool try_music (Music*) { return true; }
+
+public:  
+  TRANSLATOR_DECLARATIONS (Rest_swallow_translator);
+};
+
+
+Skip_event_swallow_translator::Skip_event_swallow_translator (){}
+
+ENTER_DESCRIPTION (Skip_event_swallow_translator,
+		  "Swallow \\skip.",
+		  "",
+		  "skip-event",
+		  "",
+		  "",
+		  "");
+
+
+Rest_swallow_translator::Rest_swallow_translator (){}
+
+ENTER_DESCRIPTION (Rest_swallow_translator,
+		  "Swallow rest",
+		  "",
+		  "rest-event",
+		  "",
+		  "",
+	
+
+	  "");
+
+class Note_swallow_translator : public virtual Translator
+{
+protected:
+  virtual bool try_music (Music*) { return true; }
+
+public:  
+  TRANSLATOR_DECLARATIONS (Note_swallow_translator);
+};
+
+Note_swallow_translator::Note_swallow_translator (){}
 
-DECLARE_REQUEST_SWALLOWER(Skip_req);
+ENTER_DESCRIPTION (Note_swallow_translator,
+		  "Swallow notes",
+		  "",
+		  "note-event",
+		  "",
+		  "",
+		  "");
+