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

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 3c644b37fcd8499408b556864ff57d09cd8c54f1..b9dfb058ef1d8e18138313b643b5b70a3f243623 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--2009  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -14,8 +14,8 @@ class Font_size_engraver : public Engraver
 
   TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(font);
-  virtual void process_music ();
+  DECLARE_ACKNOWLEDGER (font);
+  void process_music ();
   Real size;
 private:
 };
@@ -25,11 +25,10 @@ Font_size_engraver::Font_size_engraver ()
   size = 0.0;
 }
 
-
 void
 Font_size_engraver::process_music ()
 {
-  size = robust_scm2double  (get_property ("fontSize"), 0.0);
+  size = robust_scm2double (get_property ("fontSize"), 0.0);
 }
 
 void
@@ -38,24 +37,30 @@ Font_size_engraver::acknowledge_font (Grob_info gi)
   /*
     We only want to process a grob once.
   */
+  if (!size)
+    return;
+
   if (gi.context () != context ())
     return;
 
-  if (size)
-    {
-      Real font_size = size
-       + robust_scm2double (gi.grob ()->get_property ("font-size"), 0);
-      gi.grob ()->set_property ("font-size", scm_make_real (font_size));
-    }
+  Real font_size = size
+    + robust_scm2double (gi.grob ()->get_property ("font-size"), 0);
+  gi.grob ()->set_property ("font-size", scm_from_double (font_size));
 }
 
 #include "translator.icc"
 
-ADD_ACKNOWLEDGER(Font_size_engraver,font);
+ADD_ACKNOWLEDGER (Font_size_engraver, font);
 ADD_TRANSLATOR (Font_size_engraver,
-               /* descr */ "Puts fontSize into font-relative-size grob property.",
-               /* creats*/ "",
-               /* accepts */ "",
-               /* acks  */ "",
-               /* reads */ "fontSize",
-               /* write */ "");
+               /* doc */
+               "Put @code{fontSize} into @code{font-size} grob property.",
+
+               /* create */
+               "",
+
+               /* read */
+               "fontSize ",
+
+               /* write */
+               ""
+               );