X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=445926bbada1b74a830845eda03a471f0c048389;hb=1753b1a73742a5b0893037116bb6f2febba277f3;hp=36cbc63f97f4cbb6eea3eeb1f3838b462ae101c7;hpb=7791a639ba982382683b1d2e8ecd4b5fb8a280d9;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 36cbc63f97..445926bbad 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--2003 Han-Wen Nienhuys */ #include "stem-tremolo.hh" -#include "debug.hh" +#include "warn.hh" #include "beam.hh" #include "paper-def.hh" #include "lookup.hh" @@ -21,31 +21,18 @@ TODO: lengthen stem if necessary */ - -void -Stem_tremolo::set_interface (Grob *me) -{ - me->set_interface (ly_symbol2scm ("stem-tremolo")); -} - -bool -Stem_tremolo::has_interface (Grob *me) -{ - return me->has_interface (ly_symbol2scm ("stem-tremolo")); -} - -MAKE_SCHEME_CALLBACK(Stem_tremolo,dim_callback,2); +MAKE_SCHEME_CALLBACK (Stem_tremolo,dim_callback,2); /* todo: init with cons. */ SCM -Stem_tremolo::dim_callback (SCM e, 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)); + return ly_interval2scm (Interval (-space, space)); } /* @@ -57,28 +44,33 @@ Stem_tremolo::height (SCM smob, SCM ax) { Axis a = (Axis)gh_scm2int (ax); Grob * me = unsmob_grob (smob); - assert ( a == Y_AXIS); + assert (a == Y_AXIS); SCM mol = me->get_uncached_molecule (); - return ly_interval2scm (unsmob_molecule (mol)->extent (a)); + + if (Molecule *m = unsmob_molecule (mol)) + return ly_interval2scm (m->extent (a)); + else + return ly_interval2scm (Interval()); } -MAKE_SCHEME_CALLBACK(Stem_tremolo,brew_molecule,1); -SCM -Stem_tremolo::brew_molecule (SCM smob) +Molecule +Stem_tremolo::raw_molecule (Grob *me) { - Grob *me= unsmob_grob (smob); - Grob * stem = unsmob_grob (me->get_grob_property ("stem")); - Grob * beam = Stem::beam_l (stem); + Grob *stem = unsmob_grob (me->get_grob_property ("stem")); + Grob *beam = Stem::get_beam (stem); Real dydx; if (beam) { Real dy = 0; - SCM s = beam->get_grob_property ("height"); - if (gh_number_p (s)) - dy = gh_scm2double (s); + SCM s = beam->get_grob_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; @@ -87,7 +79,7 @@ Stem_tremolo::brew_molecule (SCM smob) // urg dydx = 0.25; - Real ss = Staff_symbol_referencer::staff_space (stem); + Real ss = Staff_symbol_referencer::staff_space (me); Real thick = gh_scm2double (me->get_grob_property ("beam-thickness")); Real width = gh_scm2double (me->get_grob_property ("beam-width")); width *= ss; @@ -96,60 +88,98 @@ Stem_tremolo::brew_molecule (SCM smob) Molecule a (Lookup::beam (dydx, width, thick)); a.translate (Offset (-width/2, width / 2 * dydx)); - int tremolo_flags; - SCM s = me->get_grob_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; - SCM space_proc = me->get_grob_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 Molecule (); + } + + /* + Who the fuck is 0.81 ? + + --hwn. + */ + Real beam_translation = beam ? Beam::get_beam_translation (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 (beam_translation * i, Y_AXIS); mol.add_molecule (b); } - if (tremolo_flags) - mol.translate_axis (-mol.extent (Y_AXIS).center (), Y_AXIS); - if (beam) + return mol; +} + + +MAKE_SCHEME_CALLBACK (Stem_tremolo,brew_molecule,1); +SCM +Stem_tremolo::brew_molecule (SCM grob) +{ + Grob *me = unsmob_grob (grob); + Grob *stem = unsmob_grob (me->get_grob_property ("stem")); + Grob *beam = Stem::get_beam (stem); + Direction stemdir = Stem::get_direction (stem); + Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81; + + Molecule mol = raw_molecule (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; + + /* + TODO. + */ + + + 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::get (beam) * beams_i * interbeam_f)); + 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 )) - { - 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)); + { + mol.translate_axis (end_y - stemdir * beam_translation + -mol_ext [stemdir] + , Y_AXIS); } return mol.smobbed_copy (); @@ -162,3 +192,7 @@ Stem_tremolo::set_stem (Grob*me,Grob *s) me->set_grob_property ("stem", s->self_scm ()); } + +ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", + "", + "stem beam-width beam-thickness flag-count");