X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-size-engraver.cc;h=9cb0397b7e4fb25b2b50eb5ac4908e902f381f7b;hb=e3d67c22f5f44859df86b9e3f1c26526a7f765dc;hp=b91107a8a9db608a021fac7e627bdbc987d15b98;hpb=83ed05cef3bfcbd69f4148e8ee0669ca0664e214;p=lilypond.git

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index b91107a8a9..9cb0397b7e 100644
--- 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--2008  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -14,41 +14,53 @@ class Font_size_engraver : public Engraver
 
   TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
-  DECLARE_ACKNOWLEDGER(font);
+  DECLARE_ACKNOWLEDGER (font);
+  void process_music ();
+  Real size;
 private:
 };
 
 Font_size_engraver::Font_size_engraver ()
 {
+  size = 0.0;
 }
 
 void
-Font_size_engraver::acknowledge_font (Grob_info gi)
+Font_size_engraver::process_music ()
 {
-  SCM sz = get_property ("fontSize");
+  size = robust_scm2double (get_property ("fontSize"), 0.0);
+}
 
+void
+Font_size_engraver::acknowledge_font (Grob_info gi)
+{
   /*
     We only want to process a grob once.
   */
-  if (gi.context () != context ())
+  if (!size)
     return;
 
-  if (scm_is_number (sz) && scm_to_double (sz))
-    {
-      Real font_size = scm_to_double (sz);
+  if (gi.context () != context ())
+    return;
 
-      font_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 */
+		""
+		);