X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=3b92b558007aa71ba77383e83cb709ddc1ce049f;hb=4063c4f664e044181e416857e999cb07391c3e33;hp=9acbc8dc0a03ecbacfc9bf5f97eba35d5468ef58;hpb=1a42c5af9e1b0f27e8250ccefa1b204a359cbf12;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index 9acbc8dc0a..3b92b55800 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -3,50 +3,121 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2007 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" -SCM -Stencil::smobbed_copy () const +Stencil::Stencil () { - Stencil *s = new Stencil (*this); - return s->smobbed_self (); + expr_ = SCM_EOL; + set_empty (true); } -Offset -Stencil::origin () const +Stencil::Stencil (Box b, SCM func) { - return origin_; + expr_ = func; + dim_ = b; } +int +Stencil::print_smob (SCM, SCM port, scm_print_state *) +{ + scm_puts ("#", port); + return 1; +} + +SCM +Stencil::mark_smob (SCM smob) +{ + Stencil *s = (Stencil *) SCM_CELL_WORD_1 (smob); + return s->expr_; +} + +IMPLEMENT_SIMPLE_SMOBS (Stencil); +IMPLEMENT_TYPE_P (Stencil, "ly:stencil?"); +IMPLEMENT_DEFAULT_EQUAL_P (Stencil); + Interval Stencil::extent (Axis a) const { return dim_[a]; } -Stencil::Stencil (Box b, SCM func) +bool +Stencil::is_empty () const { - expr_ = func; - dim_ = b; + return (expr_ == SCM_EOL + || dim_[X_AXIS].is_empty () + || dim_[Y_AXIS].is_empty ()); } -Stencil::Stencil () +SCM +Stencil::expr () const { - expr_ = SCM_EOL; - set_empty (true); + return expr_; +} + +Box +Stencil::extent_box () const +{ + return dim_; +} + +void +Stencil::rotate (Real a, Offset off) +{ + rotate_degrees (a * 180/M_PI, 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) +{ + const Real x_cen = extent (X_AXIS).center (); + const Real y_cen = extent (Y_AXIS).center (); + + /* + * Calculate the center of rotation + */ + const Real x = x_cen + relative_off[X_AXIS] * x_cen; + const Real y = y_cen + relative_off[Y_AXIS] * y_cen; + + /* + * Build scheme expression (processed in stencil-interpret.cc) + */ + 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 + */ + vector pts; + pts.push_back (Offset (-x_cen, -y_cen)); + pts.push_back (Offset (x_cen, -y_cen)); + pts.push_back (Offset (x_cen, y_cen)); + pts.push_back (Offset (-x_cen, y_cen)); + + 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 + Offset (x_cen, y_cen)); } void @@ -55,27 +126,33 @@ 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); } expr_ = scm_list_n (ly_symbol2scm ("translate-stencil"), - ly_offset2scm (o), - expr_, SCM_UNDEFINED); + ly_offset2scm (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); } @@ -83,8 +160,7 @@ Stencil::translate_axis (Real x, Axis a) void Stencil::add_stencil (Stencil const &s) { - expr_ = scm_list_n (ly_symbol2scm ("combine-stencil"), - s.expr_, expr_, SCM_UNDEFINED); + expr_ = scm_list_3 (ly_symbol2scm ("combine-stencil"), s.expr_, expr_); dim_.unite (s.dim_); } @@ -98,8 +174,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); } } @@ -107,87 +183,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); } -/* - TODO: unintuitive naming, you would expect *this to be moved. Kept - 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) { - Real my_extent= is_empty () ? 0.0 : dim_[a][d]; + Interval my_extent = dim_[a]; Interval i (s.extent (a)); Real his_extent; if (i.is_empty ()) { - programming_error ("Stencil::move_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 - his_extent) + d * padding; + 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; -} - -/* 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; + toadd.translate_axis (offset, a); + add_stencil (toadd); } -SCM -Stencil::get_expr () const -{ - return expr_; -} - -Box -Stencil::extent_box () const -{ - return dim_; -} - -int -Stencil::print_smob (SCM , SCM port, scm_print_state *) +Stencil +Stencil::in_color (Real r, Real g, Real b) const { - scm_puts ("#", port); - return 1; + 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 -Stencil::mark_smob (SCM s) +/* convenience */ +Stencil +Stencil::translated (Offset z) const { - Stencil *r = (Stencil *) ly_cdr (s); - return r->expr_; + Stencil s (*this); + s.translate (z); + return s; } - -IMPLEMENT_SIMPLE_SMOBS (Stencil); -IMPLEMENT_TYPE_P (Stencil, "ly:stencil?"); -IMPLEMENT_DEFAULT_EQUAL_P (Stencil);