X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-size-engraver.cc;h=3889a89e3b793fbb2c903a232a0fe7c78aeeabcb;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=41874eeae3c3eb91ec354d207943b401fd240b00;hpb=e5990be98bd154f5dd6b2aa8259a56c546168450;p=lilypond.git

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 41874eeae3..3889a89e3b 100644
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -1,52 +1,83 @@
-/*   
-  font-size-engraver.cc --  implement 
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2001--2002  Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  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
 {
-  
-  TRANSLATOR_DECLARATIONS(Font_size_engraver);
+
+  TRANSLATOR_DECLARATIONS (Font_size_engraver);
 protected:
-  virtual void acknowledge_grob (Grob_info gi);
+  void acknowledge_font (Grob_info);
+  void process_music ();
+  Real size;
 private:
 };
 
+Font_size_engraver::Font_size_engraver (Context *c)
+  : Engraver (c)
+{
+  size = 0.0;
+}
 
-Font_size_engraver::Font_size_engraver ()
+void
+Font_size_engraver::process_music ()
 {
+  size = robust_scm2double (get_property ("fontSize"), 0.0);
+}
+
+void
+Font_size_engraver::acknowledge_font (Grob_info gi)
+{
+  /*
+    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));
 }
 
-/*
-  TODO: use fontSize = NUMBER as a scaling constant: find the closest
-  integer design size, and use magnification to do the fractional bit.
-*/
+#include "translator.icc"
+
 void
-Font_size_engraver::acknowledge_grob (Grob_info gi)
+Font_size_engraver::boot ()
 {
-  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")))
-    {
-      gi.grob_l_->set_grob_property ("font-relative-size", sz);
-    }
+  ADD_ACKNOWLEDGER (Font_size_engraver, font);
 }
 
+ADD_TRANSLATOR (Font_size_engraver,
+                /* doc */
+                "Put @code{fontSize} into @code{font-size} grob property.",
+
+                /* create */
+                "",
 
+                /* read */
+                "fontSize ",
 
-ENTER_DESCRIPTION(Font_size_engraver,
-/* descr */       "Puts fontSize into font-relative-size grob property.",
-/* creats*/       "",
-/* acks  */       "font-interface",
-/* reads */       "fontSize",
-/* write */       "");
+                /* write */
+                ""
+               );