X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=a59bd650703fe2aafc2ea40e58b2e85492c78a6b;hb=cf3642858a2340bb39ee56739f34c799946d4454;hp=9861ac19c557004e0df2574a1c1a112785c3314b;hpb=8a28f0429e9ce4ce7258156d62261b939edd72d1;p=lilypond.git diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 9861ac19c5..a59bd65070 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -1,52 +1,192 @@ /* - breathing_sign.cc -- implement Breathing_sign + This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999 Michael Krause + Copyright (C) 1999--2011 Michael Krause + Extensions for ancient notation (c) 2003--2011 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. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#include "staff-symbol-referencer.hh" #include "breathing-sign.hh" -#include "string.hh" -#include "molecule.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "debug.hh" + #include "dimensions.hh" #include "direction.hh" +#include "directional-element-interface.hh" +#include "font-interface.hh" +#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 +*/ -Breathing_sign::Breathing_sign () +/* + Gregorian chant divisio minima. (Actually, this was the original + breathing sign by Michael. -- jr) +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_minima, 1); +SCM +Breathing_sign::divisio_minima (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Real staff_space = Staff_symbol_referencer::staff_space (me); + + Real thickness = Staff_symbol_referencer::line_thickness (me); + thickness *= robust_scm2double (me->get_property ("thickness"), 1.0); + + Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); + + /* + * Draw a small vertical line through the uppermost (or, depending + * on direction, lowermost) staff line. + */ + Interval xdim (0, thickness); + Interval ydim (-0.5 * staff_space, +0.5 * staff_space); + Box b (xdim, ydim); + Stencil out = Lookup::round_filled_box (b, blotdiameter); + return out.smobbed_copy (); +} + +/* + Gregorian chant divisio maior. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maior, 1); +SCM +Breathing_sign::divisio_maior (SCM smob) { - set_direction (UP); - set_elt_property ("breakable", SCM_BOOL_T); + 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->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); + + /* + * Draw a vertical line that is vertically centered in the staff + * (just like a bar). The height of this line should be a little + * 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 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 (); } +/* + Gregorian chant divisio maxima. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maxima, 1); +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; -Molecule* -Breathing_sign::do_brew_molecule_p () const + 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); + Box b (xdim, ydim); + Stencil out = Lookup::round_filled_box (b, blotdiameter); + return out.smobbed_copy (); +} + +/* + Gregorian chant finalis. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1); +SCM +Breathing_sign::finalis (SCM smob) { - Staff_symbol_referencer_interface si (this); - - Real dl = si.staff_space(); - Interval i1(0, dl / 6), i2(-dl / 2, dl / 2); - Box b(i1, i2); + 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; - Molecule *output = new Molecule (lookup_l()->filledbox(b)); + Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); - return output; + // like a "||" type bar + Interval xdim (0, thickness); + Interval ydim (-0.5 * staff_size, +0.5 * staff_size); + Box b (xdim, ydim); + Stencil line1 = Lookup::round_filled_box (b, blotdiameter); + Stencil line2 (line1); + line2.translate_axis (0.5 * staff_space, X_AXIS); + line1.add_stencil (line2); + + return line1.smobbed_copy (); } -void -Breathing_sign::do_post_processing() +MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 1); +SCM +Breathing_sign::offset_callback (SCM smob) { - Real dl = Staff_symbol_referencer_interface (this).staff_space(); + Grob *me = unsmob_grob (smob); + + Direction d = get_grob_direction (me); + if (!d) + { + d = UP; + set_grob_direction (me, d); + } - translate_axis(2.0 * dl * get_direction (), Y_AXIS); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + if (staff) + { + Interval iv = Staff_symbol::line_span (staff); + Real inter = Staff_symbol::staff_space (me) / 2; + return scm_from_double (inter * iv[d]); + } + + return scm_from_double (0.0); } +ADD_INTERFACE (Breathing_sign, + "A breathing sign.", + + /* properties */ + "direction " + );