X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-size-engraver.cc;h=580afac3033141c37f7e6206943d9ab3c98179ea;hb=8536db51578c1d3ba3da834e5a308c2790dd4f87;hp=98de28dbd58c57388d734f15e25417d157cb69f8;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 98de28dbd5..580afac303 100644
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -1,55 +1,60 @@
-/*   
-  font-size-engraver.cc --  implement Font_size_engraver
-  
+/*
+  font-size-engraver.cc -- implement Font_size_engraver
+
   source file of the GNU LilyPond music typesetter
-  
+
   (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+*/
 
 #include "grob.hh"
 #include "engraver.hh"
 
 class Font_size_engraver : public Engraver
 {
-  
+
   TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
-  virtual void acknowledge_grob (Grob_info gi);
+  DECLARE_ACKNOWLEDGER(font);
+  virtual 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.origin_trans_->context () != context ())
+  */
+  if (!size)
     return ;
-  
-  if (scm_is_number (sz) && scm_to_double (sz))
-    {
-      Real font_size = scm_to_double (sz);
-      
-      font_size +=  robust_scm2double (gi.grob_->get_property ("font-size"), 0);
-      gi.grob_->set_property ("font-size", scm_make_real (font_size));
-    }
+
+  if (gi.context () != context ())
+    return ;
+
+  Real font_size = size
+    + robust_scm2double (gi.grob ()->get_property ("font-size"), 0);
+  gi.grob ()->set_property ("font-size", scm_make_real (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",
-/* write */       "");
+		/* descr */ "Puts fontSize into font-relative-size grob property.",
+		/* creats*/ "",
+		/* accepts */ "",
+		/* reads */ "fontSize",
+		/* write */ "");