X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=c241fa18c271b4b08169780c85f63eb4d1ddfef6;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=f1cab5ba1cc015f9aeb506678946dd9b6d81bd5c;hpb=e87d9c881c1ac0dc5d243c7a0f62cb41a02bb3b8;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index f1cab5ba1c..c241fa18c2 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -3,17 +3,15 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ -#include -#include // isinf - -#include "font-metric.hh" -#include "dimensions.hh" -#include "interval.hh" -#include "string.hh" #include "stencil.hh" + +#include "main.hh" +#include "font-metric.hh" +#include "input.hh" +#include "string-convert.hh" #include "warn.hh" #include "ly-smobs.icc" @@ -41,7 +39,7 @@ Stencil::print_smob (SCM, SCM port, scm_print_state *) SCM Stencil::mark_smob (SCM smob) { - Stencil *s = (Stencil*) ly_cdr (smob); + Stencil *s = (Stencil *) SCM_CELL_WORD_1 (smob); return s->expr_; } @@ -55,10 +53,91 @@ Stencil::extent (Axis a) const return dim_[a]; } -Offset -Stencil::origin () const +bool +Stencil::is_empty () const +{ + return (expr_ == SCM_EOL + || dim_[X_AXIS].is_empty () + || dim_[Y_AXIS].is_empty ()); +} + +SCM +Stencil::expr () const +{ + return expr_; +} + +Box +Stencil::extent_box () const +{ + return dim_; +} + +void +Stencil::rotate (Real a, Offset off) { - return origin_; + 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) +{ + /* + * 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 @@ -67,11 +146,18 @@ Stencil::translate (Offset o) Axis a = X_AXIS; while (a < NO_AXES) { - if (abs (o[a]) > 100 CM - || isinf (o[a]) || isnan (o[a])) + if (isinf (o[a]) + || isnan (o[a]) + + // ugh, hardcoded. + || fabs (o[a]) > 1e6) { - programming_error ("Improbable offset for translation: setting to zero"); - o[a] = 0.0; + 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); } @@ -81,13 +167,12 @@ Stencil::translate (Offset o) expr_, SCM_UNDEFINED); if (!is_empty ()) dim_.translate (o); - origin_ += o; } - + void Stencil::translate_axis (Real x, Axis a) { - Offset o (0,0); + Offset o (0, 0); o[a] = x; translate (o); } @@ -109,8 +194,8 @@ Stencil::set_empty (bool e) } else { - dim_[X_AXIS] = Interval (0,0); - dim_[Y_AXIS] = Interval (0,0); + dim_[X_AXIS] = Interval (0, 0); + dim_[Y_AXIS] = Interval (0, 0); } } @@ -118,69 +203,52 @@ void Stencil::align_to (Axis a, Real x) { if (is_empty ()) - return ; + return; Interval i (extent (a)); 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 (). */ -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 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; } else his_extent = i[-d]; - Real offset = (my_extent. is_empty () ? 0.0 : my_extent[d] - his_extent) + Real offset = (my_extent.is_empty () ? 0.0 : my_extent[d] - his_extent) + d * padding; 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; + toadd.translate_axis (offset, a); + add_stencil (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)); -} - -/* Hmm... maybe this is not such a good idea ; stuff can be empty, - while expr_ == '() */ -bool -Stencil::is_empty () const -{ - return expr_ == SCM_EOL; -} - -SCM -Stencil::get_expr () const +Stencil +Stencil::in_color (Real r, Real g, Real b) const { - return expr_; + 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; } -Box -Stencil::extent_box () const +/* convenience */ +Stencil +Stencil::translated (Offset z) const { - return dim_; + Stencil s (*this); + s.translate (z); + return s; }