X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=a6ab40d9093fcc1f58d4120be8a2f92da0a12783;hb=85902ccc9c481c2f992676ecff060e05caffef8f;hp=0cd364d81d2d8842f6a712e60bd5a4c1b447fe92;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 0cd364d81d..a6ab40d909 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "staff-symbol.hh" @@ -16,29 +16,28 @@ #include "staff-symbol-referencer.hh" #include "spanner.hh" -MAKE_SCHEME_CALLBACK (Staff_symbol,print,1); +MAKE_SCHEME_CALLBACK (Staff_symbol, print, 1); SCM Staff_symbol::print (SCM smob) { Grob *me = unsmob_grob (smob); - Spanner* sp = dynamic_cast (me); - Grob * common + Spanner *sp = dynamic_cast (me); + Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS); - - Interval span_points (0,0); - + + Interval span_points (0, 0); /* - For raggedright without ragged staffs, simply set width to the linewidth. + For raggedright without ragged staves, simply set width to the linewidth. (ok -- lousy UI, since width is in staff spaces) --hwn. - */ - Real t = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); + */ + Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); t *= robust_scm2double (me->get_property ("thickness"), 1.0); - + Direction d = LEFT; do { @@ -49,50 +48,66 @@ Staff_symbol::print (SCM smob) 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); + Item *x = sp->get_bound (d); - span_points[d] = x->relative_coordinate (common , X_AXIS); + 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; + span_points[d] -= d* t / 2; } - while (flip (&d) !=LEFT); + while (flip (&d) != LEFT); + Stencil m; - int l = Staff_symbol::line_count (me); - - Real height = (l-1) * staff_space (me) /2; - Stencil a = - Lookup::horizontal_line (span_points - -me->relative_coordinate (common, X_AXIS), - t); + SCM line_positions = me->get_property ("line-positions"); + Stencil line + = Lookup::horizontal_line (span_points + -me->relative_coordinate (common, X_AXIS), + t); - Stencil m; - for (int i= 0; i < l; i++) + Real space = staff_space (me); + if (scm_is_pair (line_positions)) { - Stencil b(a); - b.translate_axis (height - i * staff_space (me), Y_AXIS); - m.add_stencil (b); + 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::get_steps (Grob*me) +Staff_symbol::get_steps (Grob *me) { return line_count (me) * 2; } int -Staff_symbol::line_count (Grob*me) +Staff_symbol::line_count (Grob *me) { SCM c = me->get_property ("line-count"); if (scm_is_number (c)) @@ -102,35 +117,73 @@ Staff_symbol::line_count (Grob*me) } Real -Staff_symbol::staff_space (Grob*me) +Staff_symbol::staff_space (Grob *me) { return robust_scm2double (me->get_property ("staff-space"), 1.0); } Real -Staff_symbol::get_line_thickness (Grob* me) +Staff_symbol::get_line_thickness (Grob *me) { - Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); + Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness")); return robust_scm2double (me->get_property ("thickness"), 1.0) * lt; } Real -Staff_symbol::get_ledger_line_thickness (Grob * me) +Staff_symbol::get_ledger_line_thickness (Grob *me) { 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); - return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS]* staff_space (me); + 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,"staff-symbol-interface", + + +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. ", - - "ledger-line-thickness width staff-space thickness line-count"); + + + /* properties */ + "ledger-line-thickness " + "line-count " + "line-positions " + "staff-space " + "thickness " + "width " + );