X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=e52df9fd05dda4888bd0f73f0cbc1bfdb665f9f5;hb=422004486569407b8809da7f3c7053c1e4767bff;hp=db15d09e4be192f6e2182147d9bc281ab612ee6d;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index db15d09e4b..e52df9fd05 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,9 +1,9 @@ /* - abbrev.cc -- implement Stem_tremolo + stem-tremolo.cc -- implement Stem_tremolo source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ @@ -13,128 +13,119 @@ #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" -Stem_tremolo::Stem_tremolo () -{ - set_elt_property ("stem", SCM_EOL); -} - +/* + TODO: + lengthen stem if necessary + */ -Stem * -Stem_tremolo::stem_l ()const +void +Stem_tremolo::set_interface (Score_element *me) { - SCM s = get_elt_property ("stem"); - - return dynamic_cast ( unsmob_element (s)); +me->set_elt_property ("stem", SCM_EOL); } + Interval -Stem_tremolo::dim_callback (Dimension_cache const *c) +Stem_tremolo::dim_callback (Score_element * se, Axis ) { - Stem_tremolo * s = dynamic_cast (c->element_l ()); - Real space = Staff_symbol_referencer_interface (s->stem_l ()) - .staff_space (); + Real space = Staff_symbol_referencer::staff_space (se); return Interval (-space, space); } -Molecule* -Stem_tremolo::do_brew_molecule_p () const -{ - Stem * st = stem_l (); - int mult =0; - if (Beam * b = st->beam_l ()) - { - mult = b->get_multiplicity (); - } - - Real interbeam_f = paper_l ()->interbeam_f (mult); - Real w = gh_scm2double (get_elt_property ("beam-width")); - Real space = Staff_symbol_referencer_interface (st).staff_space (); - Real half_staff_space = space / 2; - Real beam_f = gh_scm2double (get_elt_property ("beam-thickness")); - int beams_i = 0; - Real dydx = 0.25; +MAKE_SCHEME_CALLBACK(Stem_tremolo,brew_molecule); +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); - if (st && st->beam_l ()) + Real dydx; + if (beam) { Real dy = 0; - SCM s = st->beam_l ()->get_elt_property ("height"); + SCM s = beam->get_elt_property ("height"); if (gh_number_p (s)) dy = gh_scm2double (s); - Real dx = st->beam_l ()->last_visible_stem ()->hpos_f () - - st->beam_l ()->first_visible_stem ()->hpos_f (); - dydx = dy/dx; + 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::staff_space (stem); + Real thick = gh_scm2double (me->get_elt_property ("beam-thickness")); + Real width = gh_scm2double (me->get_elt_property ("beam-width")); + width *= ss; + thick *= ss; - // ugh, rather calc from Stem_tremolo_req - beams_i = st->beam_count(RIGHT) >? st->beam_count (LEFT); - } - - Molecule a (lookup_l ()->beam (dydx, w, beam_f)); - a.translate (Offset (-w/2, w / 2 * dydx)); + Molecule a (me->lookup_l ()->beam (dydx, width, thick)); + a.translate (Offset (-width/2, width / 2 * dydx)); - int abbrev_flags = 1; - { - SCM a = get_elt_property ("abbrev-flags"); - if (gh_number_p (a)) - abbrev_flags = gh_scm2int (a); - } - - Molecule *beams= new Molecule; - for (int i = 0; i < abbrev_flags; i++) + int tremolo_flags; + SCM s = me->get_elt_property ("tremolo-flags"); + 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); + Molecule mol; + for (int i = 0; i < tremolo_flags; i++) { Molecule b (a); b.translate_axis (interbeam_f * i, Y_AXIS); - beams->add_molecule (b); + mol.add_molecule (b); } - beams->translate_axis (-beams->extent ()[Y_AXIS].center (), Y_AXIS); - - if (st) - { - if (st->beam_l ()) - { - beams->translate (Offset(st->hpos_f () - hpos_f (), - st->stem_end_position () * half_staff_space - - directional_element (st->beam_l ()).get () * beams_i * interbeam_f)); - } - else - { - /* - Beams should intersect one beamthickness below staff end - */ - Real dy = - beams->extent ()[Y_AXIS].length () / 2 * st->get_direction (); - - /* - uhg. Should use relative coords and placement - */ - Real whole_note_correction = (st && st->invisible_b( )) - ? -st->get_direction () * st->note_delta_f ()/2 - : 0.0; - - dy += st->stem_end_position (); - beams->translate (Offset(st->hpos_f () - hpos_f ()+ - whole_note_correction, dy)); - } + if (tremolo_flags) + mol.translate_axis (-mol.extent (Y_AXIS).center (), Y_AXIS); + if (beam) + { + // 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)); + } + 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 ); /* - there used to be half a page of code that was long commented out. - Removed in 1.1.35 - */ + 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)); } - return beams; + return mol.create_scheme(); } void -Stem_tremolo::set_stem (Stem *s) +Stem_tremolo::set_stem (Score_element*me,Score_element *s) { - set_elt_property ("stem", s->self_scm_); - add_dependency (s); + me->set_elt_property ("stem", s->self_scm ()); }