merge (2nd try -- argh git.el)

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

diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc
index 2c2924072749121c310d9e31588bd77f664868ea..d69037c7b24c28cce6870088ac13f0bb7bbcdc13 100644 (file)
--- a/lily/type-swallow-translator.cc
+++ b/lily/type-swallow-translator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "translator.hh"
@@ -29,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",
-               "",
                "",
                "");
 
@@ -44,10 +44,7 @@ Rest_swallow_translator::Rest_swallow_translator (){}
 ADD_TRANSLATOR (Rest_swallow_translator,
                "Swallow rest",
                "",
-               "rest-event",
-               "",
                "",
-
                "");
 
 class Note_swallow_translator : public Translator
@@ -66,8 +63,7 @@ Note_swallow_translator::Note_swallow_translator ()
 ADD_TRANSLATOR (Note_swallow_translator,
                "Swallow notes",
                "",
-               "note-event",
-               "",
                "",
+
                "");