X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil-interpret.cc;h=c1db5284234f485e33cddbe46c50c7bea13ebd06;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=f88cdc4c7fd0593ddac254c842a35f9267fac99b;hpb=b7f91a698780966af5f1c3f2ea9aad4630fb480f;p=lilypond.git

diff --git a/lily/stencil-interpret.cc b/lily/stencil-interpret.cc
index f88cdc4c7f..c1db528423 100644
--- a/lily/stencil-interpret.cc
+++ b/lily/stencil-interpret.cc
@@ -1,10 +1,9 @@
 /*
-  stencil-interpret.cc --  implement Stencil expression interpreting 
+  stencil-interpret.cc --  implement Stencil expression interpreting
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "stencil.hh"
@@ -22,6 +21,11 @@ interpret_stencil_expression (SCM expr,
 
       SCM head = scm_car (expr);
 
+      if (head == ly_symbol2scm ("delay-stencil-evaluation"))
+	{
+	  interpret_stencil_expression (scm_force (scm_cadr (expr)), func, func_arg, o);
+	  return;
+	}
       if (head == ly_symbol2scm ("translate-stencil"))
 	{
 	  o += ly_scm2offset (scm_cadr (expr));
@@ -55,14 +59,30 @@ interpret_stencil_expression (SCM expr,
 	  interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
 	  (*func) (func_arg, scm_list_1 (ly_symbol2scm ("resetcolor")));
 
+	  return;
+	}
+      else if (head == ly_symbol2scm ("rotate-stencil"))
+	{
+	  SCM args = scm_cadr (expr);
+	  SCM angle = scm_car (args);
+	  Offset tmp = o + robust_scm2offset (scm_cadr (args), Offset (0.0, 0.0));
+
+	  SCM offset = ly_offset2scm (tmp);
+	  SCM x = scm_car (offset);
+	  SCM y = scm_cdr (offset);
+
+	  (*func) (func_arg, scm_list_4 (ly_symbol2scm ("setrotation"), angle, x, y));
+	  interpret_stencil_expression (scm_caddr (expr), func, func_arg, o);
+	  (*func) (func_arg, scm_list_4 (ly_symbol2scm ("resetrotation"), angle, x, y));
+
 	  return;
 	}
       else
 	{
 	  (*func) (func_arg,
 		   scm_list_4 (ly_symbol2scm ("placebox"),
-			       scm_make_real (o[X_AXIS]),
-			       scm_make_real (o[Y_AXIS]),
+			       scm_from_double (o[X_AXIS]),
+			       scm_from_double (o[Y_AXIS]),
 			       expr));
 	  return;
 	}