* lily/font-select.cc (get_font_by_design_size): revert

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 9e68c27676a924ca575d4b6d44734720fb818674..2b09d6087d2278e0fa7af2220fa93a591048549f 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
+  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>
   
  */
 
@@ -33,12 +33,12 @@ Font_size_engraver::acknowledge_grob (Grob_info gi)
   /*
     We only want to process a grob once.
    */
-  if (gi.origin_trans_->get_parent_context () != get_parent_context ())
+  if (gi.origin_trans_->context () != context ())
     return ;
   
-  if (ly_c_number_p (sz) && ly_scm2double (sz))
+  if (scm_is_number (sz) && scm_to_double (sz))
     {
-      Real font_size = ly_scm2double (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));
@@ -46,7 +46,7 @@ Font_size_engraver::acknowledge_grob (Grob_info gi)
 }
 
 
-ENTER_DESCRIPTION (Font_size_engraver,
+ADD_TRANSLATOR (Font_size_engraver,
 /* descr */       "Puts fontSize into font-relative-size grob property.",
 /* creats*/       "",
 /* accepts */     "",