X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-size-engraver.cc;h=03802ac2ce2c94c354d5ae73602c2248707e87a7;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=f26b17ce4249b178331fa94853de7827a3bc0b27;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index f26b17ce42..03802ac2ce 100644
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -1,55 +1,77 @@
-/*   
-  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>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2001--2012  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);
 protected:
-  virtual void acknowledge_grob (Grob_info gi);
+  DECLARE_ACKNOWLEDGER (font);
+  void process_music ();
+  Real size;
 private:
 };
 
-
 Font_size_engraver::Font_size_engraver ()
 {
-
+  size = 0.0;
 }
 
 void
-Font_size_engraver::acknowledge_grob (Grob_info gi)
+Font_size_engraver::process_music ()
 {
-  SCM sz = get_property ("fontSize");
+  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 (gi.origin_trans_->daddy_context_ != daddy_context_)
-    return ;
-  
-  if (ly_number_p (sz) && ly_scm2double (sz))
-    {
-      Real font_size = ly_scm2double (sz);
-      
-      font_size +=  robust_scm2double (gi.grob_->get_property ("font-size"), 0);
-      gi.grob_->set_property ("font-size", scm_make_real (font_size));
-    }
+  */
+  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));
 }
 
+#include "translator.icc"
+
+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*/       "",
-/* accepts */     "",
-/* acks  */      "font-interface",
-/* reads */       "fontSize",
-/* write */       "");
+                /* write */
+                ""
+               );