X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil-scheme.cc;h=ebf3cd6c15ad487bab6e67cde9c7891f3c525c35;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=1f33cd7aec25caa5721499038b88464a9fb569ab;hpb=84e144718964f20c48ff8dccaea8de9741df07e4;p=lilypond.git diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc index 1f33cd7aec..ebf3cd6c15 100644 --- a/lily/stencil-scheme.cc +++ b/lily/stencil-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,15 +31,18 @@ LY_DEFINE (ly_stencil_translate_axis, "ly:stencil-translate-axis", "Return a copy of @var{stil} but translated by @var{amount}" " in @var{axis} direction.") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); LY_ASSERT_TYPE (scm_is_number, amount, 2); + LY_ASSERT_TYPE (is_axis, axis, 3); Real real_amount = scm_to_double (amount); SCM new_s = s->smobbed_copy (); - Stencil *q = unsmob_stencil (new_s); + scm_remember_upto_here_1 (stil); + + Stencil *q = Stencil::unsmob (new_s); q->translate_axis (real_amount, Axis (scm_to_int (axis))); return new_s; } @@ -49,13 +52,15 @@ LY_DEFINE (ly_stencil_translate, "ly:stencil-translate", "Return a @var{stil}, but translated by @var{offset}" " (a pair of numbers).") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); LY_ASSERT_TYPE (is_number_pair, offset, 2); Offset o = ly_scm2offset (offset); SCM new_s = s->smobbed_copy (); - Stencil *q = unsmob_stencil (new_s); + scm_remember_upto_here_1 (stil); + + Stencil *q = Stencil::unsmob (new_s); q->translate (o); return new_s; } @@ -64,7 +69,7 @@ LY_DEFINE (ly_stencil_expr, "ly:stencil-expr", 1, 0, 0, (SCM stil), "Return the expression of @var{stil}.") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); return s->expr (); } @@ -75,7 +80,7 @@ LY_DEFINE (ly_stencil_extent, "ly:stencil-extent", " @var{axis} direction (@code{0} or @code{1} for x and" " y@tie{}axis, respectively).") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); LY_ASSERT_TYPE (is_axis, axis, 2); @@ -83,16 +88,21 @@ LY_DEFINE (ly_stencil_extent, "ly:stencil-extent", } LY_DEFINE (ly_stencil_empty_p, "ly:stencil-empty?", - 1, 0, 0, (SCM stil), - "Return whether @var{stil} is empty.") + 1, 1, 0, (SCM stil, SCM axis), + "Return whether @var{stil} is empty. If an optional" + " @var{axis} is supplied, the emptiness check is" + " restricted to that axis.") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); - return scm_from_bool (s->is_empty ()); + if (SCM_UNBNDP (axis)) + return scm_from_bool (s->is_empty ()); + LY_ASSERT_TYPE (is_axis, axis, 2); + return scm_from_bool (s->is_empty (Axis (scm_to_int (axis)))); } LY_DEFINE (ly_stencil_combine_at_edge, "ly:stencil-combine-at-edge", - 4, 2, 0, (SCM first, SCM axis, SCM direction, + 4, 1, 0, (SCM first, SCM axis, SCM direction, SCM second, SCM padding), "Construct a stencil by putting @var{second} next to @var{first}." @@ -102,8 +112,8 @@ LY_DEFINE (ly_stencil_combine_at_edge, "ly:stencil-combine-at-edge", " space. @var{first} and @var{second} may also be @code{'()} or" " @code{#f}.") { - Stencil *s1 = unsmob_stencil (first); - Stencil *s2 = unsmob_stencil (second); + Stencil *s1 = Stencil::unsmob (first); + Stencil *s2 = Stencil::unsmob (second); Stencil result; SCM_ASSERT_TYPE (s1 || first == SCM_BOOL_F || first == SCM_EOL, @@ -127,6 +137,61 @@ LY_DEFINE (ly_stencil_combine_at_edge, "ly:stencil-combine-at-edge", result.add_at_edge (Axis (scm_to_int (axis)), Direction (scm_to_int (direction)), *s2, p); + scm_remember_upto_here_2 (first, second); + + return result.smobbed_copy (); +} + +LY_DEFINE (ly_stencil_stack, "ly:stencil-stack", + 4, 2, 0, (SCM first, SCM axis, SCM direction, + SCM second, + SCM padding, + SCM mindist), + "Construct a stencil by stacking @var{second} next to @var{first}." + " @var{axis} can be 0 (x-axis) or@tie{}1 (y-axis)." + " @var{direction} can be -1 (left or down) or@tie{}1 (right or" + " up). The stencils are juxtaposed with @var{padding} as extra" + " space. @var{first} and @var{second} may also be @code{'()} or" + " @code{#f}. As opposed to @code{ly:stencil-combine-at-edge}," + " metrics are suited for successively accumulating lines of" + " stencils. Also, @var{second} stencil is drawn last.\n\n" + "If @var{mindist} is specified, reference points are placed" + " apart at least by this distance. If either of the stencils" + " is spacing, @var{padding} and @var{mindist} do not apply.") +{ + Stencil *s1 = Stencil::unsmob (first); + Stencil *s2 = Stencil::unsmob (second); + Stencil result; + + SCM_ASSERT_TYPE (s1 || first == SCM_BOOL_F || first == SCM_EOL, + first, SCM_ARG1, __FUNCTION__, "Stencil, #f or ()"); + SCM_ASSERT_TYPE (s2 || second == SCM_BOOL_F || second == SCM_EOL, + second, SCM_ARG4, __FUNCTION__, "Stencil, #f or ()"); + LY_ASSERT_TYPE (is_axis, axis, 2); + LY_ASSERT_TYPE (is_direction, direction, 3); + + Real p = 0.0; + if (padding != SCM_UNDEFINED) + { + LY_ASSERT_TYPE (scm_is_number, padding, 5); + p = scm_to_double (padding); + } + Real d = -infinity_f; + if (!SCM_UNBNDP (mindist)) + { + LY_ASSERT_TYPE (scm_is_number, mindist, 6); + d = scm_to_double (mindist); + } + + if (s1) + result = *s1; + + if (s2) + result.stack (Axis (scm_to_int (axis)), + Direction (scm_to_int (direction)), *s2, p, d); + + scm_remember_upto_here_2 (first, second); + return result.smobbed_copy (); } @@ -138,23 +203,30 @@ LY_DEFINE (ly_stencil_add, "ly:stencil-add", SCM_VALIDATE_REST_ARGUMENT (args); SCM expr = SCM_EOL; - SCM *tail = &expr; + SCM cs = ly_symbol2scm ("combine-stencil"); + Box extent; extent.set_empty (); while (!SCM_NULLP (args)) { - Stencil *s = unsmob_stencil (scm_car (args)); + Stencil *s = Stencil::unsmob (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); + if (scm_is_pair (s->expr ()) && scm_is_eq (cs, s->expr ())) + { + expr = scm_reverse_x (scm_list_copy (scm_cdr (s->expr ())), + expr); + } + else + expr = scm_cons (s->expr (), expr); + args = scm_cdr (args); } - expr = scm_cons (ly_symbol2scm ("combine-stencil"), expr); + expr = scm_cons (cs, scm_reverse_x (expr, SCM_EOL)); return Stencil (extent, expr).smobbed_copy (); } @@ -172,7 +244,7 @@ LY_DEFINE (ly_make_stencil, "ly:make-stencil", "@item\n" "The vertical and horizontal extents of the object, given as" " pairs. If an extent is unspecified (or if you use" - " @code{(1000 . -1000)} as its value), it is taken to be empty.\n" + " @code{empty-interval} as its value), it is taken to be empty.\n" "@end enumerate\n") { SCM_ASSERT_TYPE (!scm_is_pair (expr) @@ -201,14 +273,14 @@ LY_DEFINE (ly_make_stencil, "ly:make-stencil", LY_DEFINE (ly_stencil_aligned_to, "ly:stencil-aligned-to", 3, 0, 0, (SCM stil, SCM axis, SCM dir), "Align @var{stil} using its own extents. @var{dir} is a number." - " @code{-1} and @code{1} are left and right, respectively." + " @w{@code{-1}} and @code{1} are left and right, respectively." " Other values are interpolated (so @code{0} means the center).") { LY_ASSERT_SMOB (Stencil, stil, 1); LY_ASSERT_TYPE (is_axis, axis, 2); LY_ASSERT_TYPE (scm_is_number, dir, 3); - Stencil target = *unsmob_stencil (stil); + Stencil target = *Stencil::unsmob (stil); target.align_to ((Axis)scm_to_int (axis), scm_to_double (dir)); @@ -221,7 +293,7 @@ LY_DEFINE (ly_stencil_fonts, "ly:stencil-fonts", " in@tie{}@var{s}.") { LY_ASSERT_SMOB (Stencil, s, 1); - Stencil *stil = unsmob_stencil (s); + Stencil *stil = Stencil::unsmob (s); return find_expression_fonts (stil->expr ()); } @@ -230,7 +302,7 @@ LY_DEFINE (ly_stencil_in_color, "ly:stencil-in-color", "Put @var{stc} in a different color.") { LY_ASSERT_SMOB (Stencil, stc, 1); - Stencil *stil = unsmob_stencil (stc); + Stencil *stil = Stencil::unsmob (stc); return Stencil (stil->extent_box (), scm_list_3 (ly_symbol2scm ("color"), scm_list_3 (r, g, b), @@ -243,10 +315,10 @@ struct Stencil_interpret_arguments SCM arg1; }; -void stencil_interpret_in_scm (void *p, SCM expr) +SCM stencil_interpret_in_scm (void *p, SCM expr) { Stencil_interpret_arguments *ap = (Stencil_interpret_arguments *) p; - scm_call_2 (ap->func, ap->arg1, expr); + return scm_call_2 (ap->func, ap->arg1, expr); } LY_DEFINE (ly_interpret_stencil_expression, "ly:interpret-stencil-expression", @@ -288,10 +360,10 @@ LY_DEFINE (ly_bracket, "ly:bracket", LY_DEFINE (ly_stencil_rotate, "ly:stencil-rotate", 4, 0, 0, (SCM stil, SCM angle, SCM x, SCM y), "Return a stencil @var{stil} rotated @var{angle} degrees around" - " the relative offset (@var{x}, @var{y}). E.g. an offset of" + " the relative offset (@var{x}, @var{y}). E.g., an offset of" " (-1, 1) will rotate the stencil around the left upper corner.") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); LY_ASSERT_TYPE (scm_is_number, angle, 2); LY_ASSERT_TYPE (scm_is_number, x, 3); @@ -301,7 +373,7 @@ LY_DEFINE (ly_stencil_rotate, "ly:stencil-rotate", Real y_off = scm_to_double (y); SCM new_s = s->smobbed_copy (); - Stencil *q = unsmob_stencil (new_s); + Stencil *q = Stencil::unsmob (new_s); q->rotate_degrees (a, Offset (x_off, y_off)); return new_s; } @@ -311,7 +383,7 @@ LY_DEFINE (ly_stencil_rotate_absolute, "ly:stencil-rotate-absolute", "Return a stencil @var{stil} rotated @var{angle} degrees around" " point (@var{x}, @var{y}), given in absolute coordinates.") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); LY_ASSERT_TYPE (scm_is_number, angle, 2); LY_ASSERT_TYPE (scm_is_number, x, 3); @@ -321,7 +393,7 @@ LY_DEFINE (ly_stencil_rotate_absolute, "ly:stencil-rotate-absolute", Real y_off = scm_to_double (y); SCM new_s = s->smobbed_copy (); - Stencil *q = unsmob_stencil (new_s); + Stencil *q = Stencil::unsmob (new_s); q->rotate_degrees_absolute (a, Offset (x_off, y_off)); return new_s; } @@ -388,13 +460,13 @@ LY_DEFINE (ly_stencil_scale, "ly:stencil-scale", "Scale @var{stil} using the horizontal and vertical scaling" " factors @var{x} and @var{y}.") { - Stencil *s = unsmob_stencil (stil); + Stencil *s = Stencil::unsmob (stil); LY_ASSERT_SMOB (Stencil, stil, 1); LY_ASSERT_TYPE (scm_is_number, x, 2); LY_ASSERT_TYPE (scm_is_number, y, 3); SCM new_s = s->smobbed_copy (); - Stencil *q = unsmob_stencil (new_s); + Stencil *q = Stencil::unsmob (new_s); q->scale (scm_to_double (x), scm_to_double (y)); return new_s;