Merge with master

[lilypond.git] / lily / swallow-engraver.cc

diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc
index bc1cad3a9f2b02e6b820239772bebd8e01f789f5..7d0c851ab0627d80090556a7c024725b3582238c 100644 (file)
--- a/lily/swallow-engraver.cc
+++ b/lily/swallow-engraver.cc
@@ -1,19 +1,36 @@
 /*
-  swallow-reg.cc -- implement Swallow_engraver
+  swallow-engraver.cc -- implement Swallow_engraver
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
-#include "swallow-engraver.hh"
 
+#include "engraver.hh"
 
-
-ADD_THIS_TRANSLATOR(Swallow_engraver);
-
+class Swallow_engraver : public Engraver
+{
+public:
+  TRANSLATOR_DECLARATIONS (Swallow_engraver);
+protected:
+  bool try_music (Music *);
+};
 
 bool
-Swallow_engraver::do_try_music (Music*) 
+Swallow_engraver::try_music (Music *)
 {
   return true;
 }
+
+Swallow_engraver::Swallow_engraver ()
+{
+}
+
+#include "translator.icc"
+
+ADD_TRANSLATOR (Swallow_engraver,
+               /* doc */ "This engraver swallows everything given to it silently. The purpose of "
+               "this is to prevent spurious \"event junked\" warnings.",
+               /* create */ "",
+               /* read */ "",
+               /* write */ "");