Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 47c40fe0eb97ae3881b4930357a33bc69db9d1fd..87510de0d4ec67788a8218242311a5784692920c 100644 (file)
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.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; }
@@ -18,7 +20,7 @@ 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; }
@@ -27,13 +29,13 @@ public:
   TRANSLATOR_DECLARATIONS (Rest_swallow_translator);
 };
 
-Skip_event_swallow_translator::Skip_event_swallow_translator (){}
+Skip_event_swallow_translator::Skip_event_swallow_translator ()
+{
+}
 
 ADD_TRANSLATOR (Skip_event_swallow_translator,
                "Swallow \\skip.",
                "",
-               "skip-event",
-               "",
                "",
                "");
 
@@ -42,13 +44,10 @@ Rest_swallow_translator::Rest_swallow_translator (){}
 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; }
@@ -57,13 +56,14 @@ 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",
-               "",
                "",
+
                "");