X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=2fad44274d43f0a99c685a143c5598be51dd2f34;hb=6c9c8b25d51b3438b86e453be57f8e15ef856580;hp=a01e13a9aad87c8f672914abf158ed5a1733a1a3;hpb=22ec58a860e744f90ab8900ab00576e5d1a78d16;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index a01e13a9aa..2fad44274d 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -3,44 +3,79 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2006 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-smob.hh" +#include "string-convert.hh" #include "warn.hh" #include "ly-smobs.icc" +Stencil::Stencil () +{ + 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_; +} +Offset +Stencil::origin () const +{ + return origin_; } void @@ -49,11 +84,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); } @@ -65,11 +107,11 @@ Stencil::translate (Offset o) 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); } @@ -77,8 +119,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_); } @@ -92,8 +133,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); } } @@ -101,44 +142,42 @@ 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 (). -*/ +/* 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 +Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, + Real padding, Real minimum) const { - 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::move_to_edge: adding empty stencil."); + programming_error ("Stencil::moved_to_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) + Real offset = (my_extent.is_empty () ? 0.0 : my_extent[d] - his_extent) + d * padding; Stencil toadd (s); - toadd.translate_axis (offset,a); + 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); - if (minimum > 0 - && d *(- origin ()[a] + toadd.origin ()[a]) < minimum) - toadd.translate_axis ( -toadd.origin ()[a] - + origin ()[a] + d* minimum, a); - return toadd; } @@ -147,44 +186,17 @@ 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 (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 -{ - return expr_; -} - -Box -Stencil::extent_box () const -{ - return dim_; -} - -int -Stencil::print_smob (SCM , SCM port, scm_print_state *) -{ - scm_puts ("#", port); - return 1; -} - -SCM -Stencil::mark_smob (SCM s) +Stencil +Stencil::in_color (Real r, Real g, Real b) const { - Stencil *r = (Stencil *) ly_cdr (s); - return r->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; } - -IMPLEMENT_SIMPLE_SMOBS (Stencil); -IMPLEMENT_TYPE_P (Stencil, "ly:stencil?"); -IMPLEMENT_DEFAULT_EQUAL_P (Stencil);