2003 -> 2004

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 1178abc4b216513f1e1e84955b3921a877987959..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--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -25,25 +25,27 @@ 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_trans_ != daddy_trans_)
+    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_grob_property ("font-size"), 0);
+      gi.grob_->set_grob_property ("font-size", gh_double2scm (font_size));
     }
 }
 
 
-
 ENTER_DESCRIPTION(Font_size_engraver,
 /* descr */       "Puts fontSize into font-relative-size grob property.",
 /* creats*/       "",