X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstem-tremolo.cc;h=d48091537aca3d55cc033389ef47dab9d126d43b;hb=6763499909fb2d50839226aca25c0dea0801f8ae;hp=5f2667bb7952ab24b943957340b4fb6987b8be9f;hpb=1a71119277d04b287b3a976c526adba6500239c6;p=lilypond.git diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 5f2667bb79..d48091537a 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -1,135 +1,316 @@ -/* - abbrev.cc -- implement Stem_tremolo - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1997--2012 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #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 () +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_slope, 1) +SCM +Stem_tremolo::calc_slope (SCM smob) { - stem_l_ = 0; - abbrev_flags_i_ = 1; + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + Spanner *beam = Stem::get_beam (stem); + + if (beam) + { + Real dy = 0; + SCM s = beam->get_property ("quantized-positions"); + if (is_number_pair (s)) + dy = - scm_to_double (scm_car (s)) + scm_to_double (scm_cdr (s)); + + Grob *s2 = Beam::last_normal_stem (beam); + Grob *s1 = Beam::first_normal_stem (beam); + + Grob *common = s1->common_refpoint (s2, X_AXIS); + Real dx = s2->relative_coordinate (common, X_AXIS) + - s1->relative_coordinate (common, X_AXIS); + + return scm_from_double (dx ? dy / dx : 0); + } + else + /* down stems with flags should have more sloped trems (helps avoid + flag/stem collisions without making the stem very long) */ + return scm_from_double ((Stem::duration_log (stem) >= 3 && get_grob_direction (stem) == DOWN) + ? 0.40 : 0.25); } -void -Stem_tremolo::do_print () const +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_width, 1) +SCM +Stem_tremolo::calc_width (SCM smob) { - DEBUG_OUT << "abbrev_flags_i_ " << abbrev_flags_i_; + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + Direction stemdir = get_grob_direction (stem); + bool beam = Stem::get_beam (stem); + bool flag = Stem::duration_log (stem) >= 3 && !beam; + + /* beamed stems and up-stems with flags have shorter tremolos */ + return scm_from_double (((stemdir == UP && flag) || beam) ? 1.0 : 1.5); } -Interval -Stem_tremolo::do_width () const +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_style, 1) +SCM +Stem_tremolo::calc_style (SCM smob) { - Real space = stem_l_->staff_line_leading_f (); - return Interval (-space, space); + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + Direction stemdir = get_grob_direction (stem); + bool beam = Stem::get_beam (stem); + bool flag = Stem::duration_log (stem) >= 3 && !beam; + + return ly_symbol2scm (((stemdir == UP && flag) || beam) ? "rectangle" : "default"); } -void -Stem_tremolo::do_pre_processing () +Real +Stem_tremolo::get_beam_translation (Grob *me) { + Grob *stem = unsmob_grob (me->get_object ("stem")); + Spanner *beam = Stem::get_beam (stem); + + return (beam && beam->is_live ()) + ? Beam::get_beam_translation (beam) + : (Staff_symbol_referencer::staff_space (me) + * robust_scm2double (me->get_property ("length-fraction"), 1.0) * 0.81); } -Molecule* -Stem_tremolo::do_brew_molecule_p () const +Stencil +Stem_tremolo::raw_stencil (Grob *me, Real slope, Direction stemdir) { - int mult =0; - if (Beam * b = stem_l_->beam_l_) + 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->layout ()->get_dimension (ly_symbol2scm ("blot-diameter")); + SCM style = me->get_property ("style"); + if (!scm_is_symbol (style)) + style = ly_symbol2scm ("default"); + + width *= ss; + thick *= ss; + + Stencil a; + if (style == ly_symbol2scm ("rectangle")) + a = Lookup::rotated_box (slope, width, thick, blot); + else + a = Lookup::beam (slope, width, thick, blot); + + a.align_to (X_AXIS, CENTER); + a.align_to (Y_AXIS, CENTER); + + int tremolo_flags = robust_scm2int (me->get_property ("flag-count"), 0); + if (!tremolo_flags) { - Stem_info i = b->get_stem_info (stem_l_); - mult = i.mult_i_; + programming_error ("no tremolo flags"); + + me->suicide (); + return Stencil (); } - - 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 ()->beam_thickness_f (); - - 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++) + + Real beam_translation = get_beam_translation (me); + + 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 * stemdir * -1, Y_AXIS); + mol.add_stencil (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_->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 - */ + return mol; +} + +MAKE_SCHEME_CALLBACK (Stem_tremolo, pure_height, 3); +SCM +Stem_tremolo::pure_height (SCM smob, SCM, SCM) +{ + Item *me = unsmob_item (smob); + + /* + Cannot use the real slope, since it looks at the Beam. + */ + Stencil s1 (untranslated_stencil (me, 0.35)); + Item *stem = unsmob_item (me->get_object ("stem")); + if (!stem) + return ly_interval2scm (s1.extent (Y_AXIS)); + + Direction stemdir = get_grob_direction (stem); + if (stemdir == 0) + stemdir = UP; + + Spanner *beam = Stem::get_beam (stem); + + if (!beam) + return ly_interval2scm (s1.extent (Y_AXIS)); + + Interval ph = stem->pure_height (stem, 0, INT_MAX); + Stem_info si = Stem::get_stem_info (stem); + ph[-stemdir] = si.shortest_y_; + int beam_count = Stem::beam_multiplicity (stem).length () + 1; + Real beam_translation = get_beam_translation (me); + + ph = ph - stemdir * max (beam_count, 1) * beam_translation; + ph = ph - ph.center (); + + return ly_interval2scm (ph); +} + +MAKE_SCHEME_CALLBACK (Stem_tremolo, width, 1); +SCM +Stem_tremolo::width (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + /* + Cannot use the real slope, since it looks at the Beam. + */ + Stencil s1 (untranslated_stencil (me, 0.35)); + + return ly_interval2scm (s1.extent (X_AXIS)); +} + +Real +Stem_tremolo::vertical_length (Grob *me) +{ + return untranslated_stencil (me, 0.35).extent (Y_AXIS).length (); +} + +Stencil +Stem_tremolo::untranslated_stencil (Grob *me, Real slope) +{ + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (!stem) + { + programming_error ("no stem for stem-tremolo"); + return Stencil (); } - - return beams; + + Direction stemdir = get_grob_direction (stem); + if (!stemdir) + stemdir = UP; + + bool whole_note = Stem::duration_log (stem) <= 0; + + /* for a whole note, we position relative to the notehead, so we want the + stencil aligned on the flag closest to the head */ + Direction stencil_dir = whole_note ? -stemdir : stemdir; + return raw_stencil (me, slope, stencil_dir); +} + +MAKE_SCHEME_CALLBACK (Stem_tremolo, calc_y_offset, 1); +SCM +Stem_tremolo::calc_y_offset (SCM smob) +{ + Grob *me = unsmob_grob (smob); + return scm_from_double (y_offset (me, false)); } -void -Stem_tremolo::do_substitute_element_pointer (Score_element*o, Score_element*n) +MAKE_SCHEME_CALLBACK (Stem_tremolo, pure_calc_y_offset, 3); +SCM +Stem_tremolo::pure_calc_y_offset (SCM smob, + SCM, /* start */ + SCM /* end */) { - if (stem_l_ == o) - stem_l_ = dynamic_cast (n); + Grob *me = unsmob_grob (smob); + return scm_from_double (y_offset (me, true)); } +Real +Stem_tremolo::y_offset (Grob *me, bool pure) +{ + Item *stem = unsmob_item (me->get_object ("stem")); + if (!stem) + return 0.0; + + Direction stemdir = get_grob_direction (stem); + if (stemdir == 0) + stemdir = UP; + + Spanner *beam = Stem::get_beam (stem); + Real beam_translation = get_beam_translation (me); -void -Stem_tremolo::set_stem (Stem *s) + int beam_count = beam ? (Stem::beam_multiplicity (stem).length () + 1) : 0; + + if (pure && beam) + { + Interval ph = stem->pure_height (stem, 0, INT_MAX); + Stem_info si = Stem::get_stem_info (stem); + ph[-stemdir] = si.shortest_y_; + + return (ph - stemdir * max (beam_count, 1) * beam_translation)[stemdir] - stemdir * 0.5 * me->pure_height (me, 0, INT_MAX).length (); + } + + Real end_y + = (pure + ? stem->pure_height (stem, 0, INT_MAX)[stemdir] + : stem->extent (stem, Y_AXIS)[stemdir]) + - stemdir * max (beam_count, 1) * beam_translation + - Stem::beam_end_corrective (stem); + + if (!beam && Stem::duration_log (stem) >= 3) + { + end_y -= stemdir * (Stem::duration_log (stem) - 2) * beam_translation; + if (stemdir == UP) + end_y -= stemdir * beam_translation * 0.5; + } + + bool whole_note = Stem::duration_log (stem) <= 0; + if (whole_note) + { + /* we shouldn't position relative to the end of the stem since the stem + is invisible */ + Real ss = Staff_symbol_referencer::staff_space (me); + vector nhp = Stem::note_head_positions (stem); + Real note_head = (stemdir == UP ? nhp.back () : nhp[0]) * ss / 2; + end_y = note_head + stemdir * 1.5; + } + + return end_y; +} + +MAKE_SCHEME_CALLBACK (Stem_tremolo, print, 1); +SCM +Stem_tremolo::print (SCM grob) { - stem_l_ = s; - add_dependency (s); + Grob *me = unsmob_grob (grob); + + Stencil s = untranslated_stencil (me, robust_scm2double (me->get_property ("slope"), 0.25)); + return s.smobbed_copy (); } + +ADD_INTERFACE (Stem_tremolo, + "A beam slashing a stem to indicate a tremolo. The property" + " @code{style} can be @code{default} or @code{rectangle}.", + + /* properties */ + "beam-thickness " + "beam-width " + "flag-count " + "length-fraction " + "stem " + "style " + "slope " + );