/*
- 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
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:
}
-/*
- 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_l_->get_grob_property ("font-relative-size")))
+ /*
+ We only want to process a grob once.
+ */
+ if (gi.origin_trans_->context () != context ())
+ return ;
+
+ if (scm_is_number (sz) && scm_to_double (sz))
{
- gi.grob_l_->set_grob_property ("font-relative-size", 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));
}
}
-
-ENTER_DESCRIPTION(Font_size_engraver,
+ADD_TRANSLATOR (Font_size_engraver,
/* descr */ "Puts fontSize into font-relative-size grob property.",
/* creats*/ "",
-/* acks */ "font-interface",
+/* accepts */ "",
+/* acks */ "font-interface",
/* reads */ "fontSize",
/* write */ "");