X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil-scheme.cc;h=3d0e371e130079003543e19f52950a5f4c6230b1;hb=75b2a16e79b94aa9c9f0d7519dee493cc699fee1;hp=95c4b07795787d53a562a6d3e9829d5cf582d95b;hpb=be4f786099ef94bc10aa48eb706631e4c1bbf016;p=lilypond.git

diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index 95c4b07795..3d0e371e13 100644
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -3,10 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <math.h>
 
 #include "font-metric.hh"
 #include "libc-extension.hh"
@@ -65,7 +64,7 @@ LY_DEFINE (ly_stencil_expr, "ly:stencil-expr",
   return s->expr ();
 }
 
-LY_DEFINE (ly_stencil_get_extent, "ly:stencil-extent",
+LY_DEFINE (ly_stencil_extent, "ly:stencil-extent",
 	   2, 0, 0, (SCM stil, SCM axis),
 	   "Return a pair of numbers signifying the extent of @var{stil} in "
 	   "@var{axis} direction (0 or 1 for x and y axis respectively).")
@@ -106,6 +105,8 @@ LY_DEFINE (ly_stencil_moved_to_edge, "ly:stencil-moved-to-edge",
 {
   /*
     C&P from combine-at-edge.
+
+    fixme: just used once.
   */
   Stencil *s1 = unsmob_stencil (first);
   Stencil *s2 = unsmob_stencil (second);
@@ -193,17 +194,16 @@ LY_DEFINE (ly_stencil_add, "ly:stencil-add",
   SCM_VALIDATE_REST_ARGUMENT (args);
 
   SCM expr = SCM_EOL;
-  SCM *tail = &expr; 
+  SCM *tail = &expr;
   Box extent;
   extent.set_empty ();
-  
+
   while (!SCM_NULLP (args))
     {
       Stencil *s = unsmob_stencil (scm_car (args));
       if (!s)
 	SCM_ASSERT_TYPE (s, scm_car (args), SCM_ARGn, __FUNCTION__, "Stencil");
 
-
       extent.unite (s->extent_box ());
       *tail = scm_cons (s->expr (), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
@@ -215,19 +215,37 @@ LY_DEFINE (ly_stencil_add, "ly:stencil-add",
 }
 
 LY_DEFINE (ly_make_stencil, "ly:make-stencil",
-	   3, 0, 0, (SCM expr, SCM xext, SCM yext),
+	   1, 2, 0, (SCM expr, SCM xext, SCM yext),
 	   " \n"
 	   "Stencils are a device independent output expressions."
 	   "They carry two pieces of information: \n\n"
 	   "1: a specification of how to print this object. "
 	   "This specification is processed by the output backends, "
-	   " for example @file{scm/output-tex.scm}.\n\n"
-	   "2: the vertical and horizontal extents of the object.\n\n")
+	   " for example @file{scm/output-ps.scm}.\n\n"
+	   "2: the vertical and horizontal extents of the object.\n\n"
+	   "If the extents are unspecified, they are taken  to be empty."
+	   )
 {
-  SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG2, __FUNCTION__, "number pair");
-  SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG3, __FUNCTION__, "number pair");
+  SCM_ASSERT_TYPE (!scm_is_pair (expr)
+		   || is_stencil_head (scm_car (expr)),
+		   expr, SCM_ARG1, __FUNCTION__, "registered stencil expression");
+
+
+  Interval x; 
+  if (xext != SCM_UNDEFINED)
+    {
+      SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG2, __FUNCTION__, "number pair");
+      x = ly_scm2interval (xext);
+    }
 
-  Box b (ly_scm2interval (xext), ly_scm2interval (yext));
+  Interval y; 
+  if (yext != SCM_UNDEFINED)
+    {
+      SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG3, __FUNCTION__, "number pair");
+      y = ly_scm2interval (yext);
+    }
+
+  Box b (x, y);
   Stencil s (b, expr);
   return s.smobbed_copy ();
 }
@@ -258,7 +276,6 @@ LY_DEFINE (ly_stencil_fonts, "ly:stencil-fonts",
   return find_expression_fonts (stil->expr ());
 }
 
-
 LY_DEFINE (ly_stencil_in_color, "ly:stencil-in-color",
 	   4, 0, 0, (SCM stc, SCM r, SCM g, SCM b),
 	   "Put @var{stc} in a different color.")
@@ -271,7 +288,6 @@ LY_DEFINE (ly_stencil_in_color, "ly:stencil-in-color",
 			      stil->expr ())).smobbed_copy ();
 }
 
-
 struct Stencil_interpret_arguments
 {
   SCM func;
@@ -288,7 +304,7 @@ LY_DEFINE (ly_interpret_stencil_expression, "ly:interpret-stencil-expression",
 	   4, 0, 0, (SCM expr, SCM func, SCM arg1, SCM offset),
 	   "Parse EXPR, feed bits to FUNC with first arg ARG1")
 {
-  SCM_ASSERT_TYPE (ly_c_procedure_p (func), func, SCM_ARG1, __FUNCTION__,
+  SCM_ASSERT_TYPE (ly_is_procedure (func), func, SCM_ARG1, __FUNCTION__,
 		   "procedure");
 
   Stencil_interpret_arguments a;
@@ -319,6 +335,25 @@ LY_DEFINE (ly_bracket, "ly:bracket",
 			  0.95 * scm_to_double (t)).smobbed_copy ();
 }
 
+LY_DEFINE (ly_rotate_stencil, "ly:stencil-rotate",
+	   4, 0, 0, (SCM stil, SCM angle, SCM x, SCM y),
+	   "Return a @var{stil} rotated @var{angle} degrees around point (@var{x}, @var{y}).")
+{
+  Stencil *s = unsmob_stencil (stil);
+  SCM_ASSERT_TYPE (s, stil, SCM_ARG1, __FUNCTION__, "stencil");
+  SCM_ASSERT_TYPE (scm_is_number (angle), angle, SCM_ARG2, __FUNCTION__, "number");
+  SCM_ASSERT_TYPE (scm_is_number (x), x, SCM_ARG3, __FUNCTION__, "number");
+  SCM_ASSERT_TYPE (scm_is_number (y), y, SCM_ARG4, __FUNCTION__, "number");
+  Real a = scm_to_double (angle);
+  Real x_off = scm_to_double (x);
+  Real y_off = scm_to_double (y);
+
+  SCM new_s = s->smobbed_copy ();
+  Stencil *q = unsmob_stencil (new_s);
+  q->rotate (a, Offset (x_off, y_off));
+  return new_s;
+}
+
 LY_DEFINE (ly_filled_box, "ly:round-filled-box",
 	   3, 0, 0,
 	   (SCM xext, SCM yext, SCM blot),
@@ -334,3 +369,21 @@ LY_DEFINE (ly_filled_box, "ly:round-filled-box",
 				   scm_to_double (blot)).smobbed_copy ();
 }
 
+LY_DEFINE (ly_register_stencil_expression, "ly:register-stencil-expression",
+	   1, 0, 0,
+	   (SCM symbol),
+	   "Add @var{symbol} as head of a stencil expression")
+{
+  SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol,
+		   SCM_ARG1, __FUNCTION__, "Symbol");
+  register_stencil_head (symbol);
+  return SCM_UNSPECIFIED;
+}
+
+LY_DEFINE (ly_all_stencil_expressions, "ly:all-stencil-expressions",
+	   0, 0, 0,
+	   (),
+	   "Return all symbols recognized as stencil expressions.")
+{
+  return all_stencil_heads ();
+}