X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=9a0fb6f1714be67f415f42ab7fcdd5dde7d9c15e;hb=5ffda4a007986f26f314d6fc8bbd6d983647d65a;hp=71dead81d1eb4e5ec9b6a1d6897677866899e231;hpb=8002fa018c81f70585c25232247c6dcba7f5cba0;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 71dead81d1..9a0fb6f171 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,135 +1,203 @@ /* - 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--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 "item.hh" +#include "staff-symbol-referencer.hh" +#include "directional-element-interface.hh" -Stem_tremolo::Stem_tremolo () -{ - stem_l_ = 0; - abbrev_flags_i_ = 1; -} +/* + TODO: + lengthen stem if necessary + */ +MAKE_SCHEME_CALLBACK (Stem_tremolo,dim_callback,2); -void -Stem_tremolo::do_print () const +/* + todo: init with cons. + */ +SCM +Stem_tremolo::dim_callback (SCM e, SCM) { - DEBUG_OUT << "abbrev_flags_i_ " << abbrev_flags_i_; + Grob * se = unsmob_grob (e); + + Real space = Staff_symbol_referencer::staff_space (se); + return ly_interval2scm (Interval (-space, space)); } -Interval -Stem_tremolo::do_width () const +/* + ugh ? --from Slur + */ +MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2); +SCM +Stem_tremolo::height (SCM smob, SCM ax) { - Real space = stem_l_->staff_line_leading_f (); - return Interval (-space, space); -} + Axis a = (Axis)gh_scm2int (ax); + Grob * me = unsmob_grob (smob); + assert (a == Y_AXIS); -void -Stem_tremolo::do_pre_processing () -{ + SCM mol = me->get_uncached_molecule (); + + if (Molecule *m = unsmob_molecule (mol)) + return ly_interval2scm (m->extent (a)); + else + return ly_interval2scm (Interval()); } -Molecule* -Stem_tremolo::do_brew_molecule_p () const + +Molecule +Stem_tremolo::raw_molecule (Grob *me) { - int mult =0; - if (Beam * b = stem_l_->beam_l_) + Grob *stem = unsmob_grob (me->get_grob_property ("stem")); + Grob *beam = Stem::get_beam (stem); + + Real dydx; + if (beam) { - Stem_info i = b->get_stem_info (stem_l_); - mult = i.mult_i_; + Real dy = 0; + 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::staff_space (me); + Real thick = robust_scm2double (me->get_grob_property ("beam-thickness"),1); + Real width = robust_scm2double (me->get_grob_property ("beam-width"),1); + Real blot = me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter")); + + width *= ss; + thick *= ss; - 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; + Molecule a (Lookup::beam (dydx, width, thick, blot)); + a.translate (Offset (-width/2, width / 2 * dydx)); - Real beam_f = paper_l ()->get_realvar (beam_thickness_scm_sym); + int tremolo_flags = 0; + SCM s = me->get_grob_property ("flag-count"); + if (gh_number_p (s)) + tremolo_flags = gh_scm2int (s); + + if (!tremolo_flags) + { + programming_error ("No tremolo flags?"); - int beams_i = 0; - Real slope_f = internote_f / 4 / internote_f; // HUH? + me->suicide(); + return Molecule (); + } - 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; + /* + Who the fuck is 0.81 ? - Molecule a (lookup_l ()->beam (sl, w, beam_f)); - a.translate (Offset (-w/2, w / 2 * slope_f)); + --hwn. + */ + Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81; - Molecule *beams= new Molecule; - for (int i = 0; i < abbrev_flags_i_; i++) + 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); + b.translate_axis (beam_translation * i, Y_AXIS); + mol.add_molecule (b); + } + 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->live ()) + ? 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)) + { + beamthickness = gh_scm2double (sbt) * ss; } - 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_->dir_ * beams_i * interbeam_f)); - } - else - { - /* - Beams should intersect one beamthickness below staff end - */ - Real dy = - beams->extent ()[Y_AXIS].length () / 2 * stem_l_->dir_; - - /* - uhg. Should use relative coords and placement - */ - Real whole_note_correction = (stem_l_ && stem_l_->invisible_b( )) - ? -stem_l_->get_dir () * 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)); - } - /* - there used to be half a page of code that was long commented out. - Removed in 1.1.35 - */ + 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 + { + mol.translate_axis (end_y - stemdir * beam_translation + -mol_ext [stemdir] + , Y_AXIS); } - return beams; + return mol.smobbed_copy (); } + void -Stem_tremolo::do_substitute_element_pointer (Score_element*o, Score_element*n) +Stem_tremolo::set_stem (Grob*me,Grob *s) { - if (stem_l_ == o) - stem_l_ = dynamic_cast (n); + me->set_grob_property ("stem", s->self_scm ()); } -void -Stem_tremolo::set_stem (Stem *s) -{ - stem_l_ = s; - add_dependency (s); -} +ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", + "", + "stem beam-width beam-thickness flag-count");