X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=b88b0c8bdebb50581e275babe0a9fdb819e17f23;hb=f9214bac21e9926dc3248416f58190c98c4167a9;hp=35338f0b6c25bf00b05773af7202cf470ff9875f;hpb=14f577bacbfa4eb1f349de40e8f53b866634a0ec;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index 35338f0b6c..b88b0c8bde 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -3,18 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2007 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" @@ -43,7 +39,7 @@ Stencil::print_smob (SCM, SCM port, scm_print_state *) SCM Stencil::mark_smob (SCM smob) { - Stencil *s = (Stencil*) SCM_CELL_WORD_1 (smob); + Stencil *s = (Stencil *) SCM_CELL_WORD_1 (smob); return s->expr_; } @@ -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,43 @@ Stencil::extent_box () const { return dim_; } -Offset -Stencil::origin () const -{ - return origin_; + +/* + * Rotate this stencil around the point [x, y] + */ +void +Stencil::rotate (Real a, Offset 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; + + /* + * 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 @@ -88,12 +117,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; + o[a] = 0.0; + if (strict_infinity_checking) + scm_misc_error (__FUNCTION__, "Improbable offset.", SCM_EOL); } incr (a); } @@ -103,13 +138,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); } @@ -121,8 +155,6 @@ Stencil::add_stencil (Stencil const &s) dim_.unite (s.dim_); } - - void Stencil::set_empty (bool e) { @@ -133,8 +165,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); } } @@ -148,13 +180,9 @@ 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)); @@ -163,7 +191,6 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, { programming_error ("Stencil::moved_to_edge: adding empty stencil."); his_extent = 0.0; - SCM_ASSERT_TYPE(0, SCM_EOL, SCM_ARG1, __FUNCTION__, ""); } else his_extent = i[-d]; @@ -172,150 +199,27 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, + 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)); -} - - -/****************************************************************/ - - -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_2 (head, grob)); - interpret_stencil_expression (scm_caddr (expr), func, func_arg, o); - (*func) (func_arg, scm_list_1 (ly_symbol2scm ("no-origin"))); - 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; - } - } -} - - -struct Font_list -{ - SCM fonts_; -}; - -static void -find_font_function (void *fs, SCM x) -{ - 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_); - } - } -} - -SCM -find_expression_fonts (SCM expr) -{ - Font_list fl; - - fl.fonts_ = SCM_EOL; - - interpret_stencil_expression (expr, &find_font_function, - (void*) &fl, Offset (0,0)); - - return fl.fonts_; -} - - -LY_DEFINE (ly_stencil_fonts, "ly:stencil-fonts", - 1, 0, 0, (SCM s), - " Analyse @var{s}, and return a list of fonts used in @var{s}.") -{ - Stencil *stil = unsmob_stencil (s); - SCM_ASSERT_TYPE (stil, s, SCM_ARG1, __FUNCTION__, "Stencil"); - return find_expression_fonts (stil->expr ()); + toadd.translate_axis (offset, a); + add_stencil (toadd); } -struct Stencil_interpret_arguments -{ - SCM func; - SCM arg1; -}; - -void stencil_interpret_in_scm (void *p, SCM expr) +Stencil +Stencil::in_color (Real r, Real g, Real b) const { - Stencil_interpret_arguments *ap = (Stencil_interpret_arguments*) p; - scm_call_2 (ap->func, ap->arg1, 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; } - - -LY_DEFINE (ly_interpret_stencil_expression, "ly:interpret-stencil-expression", - 4, 0, 0, (SCM expr, SCM func, SCM arg1, SCM offset), - "Parse EXPR, feed bits to FUNC with first arg ARG1") +/* convenience */ +Stencil +Stencil::translated (Offset z) const { - SCM_ASSERT_TYPE (ly_c_procedure_p(func), func, SCM_ARG1, __FUNCTION__, - "procedure"); - - Stencil_interpret_arguments a; - a.func = func; - a.arg1 = arg1; - Offset o = ly_scm2offset (offset); - - interpret_stencil_expression (expr, stencil_interpret_in_scm, (void*) &a, o); - - return SCM_UNSPECIFIED; + Stencil s (*this); + s.translate (z); + return s; } -