/*
- chord-tremolo-engraver.cc -- implement Chord_tremolo_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
-
- (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
Erik Sandberg <mandolaerik@gmail.com>
+
+ 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 <http://www.gnu.org/licenses/>.
*/
#include "beam.hh"
protected:
Stream_event *repeat_;
- int flags_;
- // number of beams for short tremolos
- int expected_beam_count_;
// current direction of beam (first RIGHT, then LEFT)
Direction beam_dir_;
Spanner *beam_;
+
protected:
virtual void finalize ();
void process_music ();
{
beam_ = 0;
repeat_ = 0;
- flags_ = 0;
- expected_beam_count_ = 0;
beam_dir_ = CENTER;
}
{
if (ASSIGN_EVENT_ONCE (repeat_, ev))
{
- int type = scm_to_int (ev->get_property ("tremolo-type"));
- /* e.g. 1 for type 8, 2 for type 16 */
- flags_ = intlog2 (type) - 2;
- expected_beam_count_ = scm_to_int (ev->get_property ("expected-beam-count"));
beam_dir_ = RIGHT;
}
}
ev->origin ()->warning (_ ("No tremolo to end"));
repeat_ = 0;
beam_ = 0;
- expected_beam_count_ = 0;
beam_dir_ = CENTER;
}
}
{
if (beam_)
{
- Grob *s = info.grob ();
+ int tremolo_type = robust_scm2int (repeat_->get_property ("tremolo-type"), 1);
+ int flags = max (0, intlog2 (tremolo_type) - 2);
+ int repeat_count = robust_scm2int (repeat_->get_property ("repeat-count"), 1);
+ int gap_count = min (flags, intlog2 (repeat_count) + 1);
- Stem::set_beaming (s, flags_, beam_dir_);
+ Grob *s = info.grob ();
+ Stem::set_beaming (s, flags, beam_dir_);
if (Stem::duration_log (s) != 1)
- beam_->set_property ("gap-count", scm_from_int (flags_ - expected_beam_count_));
+ beam_->set_property ("gap-count", scm_from_int (gap_count));
if (beam_dir_ == RIGHT)
{
ADD_ACKNOWLEDGER (Chord_tremolo_engraver, stem);
ADD_TRANSLATOR (Chord_tremolo_engraver,
- /* doc */ "Generates beams for tremolo repeats.",
- /* create */ "Beam",
- /* read */ "",
- /* write */ "");
+ /* doc */
+ "Generate beams for tremolo repeats.",
+
+ /* create */
+ "Beam ",
+
+ /* read */
+ "",
+
+ /* write */
+ ""
+ );