X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstencil.cc;h=9083737560bf5aeaa0ac9e07f70342bedc6afe37;hb=207c3df3b77d5ec25d7db3bbc6ba830d12ee9f85;hp=e1091525824c2f4552b6450382d01c33900b6af9;hpb=25b213ce648ba00918e97d94ce3e022d90f38c46;p=lilypond.git diff --git a/lily/stencil.cc b/lily/stencil.cc index e109152582..9083737560 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -3,18 +3,16 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include -#include // isinf +#include "stencil.hh" + -#include "input.hh" -#include "font-metric.hh" #include "dimensions.hh" -#include "interval.hh" -#include "string.hh" -#include "stencil.hh" +#include "font-metric.hh" +#include "input-smob.hh" +#include "string-convert.hh" #include "warn.hh" #include "ly-smobs.icc" @@ -42,7 +40,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_; } @@ -56,12 +54,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 @@ -87,11 +85,16 @@ 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; } incr (a); } @@ -103,11 +106,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); } @@ -129,8 +132,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); } } @@ -138,7 +141,7 @@ void Stencil::align_to (Axis a, Real x) { if (is_empty ()) - return ; + return; Interval i (extent (a)); translate_axis (-i.linear_combination (x), a); @@ -159,6 +162,7 @@ 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, s.expr (), SCM_ARG1, __FUNCTION__, "non-empty stencil"); } else his_extent = i[-d]; @@ -167,11 +171,11 @@ Stencil::moved_to_edge (Axis a, Direction d, Stencil const &s, + 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); + toadd.translate_axis (-toadd.origin ()[a] + + origin ()[a] + d * minimum, a); return toadd; } @@ -184,99 +188,14 @@ Stencil::add_at_edge (Axis a, Direction d, Stencil const &s, Real padding, add_stencil (moved_to_edge (a, d, s, padding, minimum)); } - -/****************************************************************/ - -void -interpret_stencil_expr (SCM expr, - void (*func) (void*, SCM), - void *func_arg, - Offset o) -{ - while (1) - { - if (!ly_c_pair_p (expr)) - return; - - SCM head =ly_car (expr); - if (unsmob_input (head)) - { - Input *ip = unsmob_input (head); - (*func)(func_arg, - scm_list_4 (ly_symbol2scm ("define-origin"), - scm_makfrom0str (ip->file_string () - .to_str0 ()), - scm_int2num (ip->line_number ()), - scm_int2num (ip->column_number ()))); - - expr = ly_cadr (expr); - } - else if (head == ly_symbol2scm ("no-origin")) - { - (*func) (func_arg, scm_list_1 (head)); - expr = ly_cadr (expr); - } - else if (head == ly_symbol2scm ("translate-stencil")) - { - o += ly_scm2offset (ly_cadr (expr)); - expr = ly_caddr (expr); - } - else if (head == ly_symbol2scm ("combine-stencil")) - { - interpret_stencil_expr (ly_cadr (expr), func, func_arg, o); - expr = ly_caddr (expr); - } - 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 list_; -}; - -static void -find_font_function (void * fs, SCM x) -{ - Font_struct * me = (Font_struct*)fs; - - if (ly_car (x) == ly_symbol2scm ("placebox")) - { - SCM args = ly_cdr (x); - SCM what = ly_caddr (x); - - if (ly_c_pair_p (what)) - { - SCM head = ly_car (what); - if (ly_symbol2scm ("text") == head) - me->fonts_ = scm_cons (ly_cadr (what), me->fonts_); - else if (head == ly_symbol2scm ("char")) - me->fonts_ = scm_cons (ly_cadr (what), me->fonts_); - } - } -} - -LY_DEFINE(ly_stencil_fonts, "ly:stencil-fonts", - 1,0,0, (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"); - Font_list fl; - - fl.list_ = SCM_EOL; - - interpret_stencil_expr (stil.expr (), &find_font_function, - (void*) &fl, Offset (0,0)); - - return fl.list_; +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 ())); + return new_stencil; }