* lily/lily-parser-scheme.cc (LY_DEFINE): don't set 'parser

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index a8554d4453a543a5d54599b340da7021f720bae9..d1ac0e634b5cbce42ec98a4dcb02707b3836ac0e 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -1,28 +1,25 @@
-/*   
-  font-size-engraver.cc --  implement 
-  
+/*
+  font-size-engraver.cc -- implement Font_size_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (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);
+
+  TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info gi);
 private:
 };
 
-
 Font_size_engraver::Font_size_engraver ()
 {
-
 }
 
 void
@@ -30,19 +27,25 @@ Font_size_engraver::acknowledge_grob (Grob_info gi)
 {
   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")))
+  /*
+    We only want to process a grob once.
+  */
+  if (gi.context () != context ())
+    return;
+
+  if (scm_is_number (sz) && scm_to_double (sz))
     {
-      gi.grob_l_->set_grob_property ("font-relative-size", 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));
     }
 }
 
-
-
-ENTER_DESCRIPTION(Font_size_engraver,
-/* descr */       "Puts fontSize into font-relative-size grob property.",
-/* creats*/       "",
-/* acks  */       "grob-interface",
-/* reads */       "fontSize",
-/* write */       "");
+ADD_TRANSLATOR (Font_size_engraver,
+               /* descr */ "Puts fontSize into font-relative-size grob property.",
+               /* creats*/ "",
+               /* accepts */ "",
+               /* acks  */ "font-interface",
+               /* reads */ "fontSize",
+               /* write */ "");