X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=e607fda1b08ec3e551a303be846af81c9c78a791;hb=5cb7876d337b0805f55d98255bb5aced5a2ee456;hp=4cb96a2e83803033f072bad3310b8df5b2d265a9;hpb=e4f07a592ebde9621dede5a47430a51b9c232eb3;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 4cb96a2e83..e607fda1b0 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,138 +1,227 @@ -/* - stem-tremolo.cc -- implement Stem_tremolo - +/* + stem-tremolo.cc -- implement Stem_tremolo + source file of the GNU LilyPond music typesetter - - (c) 1997--2000 Han-Wen Nienhuys - - */ + + (c) 1997--2006 Han-Wen Nienhuys +*/ #include "stem-tremolo.hh" -#include "debug.hh" + +#include "spanner.hh" #include "beam.hh" -#include "paper-def.hh" +#include "directional-element-interface.hh" +#include "item.hh" #include "lookup.hh" -#include "stem.hh" -#include "offset.hh" -#include "dimension-cache.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" -Stem_tremolo::Stem_tremolo () +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_slope, 1) +SCM +Stem_tremolo::calc_slope (SCM smob) { - set_elt_pointer ("stem", SCM_EOL); + 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_visible_stem (beam); + Grob *s1 = Beam::first_visible_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); } +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_width, 1) +SCM +Stem_tremolo::calc_width (SCM smob) +{ + 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); +} -Stem * -Stem_tremolo::stem_l ()const +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_style, 1) +SCM +Stem_tremolo::calc_style (SCM smob) { - SCM s = get_elt_pointer ("stem"); + 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 dynamic_cast ( unsmob_element (s)); + return ly_symbol2scm (((stemdir == UP && flag) || beam) ? "rectangle" : "default"); } -Interval -Stem_tremolo::dim_callback (Score_element * se, Axis a) +Real +Stem_tremolo::get_beam_translation (Grob *me) { - Stem_tremolo * s = dynamic_cast (se); - Real space = Staff_symbol_referencer_interface (s->stem_l ()) - .staff_space (); - return Interval (-space, space); -} + 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; +} -Molecule -Stem_tremolo::do_brew_molecule () const +Stencil +Stem_tremolo::raw_stencil (Grob *me, Real slope, Direction stemdir) { - Stem * stem = stem_l (); - Beam * beam = stem->beam_l (); - - Real dydx; - if (beam) + 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) { - Real dy = 0; - SCM s = beam->get_elt_property ("height"); - if (gh_number_p (s)) - dy = gh_scm2double (s); - Real dx = beam->last_visible_stem ()->relative_coordinate (0, X_AXIS) - - beam->first_visible_stem ()->relative_coordinate (0, X_AXIS); - dydx = dx ? dy/dx : 0; + programming_error ("no tremolo flags"); + + me->suicide (); + return Stencil (); } - else - // urg - dydx = 0.25; - Real thick = gh_scm2double (get_elt_property ("beam-thickness")); - Real width = gh_scm2double (get_elt_property ("beam-width")); - Molecule a (lookup_l ()->beam (dydx, width, thick)); - a.translate (Offset (-width/2, width / 2 * dydx)); - - int tremolo_flags; - SCM s = get_elt_property ("tremolo-flags"); - if (gh_number_p (s)) - tremolo_flags = gh_scm2int (s); - else - // huh? - tremolo_flags = 1; + Real beam_translation = get_beam_translation (me); - int mult = beam ? beam->get_multiplicity () : 0; - Real interbeam_f = paper_l ()->interbeam_f (mult); - Molecule mol; + Stencil mol; for (int i = 0; i < tremolo_flags; i++) { - Molecule b (a); - b.translate_axis (interbeam_f * i, Y_AXIS); - mol.add_molecule (b); + Stencil b (a); + b.translate_axis (beam_translation * i * stemdir * -1, Y_AXIS); + mol.add_stencil (b); } - if (tremolo_flags) - mol.translate_axis (-mol.extent (Y_AXIS).center (), Y_AXIS); + return mol; +} - Real half_space = Staff_symbol_referencer_interface (stem).staff_space () - / 2; - if (beam) + + +MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 1); +SCM +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)); +} + +Stencil +Stem_tremolo::translated_stencil (Grob *me, Real slope) +{ + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (!stem) { - // ugh, rather calc from Stem_tremolo_req - int beams_i = stem->beam_count(RIGHT) >? stem->beam_count (LEFT); - mol.translate (Offset(stem->relative_coordinate (0, X_AXIS) - relative_coordinate (0, X_AXIS), - stem->stem_end_position () * half_space - - directional_element (beam).get () * beams_i * interbeam_f)); + programming_error ("no stem for stem-tremolo"); + return Stencil(); } - else - { - /* - Beams should intersect one beamthickness below stem end - */ - Real dy = stem->stem_end_position () * half_space; - dy -= mol.extent (Y_AXIS).length () / 2 * stem->get_direction (); - - /* - uhg. Should use relative coords and placement - */ - Real whole_note_correction; - if (stem->invisible_b ()) - whole_note_correction = -stem->get_direction () - * stem->support_head ()->extent (X_AXIS).length () / 2; - else - whole_note_correction = 0; - - mol.translate (Offset (stem->relative_coordinate (0, X_AXIS) - relative_coordinate (0, X_AXIS) + - whole_note_correction, dy)); + + Spanner *beam = Stem::get_beam (stem); + Direction stemdir = get_grob_direction (stem); + if (stemdir == 0) + stemdir = UP; + + bool whole_note = Stem::duration_log (stem) <= 0; + + Real beam_translation = get_beam_translation (me); + + /* 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; + Stencil mol = raw_stencil (me, slope, stencil_dir); + + Interval mol_ext = mol.extent (Y_AXIS); + Real ss = Staff_symbol_referencer::staff_space (me); + + // ugh, rather calc from Stem_tremolo_req + int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0; + + Real beamthickness = 0.0; + SCM sbt = (beam) ? beam->get_property ("thickness") : SCM_EOL; + if (scm_is_number (sbt)) + beamthickness = scm_to_double (sbt) * ss; + + Real end_y + = Stem::stem_end_position (stem) * ss / 2 + - stemdir * max (beam_count, 1) * beam_translation; + + if (!beam && Stem::duration_log (stem) >= 3) + { + end_y -= stemdir * (Stem::duration_log (stem) - 2) * beam_translation; + if (stemdir == UP) + end_y -= stemdir * beam_translation * 0.5; } - + if (whole_note) + { + /* 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; + } + mol.translate_axis (end_y, Y_AXIS); + return mol; } - -void -Stem_tremolo::set_stem (Stem *s) +MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1); +SCM +Stem_tremolo::print (SCM grob) { - set_elt_pointer ("stem", s->self_scm_); - add_dependency (s); + 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 " + );