X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=c241fa18c271b4b08169780c85f63eb4d1ddfef6;hb=7c624620feabb74e0619cfc2d26c1d14834ffa73;hp=5e102dd5fc0a99cddaf03185f35848764b3ee2c5;hpb=f2541abbfdbed6bf32db3b7eaa62baae33710b04;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index 5e102dd5fc..c241fa18c2 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -3,18 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "stencil.hh" -#include - -#include // isinf - -#include "input-smob.hh" +#include "main.hh" #include "font-metric.hh" -#include "dimensions.hh" +#include "input.hh" #include "string-convert.hh" #include "warn.hh" @@ -57,12 +53,12 @@ Stencil::extent (Axis a) const return dim_[a]; } -/* Hmm... maybe this is not such a good idea ; stuff can be empty, - while expr_ == '() */ bool Stencil::is_empty () const { - return expr_ == SCM_EOL; + return (expr_ == SCM_EOL + || dim_[X_AXIS].is_empty () + || dim_[Y_AXIS].is_empty ()); } SCM @@ -76,10 +72,72 @@ Stencil::extent_box () const { return dim_; } -Offset -Stencil::origin () const + +void +Stencil::rotate (Real a, Offset off) +{ + rotate_degrees (a * 180/M_PI, off); +} + +/* + Rotate this stencil around the point ABSOLUTE_OFF. + + */ +void +Stencil::rotate_degrees_absolute (Real a, Offset absolute_off) +{ + const Real x = absolute_off[X_AXIS]; + const Real y = absolute_off[Y_AXIS]; + + /* + * Build scheme expression (processed in stencil-interpret.cc) + */ + /* TODO: by hanwenn 2008/09/10 14:38:56: + * in effect, this copies the underlying expression. It might be a + * little bit nicer to mirror this in the api, ie. make a + * Stencil::rotated() + * and have Stencil::rotate be an abbrev of + * *this = rotated() + */ + + expr_ = scm_list_n (ly_symbol2scm ("rotate-stencil"), + scm_list_2 (scm_from_double (a), + scm_cons (scm_from_double (x), scm_from_double (y))), + expr_, SCM_UNDEFINED); + + /* + * Calculate the new bounding box + */ + Box shifted_box = extent_box (); + shifted_box.translate (-absolute_off); + + vector pts; + pts.push_back (Offset (shifted_box.x ().at(LEFT), shifted_box.y ().at(DOWN))); + pts.push_back (Offset (shifted_box.x ().at(RIGHT), shifted_box.y ().at(DOWN))); + pts.push_back (Offset (shifted_box.x ().at(RIGHT), shifted_box.y ().at(UP))); + pts.push_back (Offset (shifted_box.x ().at(LEFT), shifted_box.y ().at(UP))); + + const Offset rot = complex_exp (Offset (0, a * M_PI / 180.0)); + dim_.set_empty (); + for (vsize i = 0; i < pts.size (); i++) + dim_.add_point (pts[i] * rot + absolute_off); +} + +/* + Rotate this stencil around the point RELATIVE_OFF. + + RELATIVE_OFF is measured in terms of the extent of the stencil, so + -1 = LEFT/DOWN edge, 1 = RIGHT/UP edge. + */ +void +Stencil::rotate_degrees (Real a, Offset relative_off) { - return origin_; + /* + * Calculate the center of rotation + */ + const Real x = extent (X_AXIS).linear_combination (relative_off[X_AXIS]); + const Real y = extent (Y_AXIS).linear_combination (relative_off[Y_AXIS]); + rotate_degrees_absolute (a, Offset (x, y)); } void @@ -88,12 +146,18 @@ Stencil::translate (Offset o) Axis a = X_AXIS; while (a < NO_AXES) { - if (isinf (o[a]) || isnan (o[a])) + if (isinf (o[a]) + || isnan (o[a]) + + // ugh, hardcoded. + || fabs (o[a]) > 1e6) { programming_error (String_convert::form_string ("Improbable offset for stencil: %f staff space", o[a]) + "\n" + "Setting to zero."); o[a] = 0.0; + if (strict_infinity_checking) + scm_misc_error (__FUNCTION__, "Improbable offset.", SCM_EOL); } incr (a); } @@ -103,7 +167,6 @@ Stencil::translate (Offset o) expr_, SCM_UNDEFINED); if (!is_empty ()) dim_.translate (o); - origin_ += o; } void @@ -146,22 +209,17 @@ Stencil::align_to (Axis a, Real x) translate_axis (-i.linear_combination (x), a); } -/* FIXME: unintuitive naming, you would expect *this to be moved. - Kept (keeping?) API for compat with add_at_edge (). - - What is PADDING, what is MINIMUM, exactly? */ -Stencil -Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, - Real padding, Real minimum) const +/* See scheme Function. */ +void +Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding) { Interval my_extent = dim_[a]; Interval i (s.extent (a)); Real his_extent; if (i.is_empty ()) { - programming_error ("Stencil::moved_to_edge: adding empty stencil."); + programming_error ("Stencil::add_at_edge: adding empty stencil."); his_extent = 0.0; - // SCM_ASSERT_TYPE (0, s.expr (), SCM_ARG1, __FUNCTION__, "non-empty stencil"); } else his_extent = i[-d]; @@ -171,119 +229,26 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, Stencil toadd (s); toadd.translate_axis (offset, a); - - if (minimum > 0 && d * (-origin ()[a] + toadd.origin ()[a]) < minimum) - toadd.translate_axis (-toadd.origin ()[a] - + origin ()[a] + d * minimum, a); - - return toadd; -} - -/* See scheme Function. */ -void -Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding, - Real minimum) -{ - add_stencil (moved_to_edge (a, d, s, padding, minimum)); -} - -/****************************************************************/ - -void -interpret_stencil_expression (SCM expr, - void (*func) (void *, SCM), - void *func_arg, - Offset o) -{ - while (1) - { - if (!scm_is_pair (expr)) - return; - - SCM head = scm_car (expr); - - if (head == ly_symbol2scm ("translate-stencil")) - { - o += ly_scm2offset (scm_cadr (expr)); - expr = scm_caddr (expr); - } - else if (head == ly_symbol2scm ("combine-stencil")) - { - for (SCM x = scm_cdr (expr); scm_is_pair (x); x = scm_cdr (x)) - interpret_stencil_expression (scm_car (x), func, func_arg, o); - return; - } - else if (head == ly_symbol2scm ("grob-cause")) - { - SCM grob = scm_cadr (expr); - - (*func) (func_arg, scm_list_3 (head, - ly_quote_scm (ly_offset2scm (o)), grob)); - interpret_stencil_expression (scm_caddr (expr), func, func_arg, o); - (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin"))); - return; - } - else if (head == ly_symbol2scm ("color")) - { - SCM color = scm_cadr (expr); - SCM r = scm_car (color); - SCM g = scm_cadr (color); - SCM b = scm_caddr (color); - - (*func) (func_arg, scm_list_4 (ly_symbol2scm ("setcolor"), r, g, b)); - interpret_stencil_expression (scm_caddr (expr), func, func_arg, o); - (*func) (func_arg, scm_list_1 (ly_symbol2scm ("resetcolor"))); - - return; - } - else - { - (*func) (func_arg, - scm_list_4 (ly_symbol2scm ("placebox"), - scm_make_real (o[X_AXIS]), - scm_make_real (o[Y_AXIS]), - expr)); - return; - } - } + add_stencil (toadd); } -struct Font_list -{ - SCM fonts_; -}; - -static void -find_font_function (void *fs, SCM x) +Stencil +Stencil::in_color (Real r, Real g, Real b) const { - Font_list *me = (Font_list *) fs; - - if (scm_car (x) == ly_symbol2scm ("placebox")) - { - SCM args = scm_cdr (x); - SCM what = scm_caddr (args); - - if (scm_is_pair (what)) - { - SCM head = scm_car (what); - if (ly_symbol2scm ("text") == head) - me->fonts_ = scm_cons (scm_cadr (what), me->fonts_); - else if (head == ly_symbol2scm ("char")) - me->fonts_ = scm_cons (scm_cadr (what), me->fonts_); - } - } + Stencil new_stencil (extent_box (), + scm_list_3 (ly_symbol2scm ("color"), + scm_list_3 (scm_from_double (r), + scm_from_double (g), + scm_from_double (b)), + expr ())); + return new_stencil; } -SCM -find_expression_fonts (SCM expr) +/* convenience */ +Stencil +Stencil::translated (Offset z) const { - Font_list fl; - - fl.fonts_ = SCM_EOL; - - interpret_stencil_expression (expr, &find_font_function, - (void *) &fl, Offset (0, 0)); - - return fl.fonts_; + Stencil s (*this); + s.translate (z); + return s; } -