X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=d8c08c7bd950beca43498d0f2077cbe22c338d7a;hb=3ddc8bb1d7ec8d361cae96889ad804384c2f2698;hp=2bfd4dfcbe423176dfff102c54b43dcfd362656f;hpb=105fd7580334c8f42838ac62504c5f290f3428c5;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 2bfd4dfcbe..d8c08c7bd9 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -3,12 +3,12 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include "stem-tremolo.hh" -#include "debug.hh" +#include "warn.hh" #include "beam.hh" #include "paper-def.hh" #include "lookup.hh" @@ -21,37 +21,56 @@ TODO: lengthen stem if necessary */ +MAKE_SCHEME_CALLBACK (Stem_tremolo,dim_callback,2); -void -Stem_tremolo::set_interface (Score_element *me) +/* + todo: init with cons. + */ +SCM +Stem_tremolo::dim_callback (SCM e, SCM) { + Grob * se = unsmob_grob (e); + + Real space = Staff_symbol_referencer::staff_space (se); + return ly_interval2scm (Interval (-space, space)); } - -Interval -Stem_tremolo::dim_callback (Score_element * se, Axis ) +/* + ugh ? --from Slur + */ +MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2); +SCM +Stem_tremolo::height (SCM smob, SCM ax) { - Real space = Staff_symbol_referencer::staff_space (se); - return Interval (-space, space); -} + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert (a == Y_AXIS); + SCM mol = me->get_uncached_stencil (); + if (Stencil *m = unsmob_stencil (mol)) + return ly_interval2scm (m->extent (a)); + else + return ly_interval2scm (Interval ()); +} -MAKE_SCHEME_CALLBACK(Stem_tremolo,brew_molecule); -SCM -Stem_tremolo::brew_molecule (SCM smob) + +Stencil +Stem_tremolo::raw_stencil (Grob *me) { - Score_element *me= unsmob_element (smob); - Score_element * stem = unsmob_element (me->get_elt_property ("stem")); - Score_element * beam = Stem::beam_l (stem); + Grob *stem = unsmob_grob (me->get_property ("stem")); + Grob *beam = Stem::get_beam (stem); Real dydx; if (beam) { Real dy = 0; - SCM s = beam->get_elt_property ("height"); - if (gh_number_p (s)) - dy = gh_scm2double (s); + SCM s = beam->get_property ("positions"); + if (is_number_pair (s)) + { + dy = -gh_scm2double (gh_car (s)) +gh_scm2double (gh_cdr (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; @@ -60,75 +79,121 @@ Stem_tremolo::brew_molecule (SCM smob) // urg dydx = 0.25; - Real ss = Staff_symbol_referencer::staff_space (stem); - Real thick = gh_scm2double (me->get_elt_property ("beam-thickness")); - Real width = gh_scm2double (me->get_elt_property ("beam-width")); + 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->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter")); + width *= ss; thick *= ss; - Molecule a (me->lookup_l ()->beam (dydx, width, thick)); + Stencil a (Lookup::beam (dydx, width, thick, blot)); a.translate (Offset (-width/2, width / 2 * dydx)); - int tremolo_flags; - SCM s = me->get_elt_property ("tremolo-flags"); + int tremolo_flags = 0; + SCM s = me->get_property ("flag-count"); if (gh_number_p (s)) tremolo_flags = gh_scm2int (s); - else - // huh? - tremolo_flags = 1; - int mult = beam ? Beam::get_multiplicity (beam) : 0; - SCM space_proc = me->get_elt_property ("beam-space-function"); - SCM space = gh_call1 (space_proc, gh_int2scm (mult)); - Real interbeam_f = gh_scm2double (space) * ss; + if (!tremolo_flags) + { + programming_error ("No tremolo flags?"); + + me->suicide (); + return Stencil (); + } + + /* + Who the fuck is 0.81 ? + --hwn. + */ + Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81; - 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, Y_AXIS); + mol.add_stencil (b); } - if (tremolo_flags) - mol.translate_axis (-mol.extent (Y_AXIS).center (), Y_AXIS); - if (beam) + return mol; +} + + +MAKE_SCHEME_CALLBACK (Stem_tremolo,print,1); +SCM +Stem_tremolo::print (SCM grob) +{ + Grob *me = unsmob_grob (grob); + Grob *stem = unsmob_grob (me->get_property ("stem")); + if (!stem) { - // 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_f)); + programming_error ("No stem for stem-tremolo"); + return SCM_EOL; + } + + Grob *beam = Stem::get_beam (stem); + Direction stemdir = Stem::get_direction (stem); + Real beam_translation + = (beam && beam->live ()) + ? Beam::get_beam_translation (beam) + : 0.81; + + Stencil mol = raw_stencil (me); + 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 (gh_number_p (sbt)) + { + beamthickness = gh_scm2double (sbt) * ss; + } + + Real end_y + = Stem::stem_end_position (stem) *ss/2 + - stemdir * (beam_count * beamthickness + + ((beam_count -1) >? 0) * beam_translation); + + /* + the 0.33 ss is to compensate for the size of the note head + */ + Real chord_start_y = Stem::chord_start_y (stem) + + 0.33 * ss * stemdir; + + Real padding = beam_translation; + + /* + if there is a flag, just above/below the notehead. + if there is not enough space, center on remaining space, + else one beamspace away from stem end. + */ + if (!beam && Stem::duration_log (stem) >= 3) + { + mol.align_to (Y_AXIS, -stemdir); + mol.translate_axis (chord_start_y + .5 * stemdir, Y_AXIS); + } + else if (stemdir * (end_y - chord_start_y) - 2*padding - mol_ext.length () < 0.0) + { + mol.translate_axis (0.5 * (end_y + chord_start_y) - mol_ext.center (),Y_AXIS); } 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 )) - whole_note_correction = -Stem::get_direction (stem ) - * Stem::support_head (stem )->extent (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)); + { + mol.translate_axis (end_y - stemdir * beam_translation + -mol_ext [stemdir] + , Y_AXIS); } - return mol.create_scheme(); + return mol.smobbed_copy (); } -void -Stem_tremolo::set_stem (Score_element*me,Score_element *s) -{ - me->set_elt_property ("stem", s->self_scm ()); -} +ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", + "A beam slashing a stem to indicate a tremolo.", + "stem beam-width beam-thickness flag-count");