(Vertical spacing):

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

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 1aa529cd52490b70ca8f9edd4bfdd354f63758c8..c14581e099d91aa6b07e9f14c5c8692e65929bd0 100644 (file)
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,21 +3,71 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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);
+};
+
+
+class Rest_swallow_translator : public virtual Translator
+{
+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",
+                 "",
+                 "",
+       
+
+         "");
 
-bool
-Type_swallow_translator::do_try_music (Music*r)
+class Note_swallow_translator : public virtual Translator
 {
-  if (classname (r) == swallow_str_)
-      return true;
-  return false;
-}
+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",
+                 "",
+                 "",
+                 "");
+