X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=02b29858af1465d042c0c16d6f57c967e82f0f27;hb=90cbea4bb9a398033b6ede5e6175d53546ace20c;hp=ff34cc61133d93bc7ba1e2ebada35c29e4df11ab;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index ff34cc6113..02b29858af 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -1,32 +1,35 @@ /* - breathing_sign.cc -- implement Breathing_sign + This file is part of LilyPond, the GNU music typesetter. - (c) 1999--2005 Michael Krause + Copyright (C) 1999--2012 Michael Krause + Extensions for ancient notation (c) 2003--2012 by Juergen Reuter - written for the GNU LilyPond music typesetter + 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. - TODO: --> see breathing-sign-engraver.cc + 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. - Extensions for ancient notation (c) 2003--2005 by Juergen Reuter + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "breathing-sign.hh" -#include "staff-symbol-referencer.hh" -#include "directional-element-interface.hh" -#include "output-def.hh" -#include "lookup.hh" #include "dimensions.hh" #include "direction.hh" -#include "text-item.hh" +#include "directional-element-interface.hh" #include "font-interface.hh" - -/* - TODO: thickness should be a grob property (unit: linethickness) - rather than hardwired to (staff_space / 6). - */ - - +#include "grob.hh" +#include "lookup.hh" +#include "output-def.hh" +#include "staff-symbol.hh" +#include "staff-symbol-referencer.hh" +#include "text-interface.hh" /* UGH : this is full of C&P code. Consolidate! --hwn @@ -35,25 +38,18 @@ /* Gregorian chant divisio minima. (Actually, this was the original breathing sign by Michael. -- jr) - */ +*/ MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_minima, 1); -SCM +SCM Breathing_sign::divisio_minima (SCM smob) { Grob *me = unsmob_grob (smob); Real staff_space = Staff_symbol_referencer::staff_space (me); - Real staff_size; Real thickness = Staff_symbol_referencer::line_thickness (me); thickness *= robust_scm2double (me->get_property ("thickness"), 1.0); - if (Staff_symbol_referencer::get_staff_symbol (me)) - { - staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space; - } - else - staff_size = 0.0; - Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); /* * Draw a small vertical line through the uppermost (or, depending @@ -68,25 +64,16 @@ Breathing_sign::divisio_minima (SCM smob) /* Gregorian chant divisio maior. - */ +*/ MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maior, 1); -SCM +SCM Breathing_sign::divisio_maior (SCM smob) { Grob *me = unsmob_grob (smob); - Real staff_space = Staff_symbol_referencer::staff_space (me); - Real staff_size; Real thickness = Staff_symbol_referencer::line_thickness (me); thickness *= robust_scm2double (me->get_property ("thickness"), 1.0); - if (Staff_symbol_referencer::get_staff_symbol (me)) - { - staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space; - } - else - staff_size = 0.0; - - Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); /* * Draw a vertical line that is vertically centered in the staff @@ -94,13 +81,19 @@ Breathing_sign::divisio_maior (SCM smob) * more than half the size of the staff, such that the endings of * the line are in the middle of a staff space. */ - int lines = Staff_symbol_referencer::line_count (me); - int height = lines / 2; // little more than half of staff size - if ((lines & 1) != (height & 1)) - height++; // ensure endings are centered in staff space + Interval ydim = Staff_symbol_referencer::staff_span (me); + ydim.widen (-0.25 * ydim.delta ()); + for (UP_and_DOWN (i)) + { + int const int_dim = (int) ydim[i]; + if (int_dim == ydim[i] + && Staff_symbol_referencer::on_staff_line (me, int_dim)) + ydim[i] += i; + } + + ydim *= 1.0 / Staff_symbol_referencer::staff_space (me); Interval xdim (0, thickness); - Interval ydim (-0.5 * height, +0.5 * height); Box b (xdim, ydim); Stencil out = Lookup::round_filled_box (b, blotdiameter); return out.smobbed_copy (); @@ -108,29 +101,22 @@ Breathing_sign::divisio_maior (SCM smob) /* Gregorian chant divisio maxima. - */ +*/ MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maxima, 1); -SCM +SCM Breathing_sign::divisio_maxima (SCM smob) { Grob *me = unsmob_grob (smob); Real staff_space = Staff_symbol_referencer::staff_space (me); - Real staff_size; Real thickness = Staff_symbol_referencer::line_thickness (me); thickness *= robust_scm2double (me->get_property ("thickness"), 1.0); - if (Staff_symbol_referencer::get_staff_symbol (me)) - { - staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space; - } - else - staff_size = 0.0; - - Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); // like a "|" type bar Interval xdim (0, thickness); - Interval ydim (-0.5 * staff_size, +0.5 * staff_size); + Interval ydim = Staff_symbol_referencer::staff_span (me); + ydim *= staff_space / 2; Box b (xdim, ydim); Stencil out = Lookup::round_filled_box (b, blotdiameter); return out.smobbed_copy (); @@ -138,29 +124,22 @@ Breathing_sign::divisio_maxima (SCM smob) /* Gregorian chant finalis. - */ +*/ MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1); -SCM +SCM Breathing_sign::finalis (SCM smob) { Grob *me = unsmob_grob (smob); Real staff_space = Staff_symbol_referencer::staff_space (me); - Real staff_size; Real thickness = Staff_symbol_referencer::line_thickness (me); thickness *= robust_scm2double (me->get_property ("thickness"), 1.0); - if (Staff_symbol_referencer::get_staff_symbol (me)) - { - staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space; - } - else - staff_size = 0.0; - - Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); // like a "||" type bar Interval xdim (0, thickness); - Interval ydim (-0.5 * staff_size, +0.5 * staff_size); + Interval ydim = Staff_symbol_referencer::staff_span (me); + ydim *= staff_space / 2; Box b (xdim, ydim); Stencil line1 = Lookup::round_filled_box (b, blotdiameter); Stencil line2 (line1); @@ -170,12 +149,12 @@ Breathing_sign::finalis (SCM smob) return line1.smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 2); +MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 1); SCM -Breathing_sign::offset_callback (SCM element_smob, SCM) +Breathing_sign::offset_callback (SCM smob) { - Grob *me = unsmob_grob (element_smob); - + Grob *me = unsmob_grob (smob); + Direction d = get_grob_direction (me); if (!d) { @@ -183,11 +162,20 @@ Breathing_sign::offset_callback (SCM element_smob, SCM) set_grob_direction (me, d); } - Real inter_f = Staff_symbol_referencer::staff_space (me)/2; - int sz = Staff_symbol_referencer::line_count (me)-1; - return scm_make_real (inter_f * sz * d); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + if (staff) + { + Interval iv = Staff_symbol::line_span (staff); + Real inter = Staff_symbol::staff_space (staff) / 2; + return scm_from_double (inter * iv[d]); + } + + return scm_from_double (0.0); } -ADD_INTERFACE (Breathing_sign, "breathing-sign-interface", - "A breathing sign.", - "direction"); +ADD_INTERFACE (Breathing_sign, + "A breathing sign.", + + /* properties */ + "direction " + );