X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=25c7e15cf58c82592202100702659028e04ec166;hb=81b5ad4f11cdb296c69fcd2259effbc75a3c9054;hp=dd3bb2626ea93f5559672a062c1a6769dc3726f0;hpb=68d7330f72a14a8df49c49ed1566179248096092;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index dd3bb2626e..25c7e15cf5 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -1,16 +1,27 @@ /* - stencil.cc -- implement Stencil + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2006 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "stencil.hh" #include "main.hh" #include "font-metric.hh" -#include "input-smob.hh" +#include "input.hh" #include "string-convert.hh" #include "warn.hh" @@ -57,8 +68,8 @@ bool Stencil::is_empty () const { return (expr_ == SCM_EOL - || dim_[X_AXIS].is_empty () - || dim_[Y_AXIS].is_empty ()); + || dim_[X_AXIS].is_empty () + || dim_[Y_AXIS].is_empty ()); } SCM @@ -72,48 +83,72 @@ Stencil::extent_box () const { return dim_; } -Offset -Stencil::origin () const + +void +Stencil::rotate (Real a, Offset off) { - return origin_; + rotate_degrees (a * 180 / M_PI, off); } /* - * Rotate this stencil around the point [x, y] + Rotate this stencil around the point ABSOLUTE_OFF. + */ void -Stencil::rotate (Real a, Offset off) +Stencil::rotate_degrees_absolute (Real a, Offset absolute_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 + off[X_AXIS] * x_cen; - const Real y = y_cen + off[Y_AXIS] * y_cen; + 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); + 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 (-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)); + 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 + Offset (x_cen, y_cen)); + 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 @@ -123,27 +158,26 @@ Stencil::translate (Offset o) while (a < NO_AXES) { 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); - } + || 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); } 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 @@ -154,6 +188,17 @@ Stencil::translate_axis (Real x, Axis a) translate (o); } +void +Stencil::scale (Real x, Real y) +{ + expr_ = scm_list_3 (ly_symbol2scm ("scale-stencil"), + scm_list_2 (scm_from_double (x), + scm_from_double (y)), + expr_); + dim_[X_AXIS] *= x; + dim_[Y_AXIS] *= y; +} + void Stencil::add_stencil (Stencil const &s) { @@ -186,55 +231,46 @@ 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]; Real offset = (my_extent.is_empty () ? 0.0 : my_extent[d] - his_extent) - + d * padding; + + 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)); + add_stencil (toadd); } Stencil Stencil::in_color (Real r, Real g, Real b) const { 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 ())); + 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; } + +/* convenience */ +Stencil +Stencil::translated (Offset z) const +{ + Stencil s (*this); + s.translate (z); + return s; +}