* lily/include/music-iterator.hh (class Music_iterator): remove

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

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 0c77e982a96c46409871fc8d4d200a6ba7240001..1533786afbf7b55cfb27faee5b8544e3fb4c85e5 100644 (file)
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,29 +3,71 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator.hh"
-#include "musical-request.hh"
+#include "event.hh"
 
-class Skip_req_swallow_translator : public virtual Translator
+class Skip_event_swallow_translator : public virtual Translator
 {
 protected:
   virtual bool try_music (Music*) { return true; }
 
 public:  
-  TRANSLATOR_DECLARATIONS(Skip_req_swallow_translator);
+  TRANSLATOR_DECLARATIONS(Skip_event_swallow_translator);
 };
 
 
-Skip_req_swallow_translator::Skip_req_swallow_translator(){}
+class Rest_swallow_translator : public virtual Translator
+{
+protected:
+  virtual bool try_music (Music*) { return true; }
+
+public:  
+  TRANSLATOR_DECLARATIONS(Rest_swallow_translator);
+};
+
 
-ENTER_DESCRIPTION(Skip_req_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(){}
+
+ENTER_DESCRIPTION(Note_swallow_translator,
+                 "Swallow notes",
+                 "",
+                 "note-event",
+                 "",
+                 "",
+                 "");