X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil-scheme.cc;h=2669e14808b2ad8f12def8efed9e8d8585008d77;hb=d6a70b0d29c31d0b24a53c978c8844bbb640cdbd;hp=cfec55292ad2453535673a8f4dd9c1af046c33c4;hpb=4e4a3b4106cb4982f0c06ca26bad2f2641c0382e;p=lilypond.git diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index cfec55292a..2669e14808 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 + (c) 1997--2006 Han-Wen Nienhuys */ -#include #include "font-metric.hh" #include "libc-extension.hh" @@ -26,6 +25,7 @@ LY_DEFINE (ly_translate_stencil_axis, "ly:stencil-translate-axis", 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"); @@ -64,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).") @@ -191,7 +191,10 @@ LY_DEFINE (ly_stencil_add, "ly:stencil-add", #define FUNC_NAME __FUNCTION__ SCM_VALIDATE_REST_ARGUMENT (args); - Stencil result; + SCM expr = SCM_EOL; + SCM *tail = &expr; + Box extent; + extent.set_empty (); while (!SCM_NULLP (args)) { @@ -199,27 +202,48 @@ LY_DEFINE (ly_stencil_add, "ly:stencil-add", if (!s) SCM_ASSERT_TYPE (s, scm_car (args), SCM_ARGn, __FUNCTION__, "Stencil"); - result.add_stencil (*s); + extent.unite (s->extent_box ()); + *tail = scm_cons (s->expr (), SCM_EOL); + tail = SCM_CDRLOC (*tail); args = scm_cdr (args); } - return result.smobbed_copy (); + expr = scm_cons (ly_symbol2scm ("combine-stencil"), expr); + return Stencil (extent, expr).smobbed_copy (); } 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 (); } @@ -250,6 +274,18 @@ 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.") +{ + Stencil *stil = unsmob_stencil (stc); + SCM_ASSERT_TYPE (stil, stc, SCM_ARG1, __FUNCTION__, "Stencil"); + return Stencil (stil->extent_box (), + scm_list_3 (ly_symbol2scm ("color"), + scm_list_3 (r, g, b), + stil->expr ())).smobbed_copy (); +} + struct Stencil_interpret_arguments { SCM func; @@ -266,7 +302,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; @@ -297,6 +333,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), @@ -312,3 +367,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 (); +}