X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=94e0c366835c32e56e7ca2a625c2cc4841da1aee;hb=85d8b50f9d36b3f2d38aa11de3755cf563ac49e3;hp=5ada498afdccf158f749831a380d9fced3337ba7;hpb=6fd2c101db89f70b080ec95fc0b458a760bd336a;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 5ada498afd..94e0c36683 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,136 +1,182 @@ -/* - 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--2005 Han-Wen Nienhuys +*/ #include "stem-tremolo.hh" -#include "debug.hh" + +#include "spanner.hh" #include "beam.hh" -#include "paper-def.hh" +#include "directional-element-interface.hh" +#include "item.hh" #include "lookup.hh" +#include "output-def.hh" +#include "staff-symbol-referencer.hh" #include "stem.hh" -#include "offset.hh" +#include "warn.hh" -Stem_tremolo::Stem_tremolo () -{ - stem_l_ = 0; - abbrev_flags_i_ = 1; -} +/* TODO: lengthen stem if necessary */ -void -Stem_tremolo::do_print () const -{ - DEBUG_OUT << "abbrev_flags_i_ " << abbrev_flags_i_; -} +MAKE_SCHEME_CALLBACK (Stem_tremolo, dim_callback, 2); -Interval -Stem_tremolo::do_width () const +/* todo: init with cons. */ +SCM +Stem_tremolo::dim_callback (SCM e, SCM) { - Real space = stem_l_->staff_line_leading_f (); - return Interval (-space, space); + Grob *se = unsmob_grob (e); + + Real space = Staff_symbol_referencer::staff_space (se); + return ly_interval2scm (Interval (-space, space)); } -void -Stem_tremolo::do_pre_processing () +MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2); +SCM +Stem_tremolo::height (SCM smob, SCM ax) { + Axis a = (Axis)scm_to_int (ax); + Grob *me = unsmob_grob (smob); + assert (a == Y_AXIS); + + + /* TODO: fixme. uncached? */ + return ly_interval2scm (me->get_stencil () + ? me->get_stencil ()->extent (a) + : Interval()); } -Molecule* -Stem_tremolo::do_brew_molecule_p () const +Stencil +Stem_tremolo::raw_stencil (Grob *me) { - int mult =0; - if (Beam * b = stem_l_->beam_l_) + Grob *stem = unsmob_grob (me->get_object ("stem")); + Spanner *beam = Stem::get_beam (stem); + + SCM slope = me->get_property ("slope"); + Real dydx = 0.25; + if (scm_is_number (slope)) { - Stem_info i = b->get_stem_info (stem_l_); - mult = i.mult_i_; + dydx = robust_scm2double (slope, 0.0); } - - Real interbeam_f = paper_l ()->interbeam_f (mult); - Real w = 1.5 * lookup_l ()->notehead (2, "").dim_[X_AXIS].length (); - Real space = stem_l_->staff_line_leading_f (); - Real internote_f = space/2; - - Real beam_f = paper_l ()->get_var ("beam_thickness"); - - int beams_i = 0; - Real slope_f = internote_f / 4 / internote_f; // HUH? - - if (stem_l_ && stem_l_->beam_l_) { - slope_f = stem_l_->beam_l_->slope_f_; - // ugh, rather calc from Stem_tremolo_req - beams_i = stem_l_->beams_i_drul_[RIGHT] >? stem_l_->beams_i_drul_[LEFT]; - } - Real sl = slope_f * internote_f; - - Molecule a (lookup_l ()->beam (sl, w, beam_f)); - a.translate (Offset (-w/2, w / 2 * slope_f)); - - Molecule *beams= new Molecule; - for (int i = 0; i < abbrev_flags_i_; i++) + else { - Molecule b (a); - b.translate_axis (interbeam_f * i, Y_AXIS); - beams->add_molecule (b); - } - beams->translate_axis (-beams->extent ()[Y_AXIS].center (), Y_AXIS); - - if (stem_l_) - { - if (stem_l_->beam_l_) - { - beams->translate (Offset(stem_l_->hpos_f () - hpos_f (), - stem_l_->stem_end_f () * internote_f - - stem_l_->beam_l_->get_direction () * beams_i * interbeam_f)); - } - else - { - /* - Beams should intersect one beamthickness below staff end - */ - Real dy = - beams->extent ()[Y_AXIS].length () / 2 * stem_l_->get_direction (); - - /* - uhg. Should use relative coords and placement - */ - Real whole_note_correction = (stem_l_ && stem_l_->invisible_b( )) - ? -stem_l_->get_direction () * stem_l_->note_delta_f ()/2 - : 0.0; - - /* - UGH. Internote fudging. - */ - dy /= internote_f; - dy += stem_l_->stem_end_f (); - dy *= internote_f; - beams->translate (Offset(stem_l_->hpos_f () - hpos_f ()+ - whole_note_correction, dy)); + if (beam) + { + Real dy = 0; + SCM s = beam->get_property ("positions"); + if (is_number_pair (s)) + dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_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; } + } + 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_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); + + width *= ss; + thick *= ss; + + Stencil a (Lookup::beam (dydx, width, thick, blot)); + a.translate (Offset (-width * 0.5, width * 0.5 * dydx)); + + int tremolo_flags = 0; + SCM s = me->get_property ("flag-count"); + if (scm_is_number (s)) + tremolo_flags = scm_to_int (s); + + if (!tremolo_flags) + { + programming_error ("no tremolo flags"); + + me->suicide (); + return Stencil (); + } - /* - there used to be half a page of code that was long commented out. - Removed in 1.1.35 - */ + /* Who the fuck is 0.81 ? --hwn. */ + Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81; + + Stencil mol; + for (int i = 0; i < tremolo_flags; i++) + { + Stencil b (a); + b.translate_axis (beam_translation * i, Y_AXIS); + mol.add_stencil (b); } - - return beams; + return mol; } -void -Stem_tremolo::do_substitute_element_pointer (Score_element*o, Score_element*n) +MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1); +SCM +Stem_tremolo::print (SCM grob) { - if (stem_l_ == o) - stem_l_ = dynamic_cast (n); -} + Grob *me = unsmob_grob (grob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (!stem) + { + programming_error ("no stem for stem-tremolo"); + return SCM_EOL; + } + Spanner *beam = Stem::get_beam (stem); + Direction stemdir = get_grob_direction (stem); + if (stemdir == 0) + stemdir = UP; -void -Stem_tremolo::set_stem (Stem *s) -{ - stem_l_ = s; - add_dependency (s); + Real beam_translation + = (beam && beam->is_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 (scm_is_number (sbt)) + beamthickness = scm_to_double (sbt) * ss; + + Real end_y + = Stem::stem_end_position (stem) * ss / 2 + - stemdir * (beam_count * beamthickness + + (max (beam_count -1, 0) * beam_translation)); + + /* FIXME: 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 + 0.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 + mol.translate_axis (end_y - stemdir * beam_translation -mol_ext [stemdir], + Y_AXIS); + + return mol.smobbed_copy (); } +ADD_INTERFACE (Stem_tremolo, "stem-tremolo-interface", + "A beam slashing a stem to indicate a tremolo.", + "stem " + "slope " + "beam-width " + "beam-thickness " + "flag-count");