X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-size-engraver.cc;h=39b36586bad1c58ef3c7efd25b3974f79cd7fdf5;hb=00e3e15364b9d3c94cda1bcab9f889bb95f6832d;hp=863bc6bf11d01c9a60c2ed4adde50b1e99f51820;hpb=8d8929f220531011b9f503a05737341d4863ed36;p=lilypond.git

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 863bc6bf11..39b36586ba 100644
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -1,48 +1,58 @@
-/*   
-  font-size-engraver.cc --  implement 
-  
+/*
+  font-size-engraver.cc -- implement Font_size_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2001--2007  Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "grob.hh"
 #include "engraver.hh"
 
 class Font_size_engraver : public Engraver
 {
-  
-  TRANSLATOR_DECLARATIONS(Font_size_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");
-
-  if (gh_number_p (sz)
-      && gh_scm2int (sz)
-      && !gh_number_p (gi.grob_l_->get_grob_property ("font-relative-size")))
-    {
-      gi.grob_l_->set_grob_property ("font-relative-size", sz);
-    }
+  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 (!size)
+    return;
+
+  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_from_double (font_size));
+}
 
+#include "translator.icc"
 
-ENTER_DESCRIPTION(Font_size_engraver,
-/* descr */       "Puts fontSize into font-relative-size grob property.",
-/* creats*/       "",
-/* acks  */       "font-interface",
-/* reads */       "fontSize",
-/* write */       "");
+ADD_ACKNOWLEDGER (Font_size_engraver, font);
+ADD_TRANSLATOR (Font_size_engraver,
+		/* doc */ "Puts fontSize into font-size grob property.",
+		/* create */ "",
+		/* read */ "fontSize",
+		/* write */ "");