Update using bison-CVS.

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 659dba6630d39d517490732360d70b6b32b35ebc..a5f7848c7f455063899787b15ba332d2fe94b7a4 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
-  
+/*
+  font-size-engraver.cc -- implement Font_size_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2004  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);
 protected:
   virtual void acknowledge_grob (Grob_info gi);
 private:
 };
 
-
 Font_size_engraver::Font_size_engraver ()
 {
-
 }
 
 void
@@ -32,24 +29,23 @@ Font_size_engraver::acknowledge_grob (Grob_info gi)
 
   /*
     We only want to process a grob once.
-   */
-  if (gi.origin_trans_->daddy_context_ != daddy_context_)
-    return ;
-  
-  if (is_number (sz) && ly_scm2double (sz))
+  */
+  if (gi.origin_trans_->context () != context ())
+    return;
+
+  if (scm_is_number (sz) && scm_to_double (sz))
     {
-      Real font_size = ly_scm2double (sz);
-      
-      font_size +=  robust_scm2double (gi.grob_->get_property ("font-size"), 0);
+      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*/       "",
-/* accepts */     "",
-/* acks  */      "font-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 */ "");