X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=3e88861cca6910471384a840bee0151c2687bf97;hb=f0996bcf2f14bd4d55de4ef83b5266fc77bbab52;hp=db15d09e4be192f6e2182147d9bc281ab612ee6d;hpb=f6e3a77381e8eb67aa01195ec3945bd978f86aa8;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index db15d09e4b..3e88861cca 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,140 +1,178 @@ /* - 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--2004 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 "stem.hh" -#include "offset.hh" -#include "dimension-cache.hh" +#include "output-def.hh" #include "staff-symbol-referencer.hh" -#include "directional-element-interface.hh" +#include "stem.hh" +#include "warn.hh" -Stem_tremolo::Stem_tremolo () -{ - set_elt_property ("stem", SCM_EOL); -} +/* TODO: lengthen stem if necessary */ +MAKE_SCHEME_CALLBACK (Stem_tremolo, dim_callback, 2); -Stem * -Stem_tremolo::stem_l ()const +/* todo: init with cons. */ +SCM +Stem_tremolo::dim_callback (SCM e, SCM) { - SCM s = get_elt_property ("stem"); - - return dynamic_cast ( unsmob_element (s)); + Grob *se = unsmob_grob (e); + + Real space = Staff_symbol_referencer::staff_space (se); + return ly_interval2scm (Interval (-space, space)); } -Interval -Stem_tremolo::dim_callback (Dimension_cache const *c) +/* ugh ? --from Slur */ +MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2); +SCM +Stem_tremolo::height (SCM smob, SCM ax) { - Stem_tremolo * s = dynamic_cast (c->element_l ()); - Real space = Staff_symbol_referencer_interface (s->stem_l ()) - .staff_space (); - return Interval (-space, space); -} + Axis a = (Axis)scm_to_int (ax); + Grob *me = unsmob_grob (smob); + assert (a == Y_AXIS); + SCM mol = me->get_uncached_stencil (); + + if (Stencil *m = unsmob_stencil (mol)) + return ly_interval2scm (m->extent (a)); + else + return ly_interval2scm (Interval ()); +} -Molecule* -Stem_tremolo::do_brew_molecule_p () const +Stencil +Stem_tremolo::raw_stencil (Grob *me) { - Stem * st = stem_l (); - int mult =0; - if (Beam * b = st->beam_l ()) + Grob *stem = unsmob_grob (me->get_property ("stem")); + Spanner*beam = Stem::get_beam (stem); + Real dydx; + if (beam) { - mult = b->get_multiplicity (); + 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; } + else + // urg + dydx = 0.25; + + 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; - 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; + Stencil a (Lookup::beam (dydx, width, thick, blot)); + a.translate (Offset (-width * 0.5, width * 0.5 * dydx)); - if (st && st->beam_l ()) + 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) { - Real dy = 0; - SCM s = st->beam_l ()->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; - - // ugh, rather calc from Stem_tremolo_req - beams_i = st->beam_count(RIGHT) >? st->beam_count (LEFT); - } + programming_error ("No tremolo flags?"); - Molecule a (lookup_l ()->beam (dydx, w, beam_f)); - a.translate (Offset (-w/2, w / 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++) + me->suicide (); + return Stencil (); + } + + /* 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++) { - Molecule b (a); - b.translate_axis (interbeam_f * i, Y_AXIS); - beams->add_molecule (b); + Stencil b (a); + b.translate_axis (beam_translation * i, Y_AXIS); + mol.add_stencil (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)); - } - - /* - there used to be half a page of code that was long commented out. - Removed in 1.1.35 - */ + return mol; +} + +MAKE_SCHEME_CALLBACK (Stem_tremolo,print,1); +SCM +Stem_tremolo::print (SCM grob) +{ + Grob *me = unsmob_grob (grob); + Grob *stem = unsmob_grob (me->get_property ("stem")); + if (!stem) + { + programming_error ("No stem for stem-tremolo"); + return SCM_EOL; } - return beams; + Spanner *beam = Stem::get_beam (stem); + Direction stemdir = Stem::get_direction (stem); + if (stemdir == 0) + stemdir = UP; + + 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 + + ((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 (); } -void -Stem_tremolo::set_stem (Stem *s) -{ - set_elt_property ("stem", s->self_scm_); - add_dependency (s); -} +ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", + "A beam slashing a stem to indicate a tremolo.", + "stem beam-width beam-thickness flag-count");