X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=a6ab40d9093fcc1f58d4120be8a2f92da0a12783;hb=9a4a902c3241341e0ffe7006eb17158651a15c34;hp=ff2bfe4a8660c4abb6c328c933a4a2d71af7df88;hpb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;p=lilypond.git diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index ff2bfe4a86..a6ab40d909 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -3,83 +3,187 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ +#include "staff-symbol.hh" + #include "lookup.hh" #include "dimensions.hh" -#include "paper-def.hh" -#include "molecule.hh" -#include "debug.hh" +#include "output-def.hh" +#include "warn.hh" #include "item.hh" -#include "staff-symbol.hh" +#include "staff-symbol-referencer.hh" #include "spanner.hh" - - -MAKE_SCHEME_CALLBACK(Staff_symbol,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Staff_symbol, print, 1); SCM -Staff_symbol::brew_molecule (SCM smob) +Staff_symbol::print (SCM smob) { - Score_element *me = unsmob_element (smob); - Spanner* sp = dynamic_cast (me); - Score_element * common + Grob *me = unsmob_grob (smob); + Spanner *sp = dynamic_cast (me); + Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS); - - Real width = - // right_shift - left_shift - + sp->get_bound (RIGHT)->relative_coordinate (common , X_AXIS) - - sp->get_bound (LEFT)->relative_coordinate (common, X_AXIS) - ; - - Real t = me->paper_l ()->get_var ("stafflinethickness"); - int l = Staff_symbol::line_count (me); - - Real height = (l-1) * staff_space (me) /2; - Molecule m; - for (int i=0; i < l; i++) + + Interval span_points (0, 0); + + /* + For raggedright without ragged staves, simply set width to the linewidth. + + (ok -- lousy UI, since width is in staff spaces) + + --hwn. + */ + Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + t *= robust_scm2double (me->get_property ("thickness"), 1.0); + + Direction d = LEFT; + do { - Molecule a = - Lookup::filledbox (Box (Interval (0,width), - Interval (-t/2, t/2))); + SCM width_scm = me->get_property ("width"); + if (d == RIGHT && scm_is_number (width_scm)) + { + /* + don't multiply by Staff_symbol_referencer::staff_space (me), + since that would make aligning staff symbols of different sizes to + one right margin hell. + */ + span_points[RIGHT] = scm_to_double (width_scm); + } + else + { + Item *x = sp->get_bound (d); - a.translate_axis (height - i * staff_space (me), Y_AXIS); - m.add_molecule (a); + span_points[d] = x->relative_coordinate (common, X_AXIS); + if (!x->break_status_dir () + && !x->extent (x, X_AXIS).is_empty ()) + span_points[d] += x->extent (x, X_AXIS)[d]; + } + + span_points[d] -= d* t / 2; } + while (flip (&d) != LEFT); + + Stencil m; + + SCM line_positions = me->get_property ("line-positions"); + Stencil line + = Lookup::horizontal_line (span_points + -me->relative_coordinate (common, X_AXIS), + t); - return m.create_scheme(); + Real space = staff_space (me); + if (scm_is_pair (line_positions)) + { + for (SCM s = line_positions; scm_is_pair (s); + s = scm_cdr (s)) + { + Stencil b (line); + b.translate_axis (scm_to_double (scm_car (s)) + * 0.5 * space, Y_AXIS); + m.add_stencil (b); + } + } + else + { + int l = Staff_symbol::line_count (me); + Real height = (l - 1) * staff_space (me) / 2; + for (int i = 0; i < l; i++) + { + Stencil b (line); + b.translate_axis (height - i * space, Y_AXIS); + m.add_stencil (b); + } + } + return m.smobbed_copy (); } + int -Staff_symbol::steps_i(Score_element*me) +Staff_symbol::get_steps (Grob *me) { return line_count (me) * 2; } int -Staff_symbol::line_count (Score_element*me) +Staff_symbol::line_count (Grob *me) { - SCM c = me->get_elt_property ("line-count"); - if (gh_number_p (c)) - return gh_scm2int (c); + SCM c = me->get_property ("line-count"); + if (scm_is_number (c)) + return scm_to_int (c); else return 0; } Real -Staff_symbol::staff_space (Score_element*me ) +Staff_symbol::staff_space (Grob *me) { - Real ss = me->paper_l ()->get_var ("staffspace"); - - SCM s = me->get_elt_property ("staff-space"); - if (gh_number_p (s)) - ss *= gh_scm2double (s); - return ss; + return robust_scm2double (me->get_property ("staff-space"), 1.0); +} + +Real +Staff_symbol::get_line_thickness (Grob *me) +{ + Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + + return robust_scm2double (me->get_property ("thickness"), 1.0) * lt; } -bool -Staff_symbol::has_interface (Score_element*m) +Real +Staff_symbol::get_ledger_line_thickness (Grob *me) { - return m && m->has_interface (ly_symbol2scm ("staff-symbol-interface")); + SCM lt_pair = me->get_property ("ledger-line-thickness"); + Offset z = robust_scm2offset (lt_pair, Offset (1.0, 0.1)); + + return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS] * staff_space (me); } + +MAKE_SCHEME_CALLBACK (Staff_symbol, height,1); +SCM +Staff_symbol::height (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + t *= robust_scm2double (me->get_property ("thickness"), 1.0); + + SCM line_positions = me->get_property ("line-positions"); + + Interval y_ext; + Real space = staff_space (me); + if (scm_is_pair (line_positions)) + { + for (SCM s = line_positions; scm_is_pair (s); + s = scm_cdr (s)) + y_ext.add_point (scm_to_double (scm_car (s)) * 0.5 * space); + } + else + { + int l = Staff_symbol::line_count (me); + Real height = (l - 1) * staff_space (me) / 2; + y_ext = Interval (-height, height); + } + y_ext.widen (t/2); + return ly_interval2scm (y_ext); +} + + + + +ADD_INTERFACE (Staff_symbol, + "This spanner draws the lines of a staff. " + "A staff symbol definines a vertical unit, the staff space. " + "Quantities that go by a half staff space are called positions " + "The center (i.e. middle line " + "or space) is position 0. The length of the symbol may be set by hand " + "through the @code{width} property. ", + + + /* properties */ + "ledger-line-thickness " + "line-count " + "line-positions " + "staff-space " + "thickness " + "width " + );