X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=02b29858af1465d042c0c16d6f57c967e82f0f27;hb=9b2bf7690da13a01627dee91c4749fd98d3da212;hp=2e6ebde757dc5b369d45b8c74cd5a866ff7c7371;hpb=6fd2c101db89f70b080ec95fc0b458a760bd336a;p=lilypond.git diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 2e6ebde757..02b29858af 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -1,58 +1,181 @@ /* - breathing_sign.cc -- implement Breathing_sign + This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999 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. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #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 +*/ + +/* + 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")); -Breathing_sign::Breathing_sign () + /* + * 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); - set_elt_property ("visibility-lambda", - ly_ch_C_eval_scm ("non_postbreak_visibility")); + Grob *me = unsmob_grob (smob); + 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 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. + */ + 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); + Box b (xdim, ydim); + Stencil out = Lookup::round_filled_box (b, blotdiameter); + return out.smobbed_copy (); } -void -Breathing_sign::set_vertical_position (Direction updown) +/* + Gregorian chant divisio maxima. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maxima, 1); +SCM +Breathing_sign::divisio_maxima (SCM smob) { - assert(updown >= -1 && updown <= +1); + 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); - if(updown != 0) - set_direction (updown); + Real blotdiameter = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); + + // like a "|" type bar + Interval xdim (0, thickness); + 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 (); } -Molecule* -Breathing_sign::do_brew_molecule_p () const +/* + Gregorian chant finalis. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1); +SCM +Breathing_sign::finalis (SCM smob) { - Real dl = staff_line_leading_f(); - 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 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")); - Molecule *output = new Molecule (lookup_l()->filledbox(b)); + // like a "||" type bar + Interval xdim (0, thickness); + 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); + line2.translate_axis (0.5 * staff_space, X_AXIS); + line1.add_stencil (line2); - return output; + 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_line_leading_f(); + Grob *me = unsmob_grob (smob); - translate_axis(2.0 * dl * get_direction (), Y_AXIS); + Direction d = get_grob_direction (me); + if (!d) + { + d = UP; + set_grob_direction (me, 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, + "A breathing sign.", + + /* properties */ + "direction " + );