/*
- completion-note-heads-engraver.cc -- Completion_heads_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ 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 <cctype>
Rational left_to_do_;
Rational do_nothing_until_;
+ Rational factor_;
+
Moment next_barline_moment ();
Item *make_note_head (Stream_event*);
Duration note_dur;
Duration *orig = 0;
if (left_to_do_)
- note_dur = Duration (left_to_do_, false);
+ {
+ /*
+ note that note_dur may be strictly less than left_to_do_
+ (say, if left_to_do_ == 5/8)
+ */
+ note_dur = Duration (left_to_do_ / factor_, false).compressed (factor_);
+ }
else
{
orig = unsmob_duration (note_events_[0]->get_property ("duration"));
note_dur = *orig;
+ factor_ = note_dur.factor ();
+ left_to_do_ = orig->get_length ();
}
Moment nb = next_barline_moment ();
if (nb.main_part_ && nb < note_dur.get_length ())
- {
- note_dur = Duration (nb.main_part_, false);
-
- do_nothing_until_ = now.main_part_ + note_dur.get_length ();
- }
+ note_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_);
- if (orig)
- left_to_do_ = orig->get_length ();
+ do_nothing_until_ = now.main_part_ + note_dur.get_length ();
for (vsize i = 0; left_to_do_ && i < note_events_.size (); i++)
{
event = event->clone ();
SCM pits = note_events_[i]->get_property ("pitch");
+ Duration appearance = note_dur;
+ if (factor_.denominator () == 1 && factor_ > Rational (1, 1))
+ appearance = Duration (note_dur.get_length (), false);
event->set_property ("pitch", pits);
- event->set_property ("duration", note_dur.smobbed_copy ());
- event->set_property ("length", Moment (note_dur.get_length ()).smobbed_copy ());
- event->set_property ("duration-log", scm_from_int (note_dur.duration_log ()));
+ event->set_property ("duration", appearance.smobbed_copy ());
+ event->set_property ("length", Moment (appearance.get_length ()).smobbed_copy ());
+ event->set_property ("duration-log", scm_from_int (appearance.duration_log ()));
Item *note = make_note_head (event);
if (need_clone)