X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreathing-sign.cc;h=517b8f8f1c36ee7cb2256eca6b6b6e3fad5f853c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=c8a7a0c1a2f14db0065b734d9997c14c525fbd0c;hpb=b638d530ac5a32a832646cdd2b680ce52d0764f0;p=lilypond.git diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index c8a7a0c1a2..517b8f8f1c 100644 --- a/lily/breathing-sign.cc +++ b/lily/breathing-sign.cc @@ -1,64 +1,182 @@ /* breathing_sign.cc -- implement Breathing_sign - Copyright (C) 1999 Michael Krause + (c) 1999--2008 Michael Krause written for the GNU LilyPond music typesetter TODO: --> see breathing-sign-engraver.cc + Extensions for ancient notation (c) 2003--2008 by Juergen Reuter */ +#include "breathing-sign.hh" + #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" -#include "breathing-sign.hh" -#include "string.hh" -#include "molecule.hh" -#include "paper-def.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). +*/ +/* + UGH : this is full of C&P code. Consolidate! --hwn +*/ -Breathing_sign::Breathing_sign (SCM s) - : Item (s) +/* + 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 (); } - - -MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Breathing_sign,brew_molecule); - -SCM -Breathing_sign::brew_molecule (SCM smob) +/* + Gregorian chant divisio maior. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, divisio_maior, 1); +SCM +Breathing_sign::divisio_maior (SCM smob) { - Score_element * sc = unsmob_element (smob); - Staff_symbol_referencer_interface si (sc); - - Real space = si.staff_space(); + 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 (); +} - // todo: cfg'able. - Interval i1(0, space / 6), i2(-space / 2, space / 2); - Box b(i1, i2); +/* + 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; + + 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 (); +} - return sc->lookup_l()->filledbox(b).create_scheme (); +/* + Gregorian chant finalis. +*/ +MAKE_SCHEME_CALLBACK (Breathing_sign, finalis, 1); +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->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); + + return line1.smobbed_copy (); } -GLUE_SCORE_ELEMENT(Breathing_sign,after_line_breaking); +MAKE_SCHEME_CALLBACK (Breathing_sign, offset_callback, 1); SCM -Breathing_sign::member_after_line_breaking () +Breathing_sign::offset_callback (SCM smob) { - Real space = staff_symbol_referencer (this).staff_space(); - Direction d = Directional_element_interface (this). get (); + Grob *me = unsmob_grob (smob); + + Direction d = get_grob_direction (me); if (!d) { d = UP; - Directional_element_interface (this).set (d); + set_grob_direction (me, d); } - translate_axis(2.0 * space * d, Y_AXIS); - - return SCM_UNDEFINED; + 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.", + + /* properties */ + "direction " + );