X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=d243f89e4bb322c6ccad69e1e351068e6564df2b;hb=db2d03691f2b1114b1b822c3ed0aa6f803045815;hp=c9f3b1fd280f997541f29cac51f0bb72e3ebd6af;hpb=71fb71437fc91cef2c41d9ee17856ea1031cfb10;p=lilypond.git diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index c9f3b1fd28..d243f89e4b 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -1,59 +1,182 @@ /* breathing_sign.cc -- implement Breathing_sign - Copyright (C) 1999 Michael Krause + (c) 1999--2006 Michael Krause written for the GNU LilyPond music typesetter -TODO: --> see breathing-sign-engraver.cc + TODO: --> see breathing-sign-engraver.cc + Extensions for ancient notation (c) 2003--2006 by Juergen Reuter */ #include "breathing-sign.hh" -#include "string.hh" -#include "molecule.hh" -#include "paper-def.hh" + +#include "staff-symbol-referencer.hh" +#include "directional-element-interface.hh" +#include "output-def.hh" #include "lookup.hh" -#include "debug.hh" #include "dimensions.hh" #include "direction.hh" +#include "text-interface.hh" +#include "font-interface.hh" +#include "grob.hh" + +/* + TODO: thickness should be a grob property (unit: linethickness) + rather than hardwired to (staff_space / 6). +*/ -#include +/* + 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) { - vertical_position_i_ = UP; - set_elt_property (breakable_scm_sym, SCM_BOOL_T); - set_elt_property (break_priority_scm_sym, gh_int2scm (-4)); - set_elt_property (visibility_lambda_scm_sym, - gh_eval_str ("non_postbreak_visibility")); + 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 (); } -void -Breathing_sign::set_vertical_position (Direction updown) +/* + Gregorian chant divisio maior. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maior, 1); +SCM +Breathing_sign::divisio_maior (SCM smob) { - assert(updown >= -1 && updown <= +1); + 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 - if(updown != 0) - vertical_position_i_ = updown; + 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 (); } -Molecule* -Breathing_sign::do_brew_molecule_p () const +/* + Gregorian chant divisio maxima. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maxima, 1); +SCM +Breathing_sign::divisio_maxima (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 staff_size; + Real thickness = Staff_symbol_referencer::line_thickness (me); + thickness *= robust_scm2double (me->get_property ("thickness"), 1.0); - Molecule *output = new Molecule (lookup_l()->filledbox(b)); + if (Staff_symbol_referencer::get_staff_symbol (me)) + staff_size = (Staff_symbol_referencer::line_count (me) - 1) * staff_space; + else + staff_size = 0.0; - return output; + 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 (); } -void -Breathing_sign::do_post_processing() +/* + Gregorian chant finalis. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1); +SCM +Breathing_sign::finalis (SCM smob) { - Real dl = staff_line_leading_f(); + 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")); + + // 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); - translate_axis(2.0 * dl * vertical_position_i_, Y_AXIS); + return line1.smobbed_copy (); } + +MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 1); +SCM +Breathing_sign::offset_callback (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + Direction d = get_grob_direction (me); + if (!d) + { + d = UP; + set_grob_direction (me, d); + } + + Real inter = Staff_symbol_referencer::staff_space (me) / 2; + int sz = Staff_symbol_referencer::line_count (me) - 1; + return scm_from_double (inter * sz * d); +} + +ADD_INTERFACE (Breathing_sign, + "A breathing sign.", + + "direction " + + );