X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-size-engraver.cc;h=39b36586bad1c58ef3c7efd25b3974f79cd7fdf5;hb=ba824abf873d98c5afa9f8236beb85929cec0c03;hp=d1ac0e634b5cbce42ec98a4dcb02707b3836ac0e;hpb=02c656d3b0cb895cc81b428d699d960746800e45;p=lilypond.git

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index d1ac0e634b..39b36586ba 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--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -14,38 +14,45 @@ class Font_size_engraver : public Engraver
 
   TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
-  virtual void acknowledge_grob (Grob_info gi);
+  DECLARE_ACKNOWLEDGER (font);
+  void process_music ();
+  Real size;
 private:
 };
 
 Font_size_engraver::Font_size_engraver ()
 {
+  size = 0.0;
 }
 
 void
-Font_size_engraver::acknowledge_grob (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_TRANSLATOR (Font_size_engraver,
-		/* descr */ "Puts fontSize into font-relative-size grob property.",
-		/* creats*/ "",
-		/* accepts */ "",
-		/* acks  */ "font-interface",
-		/* reads */ "fontSize",
+		/* doc */ "Puts fontSize into font-size grob property.",
+		/* create */ "",
+		/* read */ "fontSize",
 		/* write */ "");