Imported Upstream version 2.14.2

[lilypond.git] / lily / stencil-interpret.cc

diff --git a/lily/stencil-interpret.cc b/lily/stencil-interpret.cc
index 9b9ed4d6a383d940d6d6d893cd1f49df211f3f98..4f8c6bbc8be85712cf2bdea34b6fc25f78bd51a8 100644 (file)
--- a/lily/stencil-interpret.cc
+++ b/lily/stencil-interpret.cc
@@ -1,9 +1,20 @@
 /*
-  stencil-interpret.cc --  implement Stencil expression interpreting
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2009 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 "stencil.hh"
@@ -26,6 +37,8 @@ interpret_stencil_expression (SCM expr,
          interpret_stencil_expression (scm_force (scm_cadr (expr)), func, func_arg, o);
          return;
        }
+      if (head == ly_symbol2scm ("footnote"))
+        return;
       if (head == ly_symbol2scm ("translate-stencil"))
        {
          o += ly_scm2offset (scm_cadr (expr));
@@ -75,6 +88,22 @@ interpret_stencil_expression (SCM expr,
          interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
          (*func) (func_arg, scm_list_4 (ly_symbol2scm ("resetrotation"), angle, x, y));
 
+         return;
+       }
+      else if (head == ly_symbol2scm ("scale-stencil"))
+       {
+         SCM args = scm_cadr (expr);
+         SCM x_scale = scm_car (args);
+         SCM y_scale = scm_cadr (args);
+         Offset unscaled = o.scale (Offset (1 / scm_to_double (x_scale),
+                                            1 / scm_to_double (y_scale)));
+
+         (*func) (func_arg, scm_list_3 (ly_symbol2scm ("setscale"), x_scale,
+                                        y_scale));
+         interpret_stencil_expression (scm_caddr (expr), func, func_arg,
+                                       unscaled);
+         (*func) (func_arg, scm_list_1 (ly_symbol2scm ("resetscale")));
+
          return;
        }
       else