X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=9bb588db4f73450917cfe182143ffad014aac300;hb=c3ff1c6cd20e15e9036ee7120012e05b1d62a46d;hp=597b7962f747183ac76288e1b560fc0fb9cfa6d4;hpb=46c5beb169abbc5a03bd57562cda1669640e4c72;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 597b7962f7..9bb588db4f 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,164 +1,242 @@ -/* - stem-tremolo.cc -- implement Stem_tremolo - +/* + stem-tremolo.cc -- implement Stem_tremolo + source file of the GNU LilyPond music typesetter - - (c) 1997--2002 Han-Wen Nienhuys - - */ + + (c) 1997--2007 Han-Wen Nienhuys +*/ #include "stem-tremolo.hh" -#include "debug.hh" + +#include "spanner.hh" #include "beam.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "stem.hh" +#include "directional-element-interface.hh" #include "item.hh" +#include "lookup.hh" +#include "output-def.hh" #include "staff-symbol-referencer.hh" -#include "directional-element-interface.hh" - -/* - TODO: - lengthen stem if necessary - */ +#include "stem.hh" +#include "warn.hh" -void -Stem_tremolo::set_interface (Grob *me) +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_slope, 1) +SCM +Stem_tremolo::calc_slope (SCM smob) { - me->set_interface (ly_symbol2scm ("stem-tremolo")); + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + Spanner *beam = Stem::get_beam (stem); + + if (beam) + { + Real dy = 0; + SCM s = beam->get_property ("quantized-positions"); + if (is_number_pair (s)) + dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_cdr (s)); + + Grob *s2 = Beam::last_normal_stem (beam); + Grob *s1 = Beam::first_normal_stem (beam); + + Grob *common = s1->common_refpoint (s2, X_AXIS); + Real dx = s2->relative_coordinate (common, X_AXIS) - + s1->relative_coordinate (common, X_AXIS); + + return scm_from_double (dx ? dy / dx : 0); + } + else + /* down stems with flags should have more sloped trems (helps avoid + flag/stem collisions without making the stem very long) */ + return scm_from_double ( + (Stem::duration_log (stem) >= 3 && get_grob_direction (stem) == DOWN) ? + 0.40 : 0.25); } -bool -Stem_tremolo::has_interface (Grob *me) +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_width, 1) +SCM +Stem_tremolo::calc_width (SCM smob) { - return me->has_interface (ly_symbol2scm ("stem-tremolo")); + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + Direction stemdir = get_grob_direction (stem); + bool beam = Stem::get_beam (stem); + bool flag = Stem::duration_log (stem) >= 3 && !beam; + + /* beamed stems and up-stems with flags have shorter tremolos */ + return scm_from_double (((stemdir == UP && flag) || beam)? 1.0 : 1.5); } -MAKE_SCHEME_CALLBACK (Stem_tremolo,dim_callback,2); - -/* - todo: init with cons. - */ +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_style, 1) SCM -Stem_tremolo::dim_callback (SCM e, SCM) +Stem_tremolo::calc_style (SCM smob) { - Grob * se = unsmob_grob (e); - - Real space = Staff_symbol_referencer::staff_space (se); - return ly_interval2scm (Interval (-space, space)); + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + Direction stemdir = get_grob_direction (stem); + bool beam = Stem::get_beam (stem); + bool flag = Stem::duration_log (stem) >= 3 && !beam; + + return ly_symbol2scm (((stemdir == UP && flag) || beam) ? "rectangle" : "default"); } -/* - ugh ? --from Slur - */ -MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2); -SCM -Stem_tremolo::height (SCM smob, SCM ax) +Real +Stem_tremolo::get_beam_translation (Grob *me) +{ + Grob *stem = unsmob_grob (me->get_object ("stem")); + Spanner *beam = Stem::get_beam (stem); + + return (beam && beam->is_live ()) + ? Beam::get_beam_translation (beam) : 0.81; +} + +Stencil +Stem_tremolo::raw_stencil (Grob *me, Real slope, Direction stemdir) { - Axis a = (Axis)gh_scm2int (ax); - Grob * me = unsmob_grob (smob); - assert (a == Y_AXIS); + Real ss = Staff_symbol_referencer::staff_space (me); + Real thick = robust_scm2double (me->get_property ("beam-thickness"), 1); + Real width = robust_scm2double (me->get_property ("beam-width"), 1); + Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); + SCM style = me->get_property ("style"); + if (!scm_is_symbol (style)) + style = ly_symbol2scm ("default"); + + width *= ss; + thick *= ss; + + Stencil a; + if (style == ly_symbol2scm ("rectangle")) + a = Lookup::rotated_box (slope, width, thick, blot); + else + a = Lookup::beam (slope, width, thick, blot); + + a.align_to (X_AXIS, CENTER); + a.align_to (Y_AXIS, CENTER); + + int tremolo_flags = robust_scm2int (me->get_property ("flag-count"), 0); + if (!tremolo_flags) + { + programming_error ("no tremolo flags"); + + me->suicide (); + return Stencil (); + } - SCM mol = me->get_uncached_molecule (); - return ly_interval2scm (unsmob_molecule (mol)->extent (a)); + Real beam_translation = get_beam_translation (me); + + Stencil mol; + for (int i = 0; i < tremolo_flags; i++) + { + Stencil b (a); + b.translate_axis (beam_translation * i * stemdir * -1, Y_AXIS); + mol.add_stencil (b); + } + return mol; } -MAKE_SCHEME_CALLBACK (Stem_tremolo,brew_molecule,1); + +MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 1); SCM -Stem_tremolo::brew_molecule (SCM smob) +Stem_tremolo::height (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + /* + Cannot use the real slope, since it looks at the Beam. + */ + Stencil s1 (translated_stencil (me, 0.35)); + + return ly_interval2scm (s1.extent (Y_AXIS)); +} + +Real +Stem_tremolo::vertical_length (Grob *me) { - Grob *me= unsmob_grob (smob); - Grob * stem = unsmob_grob (me->get_grob_property ("stem")); - Grob * beam = Stem::beam_l (stem); + return untranslated_stencil (me, 0.35).extent (Y_AXIS).length (); +} - Real dydx; - if (beam) +Stencil +Stem_tremolo::untranslated_stencil (Grob *me, Real slope) +{ + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (!stem) { - Real dy = 0; - SCM s = beam->get_grob_property ("dy"); - if (gh_number_p (s)) - dy = gh_scm2double (s); - Real dx = Beam::last_visible_stem (beam)->relative_coordinate (0, X_AXIS) - - Beam::first_visible_stem (beam)->relative_coordinate (0, X_AXIS); - dydx = dx ? dy/dx : 0; + programming_error ("no stem for stem-tremolo"); + return Stencil (); } - else - // urg - dydx = 0.25; - Real ss = Staff_symbol_referencer::staff_space (stem); - Real thick = gh_scm2double (me->get_grob_property ("beam-thickness")); - Real width = gh_scm2double (me->get_grob_property ("beam-width")); - width *= ss; - thick *= ss; + Direction stemdir = get_grob_direction (stem); + if (!stemdir) + stemdir = UP; + + bool whole_note = Stem::duration_log (stem) <= 0; + + /* for a whole note, we position relative to the notehead, so we want the + stencil aligned on the flag closest to the head */ + Direction stencil_dir = whole_note ? -stemdir : stemdir; + return raw_stencil (me, slope, stencil_dir); +} + - Molecule a (Lookup::beam (dydx, width, thick)); - a.translate (Offset (-width/2, width / 2 * dydx)); +Stencil +Stem_tremolo::translated_stencil (Grob *me, Real slope) +{ + Stencil mol = untranslated_stencil (me, slope); + + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (!stem) + return Stencil (); - int tremolo_flags; - SCM s = me->get_grob_property ("tremolo-flags"); - if (gh_number_p (s)) - tremolo_flags = gh_scm2int (s); - else - // huh? - tremolo_flags = 1; + Direction stemdir = get_grob_direction (stem); + if (stemdir == 0) + stemdir = UP; - Real interbeam = beam ? Beam::get_interbeam (beam) : 0.81; + Spanner *beam = Stem::get_beam (stem); + Real beam_translation = get_beam_translation (me); - Molecule mol; - for (int i = 0; i < tremolo_flags; i++) + int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0; + Real ss = Staff_symbol_referencer::staff_space (me); + + Real end_y + = Stem::stem_end_position (stem) * ss / 2 + - stemdir * max (beam_count, 1) * beam_translation; + + if (!beam && Stem::duration_log (stem) >= 3) { - Molecule b (a); - b.translate_axis (interbeam * i, Y_AXIS); - mol.add_molecule (b); + end_y -= stemdir * (Stem::duration_log (stem) - 2) * beam_translation; + if (stemdir == UP) + end_y -= stemdir * beam_translation * 0.5; } - if (tremolo_flags) - mol.translate_axis (-mol.extent (Y_AXIS).center (), Y_AXIS); - if (beam) + + bool whole_note = Stem::duration_log (stem) <= 0; + if (whole_note) { - // ugh, rather calc from Stem_tremolo_req - int beams_i = Stem::beam_count (stem, RIGHT) - >? Stem::beam_count (stem, LEFT); - mol.translate (Offset (stem->relative_coordinate (0, X_AXIS) - - me->relative_coordinate (0, X_AXIS), - Stem::stem_end_position (stem) * ss / 2 - - Directional_element_interface::get (beam) - * beams_i * interbeam)); + /* we shouldn't position relative to the end of the stem since the stem + is invisible */ + vector nhp = Stem::note_head_positions (stem); + Real note_head = (stemdir == UP ? nhp.back () : nhp[0]) * ss / 2; + end_y = note_head + stemdir * 1.5; } - else - { - /* - Beams should intersect one beamthickness below stem end - */ - Real dy = Stem::stem_end_position (stem) * ss / 2; - dy -= mol.extent (Y_AXIS).length () / 2 * Stem::get_direction (stem); - - /* - uhg. Should use relative coords and placement - */ - Real whole_note_correction; - if (Stem::invisible_b (stem)) - { - Grob *hed = Stem::support_head (stem); - whole_note_correction = -Stem::get_direction (stem) - *hed->extent (hed, X_AXIS).length () / 2; - } - else - whole_note_correction = 0; - - mol.translate (Offset (stem->relative_coordinate (0, X_AXIS) - - me->relative_coordinate (0, X_AXIS) + - whole_note_correction, dy)); - } - - return mol.smobbed_copy (); -} + mol.translate_axis (end_y, Y_AXIS); + return mol; +} -void -Stem_tremolo::set_stem (Grob*me,Grob *s) +MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1); +SCM +Stem_tremolo::print (SCM grob) { - me->set_grob_property ("stem", s->self_scm ()); + Grob *me = unsmob_grob (grob); + + Stencil s = translated_stencil (me, robust_scm2double (me->get_property ("slope"), 0.25)); + return s.smobbed_copy (); } +ADD_INTERFACE (Stem_tremolo, + "A beam slashing a stem to indicate a tremolo.", + + "beam-thickness " + "beam-width " + "flag-count " + "stem " + "style " + "slope " + );