X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=445926bbada1b74a830845eda03a471f0c048389;hb=1753b1a73742a5b0893037116bb6f2febba277f3;hp=ee39f337ad9d4200f86ecc67a1d558abcc461fde;hpb=b0064942493df77833e6e41e05d362850f4874b0;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index ee39f337ad..445926bbad 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -3,18 +3,17 @@ 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" #include "stem.hh" -#include "offset.hh" -#include "dimension-cache.hh" +#include "item.hh" #include "staff-symbol-referencer.hh" #include "directional-element-interface.hh" @@ -22,120 +21,178 @@ TODO: lengthen stem if necessary */ +MAKE_SCHEME_CALLBACK (Stem_tremolo,dim_callback,2); -Stem_tremolo::Stem_tremolo (SCM s) - : Item (s) +/* + todo: init with cons. + */ +SCM +Stem_tremolo::dim_callback (SCM e, SCM) { - set_elt_pointer ("stem", SCM_EOL); + Grob * se = unsmob_grob (e); + + Real space = Staff_symbol_referencer::staff_space (se); + return ly_interval2scm (Interval (-space, space)); } - -Stem * -Stem_tremolo::stem_l ()const +/* + ugh ? --from Slur + */ +MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2); +SCM +Stem_tremolo::height (SCM smob, SCM ax) { - SCM s = get_elt_pointer ("stem"); + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert (a == Y_AXIS); - return dynamic_cast ( unsmob_element (s)); -} + SCM mol = me->get_uncached_molecule (); -Interval -Stem_tremolo::dim_callback (Score_element * se, Axis ) -{ - Stem_tremolo * s = dynamic_cast (se); - Real space = Staff_symbol_referencer_interface (s->stem_l ()) - .staff_space (); - return Interval (-space, space); + if (Molecule *m = unsmob_molecule (mol)) + return ly_interval2scm (m->extent (a)); + else + return ly_interval2scm (Interval()); } -MAKE_SCHEME_SCORE_ELEMENT_CALLBACKS(Stem_tremolo) -Molecule -Stem_tremolo::do_brew_molecule () const +Molecule +Stem_tremolo::raw_molecule (Grob *me) { - Stem * stem = stem_l (); - Beam * beam = stem->beam_l (); + 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_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); + 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; } else // urg dydx = 0.25; - Real ss = Staff_symbol_referencer_interface (stem).staff_space (); - Real thick = gh_scm2double (get_elt_property ("beam-thickness")); - Real width = gh_scm2double (get_elt_property ("beam-width")); + 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; thick *= ss; - Molecule a (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 = 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 () : 0; - Real interbeam_f = paper_l ()->interbeam_f (mult); + 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(RIGHT) >? stem->beam_count (LEFT); - mol.translate (Offset(stem->relative_coordinate (0, X_AXIS) - relative_coordinate (0, X_AXIS), - stem->stem_end_position () * ss / 2 - - directional_element (beam).get () * 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 () * ss / 2; - 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)); + { + mol.translate_axis (end_y - stemdir * beam_translation + -mol_ext [stemdir] + , Y_AXIS); } - return mol; + return mol.smobbed_copy (); } void -Stem_tremolo::set_stem (Stem *s) +Stem_tremolo::set_stem (Grob*me,Grob *s) { - set_elt_pointer ("stem", s->self_scm_); - add_dependency (s); + me->set_grob_property ("stem", s->self_scm ()); } + +ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", + "", + "stem beam-width beam-thickness flag-count");