X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-size-engraver.cc;h=3889a89e3b793fbb2c903a232a0fe7c78aeeabcb;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=b8d91ae55cc93c501baff57c2491680d6a923902;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index b8d91ae55c..3889a89e3b 100644
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -1,40 +1,83 @@
-/*   
-  font-size-grav.cc --  implement Font_size_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "font-size-engraver.hh"
-#include "score-element.hh"
-#include "lily-guile.hh"
-
-Font_size_engraver::Font_size_engraver ()
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2001--2015  Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "grob.hh"
+#include "engraver.hh"
+
+class Font_size_engraver : public Engraver
 {
-  size_i_ = 0;
+
+  TRANSLATOR_DECLARATIONS (Font_size_engraver);
+protected:
+  void acknowledge_font (Grob_info);
+  void process_music ();
+  Real size;
+private:
+};
+
+Font_size_engraver::Font_size_engraver (Context *c)
+  : Engraver (c)
+{
+  size = 0.0;
 }
 
 void
-Font_size_engraver::do_process_requests ()
+Font_size_engraver::process_music ()
 {
-  SCM s (get_property ("fontSize", 0));
-  
-  if (SCM_NUMBERP(s))
-    {
-      size_i_ = gh_scm2int (s);
-    }
+  size = robust_scm2double (get_property ("fontSize"), 0.0);
 }
 
 void
-Font_size_engraver::acknowledge_element (Score_element_info e)
+Font_size_engraver::acknowledge_font (Grob_info gi)
 {
-  if (size_i_ && e.elem_l_->get_elt_property (fontsize_scm_sym) == SCM_BOOL_F)
-    {
-      e.elem_l_->set_elt_property (fontsize_scm_sym,
-				   gh_int2scm (size_i_));
-    }
+  /*
+    We only want to process a grob once.
+  */
+  if (!size)
+    return;
+
+  if (gi.context () != context ())
+    return;
+
+  Real font_size = size
+                   + robust_scm2double (gi.grob ()->get_property ("font-size"), 0);
+  gi.grob ()->set_property ("font-size", scm_from_double (font_size));
 }
-ADD_THIS_TRANSLATOR (Font_size_engraver);
 
+#include "translator.icc"
+
+void
+Font_size_engraver::boot ()
+{
+  ADD_ACKNOWLEDGER (Font_size_engraver, font);
+}
+
+ADD_TRANSLATOR (Font_size_engraver,
+                /* doc */
+                "Put @code{fontSize} into @code{font-size} grob property.",
+
+                /* create */
+                "",
+
+                /* read */
+                "fontSize ",
+
+                /* write */
+                ""
+               );