* Documentation/topdocs/NEWS.tely (Top): elucidate GS problem.

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

diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index 0a81950758264313efff8c003748753b7eea32fc..263d06ae52f0a5dcaf7c760e717bb088a845697c 100644 (file)
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -3,11 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include <math.h>
+
+#include <libc-extension.hh>   // isinf
+
 #include "font-metric.hh"
 #include "stencil.hh"
+#include "lookup.hh"
 
 /*
   TODO: naming add/combine.
@@ -39,12 +44,19 @@ LY_DEFINE (ly_translate_stencil_axis, "ly:stencil-translate-axis",
 {
   Stencil *s = unsmob_stencil (stil);
   SCM_ASSERT_TYPE (s, stil, SCM_ARG1, __FUNCTION__, "stencil");
-  SCM_ASSERT_TYPE (scm_is_number (amount), amount, SCM_ARG2, __FUNCTION__, "number pair");
+  SCM_ASSERT_TYPE (scm_is_number (amount), amount, SCM_ARG2, __FUNCTION__, "number");
+
+  Real real_amount = scm_to_double (amount);
+#if 0
+  SCM_ASSERT_TYPE (!isinf (real_amount) && !isnan (real_amount),
+                  amount, SCM_ARG2, __FUNCTION__, "finite number");
+#endif
+  
   SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
 
   SCM new_s = s->smobbed_copy ();
   Stencil *q = unsmob_stencil (new_s);
-  q->translate_axis (scm_to_double (amount), Axis (scm_to_int (axis)));
+  q->translate_axis (real_amount, Axis (scm_to_int (axis)));
   return new_s;
 
 }
@@ -254,3 +266,83 @@ LY_DEFINE (ly_stencil_align_to_x, "ly:stencil-align-to!",
                                   scm_to_double (dir));
   return stil;
 }
+
+
+LY_DEFINE (ly_stencil_fonts, "ly:stencil-fonts",
+          1, 0, 0, (SCM s),
+         " Analyse @var{s}, and return a list of fonts used in @var{s}.")
+{
+  Stencil *stil = unsmob_stencil (s);
+  SCM_ASSERT_TYPE (stil, s, SCM_ARG1, __FUNCTION__, "Stencil");
+  return find_expression_fonts (stil->expr ());
+}
+
+
+struct Stencil_interpret_arguments
+{
+  SCM func;
+  SCM arg1;
+};
+
+void stencil_interpret_in_scm (void *p, SCM expr)
+{
+  Stencil_interpret_arguments *ap = (Stencil_interpret_arguments*) p;
+  scm_call_2 (ap->func, ap->arg1, expr);
+}
+
+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__,
+                  "procedure");
+
+  Stencil_interpret_arguments a;
+  a.func = func;
+  a.arg1 = arg1;
+  Offset o = ly_scm2offset (offset);
+
+  interpret_stencil_expression (expr, stencil_interpret_in_scm, (void*) &a, o);
+
+  return SCM_UNSPECIFIED;
+}
+
+
+
+LY_DEFINE (ly_bracket , "ly:bracket",
+         4, 0, 0,
+         (SCM a, SCM iv, SCM t, SCM p),
+         "Make a bracket in direction @var{a}. The extent of the bracket is " 
+         "given by @var{iv}. The wings protude by an amount of @var{p}, which "
+         "may be negative. The thickness is given by @var{t}.")
+{
+  SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
+  SCM_ASSERT_TYPE (is_number_pair (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE (scm_is_number (t), a, SCM_ARG3, __FUNCTION__, "number") ;
+  SCM_ASSERT_TYPE (scm_is_number (p), a, SCM_ARG4, __FUNCTION__, "number") ;
+
+
+  return Lookup::bracket ((Axis)scm_to_int (a), ly_scm2interval (iv),
+                         scm_to_double (t),
+                         scm_to_double (p),
+                         0.95 * scm_to_double (t)).smobbed_copy ();
+}
+
+
+
+LY_DEFINE (ly_filled_box , "ly:round-filled-box",
+         3, 0, 0,
+         (SCM xext, SCM yext, SCM blot),
+         "Make a @code{Stencil} "
+         "that prints a black box of dimensions @var{xext}, "
+         "@var{yext} and roundness @var{blot}."
+         )
+{
+  SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE (scm_is_number (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
+
+  return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),
+                                  scm_to_double (blot)).smobbed_copy ();
+}
+