* lily/context.cc (where_defined): also assign value in

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

diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc
index 3c644b37fcd8499408b556864ff57d09cd8c54f1..580afac3033141c37f7e6206943d9ab3c98179ea 100644 (file)
--- a/lily/font-size-engraver.cc
+++ b/lily/font-size-engraver.cc
@@ -38,15 +38,15 @@ Font_size_engraver::acknowledge_font (Grob_info gi)
   /*
     We only want to process a grob once.
   */
+  if (!size)
+    return ;
+
   if (gi.context () != context ())
-    return;
-
-  if (size)
-    {
-      Real font_size = size
-       + robust_scm2double (gi.grob ()->get_property ("font-size"), 0);
-      gi.grob ()->set_property ("font-size", scm_make_real (font_size));
-    }
+    return ;
+
+  Real font_size = size
+    + robust_scm2double (gi.grob ()->get_property ("font-size"), 0);
+  gi.grob ()->set_property ("font-size", scm_make_real (font_size));
 }
 
 #include "translator.icc"
@@ -56,6 +56,5 @@ ADD_TRANSLATOR (Font_size_engraver,
                /* descr */ "Puts fontSize into font-relative-size grob property.",
                /* creats*/ "",
                /* accepts */ "",
-               /* acks  */ "",
                /* reads */ "fontSize",
                /* write */ "");