X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=f80a5c57741dfc1c2523f403fa809149c370d8d3;hb=0dcc93c0a5a97d048db2f7631966f41ae0059ab5;hp=4d186e87bfc4e03f5936ce50a5387de5776c11f2;hpb=8f8b3fb62d5d0776335de899b32aada69457810a;p=lilypond.git diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 4d186e87bf..f80a5c5774 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -1,9 +1,20 @@ /* - staff-symbol.cc -- implement Staff_symbol + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Han-Wen Nienhuys - (c) 1997--2005 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "staff-symbol.hh" @@ -29,13 +40,13 @@ Staff_symbol::print (SCM smob) 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->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; @@ -43,42 +54,58 @@ Staff_symbol::print (SCM smob) { 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); - } + { + /* + 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); - if (!x->break_status_dir () - && !x->extent (x, X_AXIS).is_empty ()) - span_points[d] += x->extent (x, X_AXIS)[d]; - } + 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); - int l = Staff_symbol::line_count (me); + Stencil m; - Real height = (l - 1) * staff_space (me) / 2; - Stencil a + SCM line_positions = me->get_property ("line-positions"); + Stencil line = Lookup::horizontal_line (span_points - -me->relative_coordinate (common, X_AXIS), - t); + - 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 (); } @@ -108,7 +135,7 @@ Staff_symbol::staff_space (Grob *me) Real Staff_symbol::get_line_thickness (Grob *me) { - Real lt = me->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; } @@ -122,12 +149,95 @@ Staff_symbol::get_ledger_line_thickness (Grob *me) return z[X_AXIS] * get_line_thickness (me) + z[Y_AXIS] * staff_space (me); } -ADD_INTERFACE (Staff_symbol, "staff-symbol-interface", - "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. ", +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); +} + +bool +Staff_symbol::on_line (Grob *me, int pos) +{ + SCM line_positions = me->get_property ("line-positions"); + if (scm_is_pair (line_positions)) + { + Real min_line = HUGE_VAL; + Real max_line = -HUGE_VAL; + for (SCM s = line_positions; scm_is_pair (s); s = scm_cdr (s)) + { + Real current_line = scm_to_double (scm_car (s)); + if (pos == current_line) + return true; + if (current_line > max_line) + max_line = current_line; + if (current_line < min_line) + min_line = current_line; + + } + if (pos < min_line) + return (( (int) (rint (pos - min_line)) % 2) == 0); + if (pos > max_line) + return (( (int) (rint (pos - max_line)) % 2) == 0); + + return false; + } + else + return ((abs (pos + line_count (me)) % 2) == 1); +} + +Interval +Staff_symbol::line_span (Grob *me) +{ + SCM line_positions = me->get_property ("line-positions"); + Interval iv; + + if (scm_is_pair (line_positions)) + for (SCM s = line_positions; scm_is_pair (s); s = scm_cdr (s)) + iv.add_point (scm_to_double (scm_car (s))); + else + { + int count = line_count (me); + return Interval (-count + 1, count - 1); + } + + return iv; +} - "ledger-line-thickness width staff-space thickness line-count"); +ADD_INTERFACE (Staff_symbol, + "This spanner draws the lines of a staff. A staff symbol" + " defines a vertical unit, the @emph{staff space}. Quantities" + " that go by a half staff space are called @emph{positions}." + " The center (i.e., middle line or space) is position@tie{}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 " + );