2003 -> 2004

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 56f1555d9d317547a779faeea98bd7fa2492be9a..7ef99111b45ce6634b0ff31ab65f237af9ca435f 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -1,9 +1,9 @@
 /*   
-  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--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,9 +12,8 @@
 
 class Font_size_engraver : public Engraver
 {
-public:
-  VIRTUAL_COPY_CONS(Translator);
-  Font_size_engraver ();
+  
+  TRANSLATOR_DECLARATIONS(Font_size_engraver);
 protected:
   virtual void acknowledge_grob (Grob_info gi);
 private:
@@ -31,12 +30,26 @@ 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.elem_l_->get_grob_property ("font-relative-size")))
+  /*
+    We only want to process a grob once.
+   */
+  if (gi.origin_trans_->daddy_trans_ != daddy_trans_)
+    return ;
+  
+  if (gh_number_p (sz) && gh_scm2double (sz))
     {
-      gi.elem_l_->set_grob_property ("font-relative-size", sz);
+      Real font_size = gh_scm2double (sz);
+      
+      font_size +=  robust_scm2double (gi.grob_->get_grob_property ("font-size"), 0);
+      gi.grob_->set_grob_property ("font-size", gh_double2scm (font_size));
     }
 }
 
-ADD_THIS_TRANSLATOR(Font_size_engraver);
+
+ENTER_DESCRIPTION(Font_size_engraver,
+/* descr */       "Puts fontSize into font-relative-size grob property.",
+/* creats*/       "",
+/* accepts */     "",
+/* acks  */      "font-interface",
+/* reads */       "fontSize",
+/* write */       "");