*** empty log message ***

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index c1812e5ace4a33548ffbf6100b43cdde22dee58d..9066bee1f6132c4f8f200d8d19beaaf7158cc83c 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--2003  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,7 +13,7 @@
 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:
@@ -25,26 +25,28 @@ Font_size_engraver::Font_size_engraver ()
 
 }
 
-/*
-  TODO: use fontSize = NUMBER as a scaling constant: find the closest
-  integer design size, and use magnification to do the fractional bit.
-*/
 void
 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_->get_grob_property ("font-relative-size")))
+  /*
+    We only want to process a grob once.
+   */
+  if (gi.origin_trans_->daddy_context_ != daddy_context_)
+    return ;
+  
+  if (gh_number_p (sz) && gh_scm2double (sz))
     {
-      gi.grob_->set_grob_property ("font-relative-size", sz);
+      Real font_size = gh_scm2double (sz);
+      
+      font_size +=  robust_scm2double (gi.grob_->get_property ("font-size"), 0);
+      gi.grob_->set_property ("font-size", gh_double2scm (font_size));
     }
 }
 
 
-
-ENTER_DESCRIPTION(Font_size_engraver,
+ENTER_DESCRIPTION (Font_size_engraver,
 /* descr */       "Puts fontSize into font-relative-size grob property.",
 /* creats*/       "",
 /* accepts */     "",