Merge with master

[lilypond.git] / lily / font-size-engraver.cc

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index d57f9219a5504bdc918df1377e002a8b16bae7e2..39b36586bad1c58ef3c7efd25b3974f79cd7fdf5 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -15,7 +15,7 @@ class Font_size_engraver : public Engraver
   TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
   DECLARE_ACKNOWLEDGER (font);
-  virtual void process_music ();
+  void process_music ();
   Real size;
 private:
 };
@@ -52,8 +52,7 @@ Font_size_engraver::acknowledge_font (Grob_info gi)
 
 ADD_ACKNOWLEDGER (Font_size_engraver, font);
 ADD_TRANSLATOR (Font_size_engraver,
-               /* doc */ "Puts fontSize into font-relative-size grob property.",
+               /* doc */ "Puts fontSize into font-size grob property.",
                /* create */ "",
-               /* accept */ "",
                /* read */ "fontSize",
                /* write */ "");