X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fstem-tremolo.cc;h=5af470bae5402bf3a8201ba3447c81d6556ed513;hb=47b1c9fddeec6d243c4df9d66ab71969bdee7b2f;hp=fc0ed1023f31f51ff49c0c2eacfb60344a46e430;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index fc0ed1023f..5af470bae5 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ @@ -21,38 +21,57 @@ 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) { -me->set_elt_property ("stem", SCM_EOL); + 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_molecule (); + if (Molecule *m = unsmob_molecule (mol)) + return ly_interval2scm (m->extent (a)); + else + return ly_interval2scm (Interval()); +} -MAKE_SCHEME_CALLBACK(Stem_tremolo,brew_molecule); +MAKE_SCHEME_CALLBACK (Stem_tremolo,brew_molecule,1); SCM Stem_tremolo::brew_molecule (SCM smob) { - Score_element *me= unsmob_element (smob); - Score_element * stem = unsmob_element (me->get_elt_property ("stem")); - Score_element * beam = Stem::beam_l (stem); + Grob *me= unsmob_grob (smob); + Grob * stem = unsmob_grob (me->get_grob_property ("stem")); + Grob * beam = Stem::beam_l (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_grob_property ("positions"); + if (gh_pair_p (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; @@ -62,70 +81,95 @@ Stem_tremolo::brew_molecule (SCM smob) 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 thick = gh_scm2double (me->get_grob_property ("beam-thickness")); + Real width = gh_scm2double (me->get_grob_property ("beam-width")); width *= ss; thick *= ss; - Molecule a (me->lookup_l ()->beam (dydx, width, thick)); + Molecule a (Lookup::beam (dydx, width, thick)); 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_grob_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; - Real interbeam_f = me->paper_l ()->interbeam_f (mult); + if (!tremolo_flags) + { + programming_error ("No tremolo flags?"); + + me->suicide(); + return SCM_EOL; + } + + /* + Who the fuck is 0.81 ? + + --hwn. + */ + Real interbeam = beam ? Beam::get_interbeam (beam) : 0.81; + Molecule mol; for (int i = 0; i < tremolo_flags; i++) { Molecule b (a); - b.translate_axis (interbeam_f * i, Y_AXIS); + b.translate_axis (interbeam * i, Y_AXIS); mol.add_molecule (b); } - if (tremolo_flags) - mol.translate_axis (-mol.extent (Y_AXIS).center (), Y_AXIS); - if (beam) + Direction stemdir = Stem::get_direction (stem); + Interval mol_ext = mol.extent (Y_AXIS); + + // ugh, rather calc from Stem_tremolo_req + int beams_i = (beam) + ? (Stem::beam_count (stem, RIGHT) >? Stem::beam_count (stem, LEFT)) + : 0; + + Real beamthickness = 0.0; + SCM sbt = (beam) ? beam->get_grob_property ("thickness") : SCM_EOL ; + if (gh_number_p (sbt)) { - // 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 (beam).get () * beams_i * interbeam_f)); + beamthickness = gh_scm2double (sbt) * ss; + } + + Real end_y + = Stem::stem_end_position (stem) *ss/2 + - stemdir * (beams_i * beamthickness + + ((beams_i -1) >? 0) * interbeam); + + /* + 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 = interbeam; + + /* + if there is not enough space, center on remaining space, + else one beamspace away from stem end. + */ + if (stemdir * (end_y - chord_start_y) - 2*padding - mol_ext.length () < 0.0) + { + mol.translate_axis ((end_y + chord_start_y) /2.0 - 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 * interbeam + -mol_ext [stemdir] + , Y_AXIS); } - return mol.create_scheme(); + return mol.smobbed_copy (); } void -Stem_tremolo::set_stem (Score_element*me,Score_element *s) +Stem_tremolo::set_stem (Grob*me,Grob *s) { - me->set_elt_property ("stem", s->self_scm ()); + me->set_grob_property ("stem", s->self_scm ()); } + +ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", + "", + "stem beam-width beam-thickness flag-count");