X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=8f275069d43311458956ee0265791309a7870003;hb=413d846f72eed6628af377f9c0b11ccffdd12f79;hp=06c9d7991ec961b7cc151c38118b886e0ad3c2c7;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 06c9d7991e..8f275069d4 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -3,75 +3,64 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ - -#include "stem-tremolo.hh" -#include "warn.hh" +#include "spanner.hh" #include "beam.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "stem.hh" +#include "directional-element-interface.hh" #include "item.hh" +#include "lookup.hh" +#include "output-def.hh" #include "staff-symbol-referencer.hh" -#include "directional-element-interface.hh" +#include "stem-tremolo.hh" +#include "stem.hh" +#include "warn.hh" -/* - TODO: - lengthen stem if necessary - */ -MAKE_SCHEME_CALLBACK (Stem_tremolo,dim_callback,2); +/* TODO: lengthen stem if necessary */ -/* - todo: init with cons. - */ +MAKE_SCHEME_CALLBACK (Stem_tremolo, dim_callback, 2); + +/* todo: init with cons. */ SCM Stem_tremolo::dim_callback (SCM e, SCM) { - Grob * se = unsmob_grob (e); + Grob *se = unsmob_grob (e); Real space = Staff_symbol_referencer::staff_space (se); return ly_interval2scm (Interval (-space, space)); } -/* - ugh ? --from Slur - */ +/* ugh ? --from Slur */ MAKE_SCHEME_CALLBACK (Stem_tremolo, height, 2); SCM Stem_tremolo::height (SCM smob, SCM ax) { - Axis a = (Axis)gh_scm2int (ax); - Grob * me = unsmob_grob (smob); + Axis a = (Axis)scm_to_int (ax); + Grob *me = unsmob_grob (smob); assert (a == Y_AXIS); - SCM mol = me->get_uncached_molecule (); + SCM mol = me->get_uncached_stencil (); - if (Molecule *m = unsmob_molecule (mol)) + if (Stencil *m = unsmob_stencil (mol)) return ly_interval2scm (m->extent (a)); else - return ly_interval2scm (Interval()); + return ly_interval2scm (Interval ()); } - -MAKE_SCHEME_CALLBACK (Stem_tremolo,brew_molecule,1); -SCM -Stem_tremolo::brew_molecule (SCM smob) +Stencil +Stem_tremolo::raw_stencil (Grob *me) { - Grob *me= unsmob_grob (smob); - Grob * stem = unsmob_grob (me->get_grob_property ("stem")); - Grob * beam = Stem::get_beam (stem); - + Grob *stem = unsmob_grob (me->get_property ("stem")); + Spanner*beam = Stem::get_beam (stem); Real dydx; if (beam) { Real dy = 0; - SCM s = beam->get_grob_property ("positions"); - if (gh_pair_p (s)) - { - dy = -gh_scm2double (gh_car (s)) +gh_scm2double (gh_cdr (s)); - } + 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; @@ -80,99 +69,108 @@ Stem_tremolo::brew_molecule (SCM smob) // urg dydx = 0.25; - Real ss = Staff_symbol_referencer::staff_space (stem); - Real thick = gh_scm2double (me->get_grob_property ("beam-thickness")); - Real width = gh_scm2double (me->get_grob_property ("beam-width")); + 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_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")); + width *= ss; thick *= ss; - Molecule a (Lookup::beam (dydx, width, thick)); - a.translate (Offset (-width/2, width / 2 * dydx)); + 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_grob_property ("flag-count"); - if (gh_number_p (s)) - tremolo_flags = gh_scm2int (s); + 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 SCM_EOL; + me->suicide (); + return Stencil (); } - /* - Who the fuck is 0.81 ? - - --hwn. - */ + /* Who the fuck is 0.81 ? --hwn. */ Real beam_translation = beam ? Beam::get_beam_translation (beam) : 0.81; - Molecule mol; + Stencil mol; for (int i = 0; i < tremolo_flags; i++) { - Molecule b (a); + Stencil b (a); b.translate_axis (beam_translation * i, Y_AXIS); - mol.add_molecule (b); + mol.add_stencil (b); } + 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; + } + + Spanner *beam = Stem::get_beam (stem); Direction stemdir = Stem::get_direction (stem); - Interval mol_ext = mol.extent (Y_AXIS); + if (stemdir == 0) + stemdir = UP; - // ugh, rather calc from Stem_tremolo_req - int beams_i = (beam) ? (Stem::beam_multiplicity (stem).length ()+ 1): 0; + Real beam_translation + = (beam && beam->is_live ()) + ? Beam::get_beam_translation (beam) + : 0.81; - /* - TODO. - */ + 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_grob_property ("thickness") : SCM_EOL ; - if (gh_number_p (sbt)) - { - beamthickness = gh_scm2double (sbt) * ss; - } + 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 * (beams_i * beamthickness - + ((beams_i -1) >? 0) * beam_translation); + = 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; + /* 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 not enough space, center on remaining space, - else one beamspace away from stem end. - */ - if (stemdir * (end_y - chord_start_y) - 2*padding - mol_ext.length () < 0.0) + /* 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.translate_axis ((end_y + chord_start_y) /2.0 - mol_ext.center (),Y_AXIS); + 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); - } - + mol.translate_axis (end_y - stemdir * beam_translation -mol_ext [stemdir], + Y_AXIS); + return mol.smobbed_copy (); } -void -Stem_tremolo::set_stem (Grob*me,Grob *s) -{ - me->set_grob_property ("stem", s->self_scm ()); -} - ADD_INTERFACE (Stem_tremolo,"stem-tremolo-interface", - "", + "A beam slashing a stem to indicate a tremolo.", "stem beam-width beam-thickness flag-count");