/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
#include "stream-event.hh"
#include "tie.hh"
#include "warn.hh"
+#include "misc.hh"
#include "translator.icc"
Every time process_music () is called and there are rest events, we
figure out how long the rest to typeset should be. It should be no
longer than what's specified, than what is left to do and it should
- not cross barlines.
+ not cross barlines or sub-bar units.
We copy the events into scratch rest events, to make sure that we get
all durations exactly right.
class Completion_rest_engraver : public Engraver
{
- vector<Item*> rests_;
- vector<Item*> prev_rests_;
- vector<Stream_event*> rest_events_;
+ vector<Item *> rests_;
+ vector<Stream_event *> rest_events_;
Moment rest_end_mom_;
bool is_first_;
Rational left_to_do_;
Rational do_nothing_until_;
Rational factor_;
- Moment next_barline_moment ();
- Item *make_rest (Stream_event*);
+ Moment next_moment (Rational const &);
+ Item *make_rest (Stream_event *);
public:
TRANSLATOR_DECLARATIONS (Completion_rest_engraver);
Completion_rest_engraver::listen_rest (Stream_event *ev)
{
rest_events_.push_back (ev);
-
+
is_first_ = true;
Moment now = now_mom ();
Moment musiclen = get_event_length (ev, now);
}
/*
- The duration _until_ the next barline.
+ The duration _until_ the next barline or completion unit
*/
Moment
-Completion_rest_engraver::next_barline_moment ()
+Completion_rest_engraver::next_moment (Rational const ¬e_len)
{
- Moment *e = unsmob_moment (get_property ("measurePosition"));
- Moment *l = unsmob_moment (get_property ("measureLength"));
+ Moment *e = Moment::unsmob (get_property ("measurePosition"));
+ Moment *l = Moment::unsmob (get_property ("measureLength"));
if (!e || !l || !to_boolean (get_property ("timing")))
{
return Moment (0, 0);
}
- return (*l - *e);
+ Moment result = *l - *e;
+ Moment const *unit = Moment::unsmob (get_property ("completionUnit"));
+
+ if (unit)
+ {
+ Rational const now_unit = e->main_part_ / unit->main_part_;
+ if (now_unit.den () > 1)
+ {
+ /*
+ within a unit - go to the end of that
+ */
+ result = unit->main_part_
+ * (Rational (1) - (now_unit - now_unit.trunc_rat ()));
+ }
+ else
+ {
+ /*
+ at the beginning of a unit:
+ take a power-of-two number of units, but not more than required,
+ since then the Duration constructor destroys the unit structure
+ */
+ if (note_len < result.main_part_)
+ result.main_part_ = note_len;
+ Rational const step_unit = result.main_part_ / unit->main_part_;
+ if (step_unit.den () < step_unit.num ())
+ {
+ int const log2
+ = intlog2 (int (step_unit.num () / step_unit.den ()));
+ result.main_part_ = unit->main_part_ * Rational (1 << log2);
+ }
+ }
+ }
+
+ return result;
}
-Item*
+Item *
Completion_rest_engraver::make_rest (Stream_event *ev)
{
Item *rest = make_item ("Rest", ev->self_scm ());
- if (Pitch *p = unsmob_pitch (ev->get_property ("pitch")))
+ if (Pitch *p = Pitch::unsmob (ev->get_property ("pitch")))
{
int pos = p->steps ();
SCM c0 = get_property ("middleCPosition");
if (scm_is_number (c0))
- pos += scm_to_int (c0);
+ pos += scm_to_int (c0);
rest->set_property ("staff-position", scm_from_int (pos));
}
return;
Duration rest_dur;
- Duration appearance;
Duration *orig = 0;
if (left_to_do_)
{
/*
- rest that rest_dur may be strictly less than left_to_do_
- (say, if left_to_do_ == 5/8)
+ note that rest_dur may be strictly less than left_to_do_
+ (say, if left_to_do_ == 5/8)
*/
- if (factor_.denominator () == 1 && factor_ > Rational (1, 1))
- rest_dur = Duration (left_to_do_, false);
- else
- rest_dur = Duration (left_to_do_ / factor_, false).compressed (factor_);
- appearance = Duration (left_to_do_, false);
+ rest_dur = Duration (left_to_do_ / factor_, false).compressed (factor_);
}
else
{
- orig = unsmob_duration (rest_events_[0]->get_property ("duration"));
+ orig = Duration::unsmob (rest_events_[0]->get_property ("duration"));
rest_dur = *orig;
- factor_ = rest_dur.factor ();
+ SCM factor = get_property ("completionFactor");
+ if (ly_is_procedure (factor))
+ factor = scm_call_2 (factor,
+ context ()->self_scm (),
+ rest_dur.smobbed_copy ());
+ factor_ = robust_scm2rational (factor, rest_dur.factor());
left_to_do_ = orig->get_length ();
}
- Moment nb = next_barline_moment ();
+ Moment nb = next_moment (rest_dur.get_length ());
if (nb.main_part_ && nb < rest_dur.get_length ())
{
- if (factor_.denominator () == 1 && factor_ > Rational (1, 1))
- rest_dur = Duration (nb.main_part_, false);
- else
- rest_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_);
+ rest_dur = Duration (nb.main_part_ / factor_, false).compressed (factor_);
}
do_nothing_until_ = now.main_part_ + rest_dur.get_length ();
Stream_event *event = rest_events_[i];
if (need_clone)
- event = event->clone ();
+ event = event->clone ();
SCM pits = rest_events_[i]->get_property ("pitch");
event->set_property ("pitch", pits);
Item *rest = make_rest (event);
if (need_clone)
- event->unprotect ();
+ event->unprotect ();
rests_.push_back (rest);
}
-
+
left_to_do_ -= rest_dur.get_length ();
if (left_to_do_)
- get_global_context ()->add_moment_to_process (now.main_part_ + rest_dur.get_length());
+ get_global_context ()->add_moment_to_process (now.main_part_ + rest_dur.get_length ());
/*
don't do complicated arithmetic with grace rests.
*/
void
Completion_rest_engraver::stop_translation_timestep ()
{
- if (rests_.size ())
- prev_rests_ = rests_;
rests_.clear ();
}
if (rest_end_mom_.main_part_ <= now.main_part_)
{
rest_events_.clear ();
- prev_rests_.clear ();
}
context ()->set_property ("restCompletionBusy",
- ly_bool2scm (rest_events_.size ()));
+ ly_bool2scm (rest_events_.size ()));
}
Completion_rest_engraver::Completion_rest_engraver ()
}
ADD_TRANSLATOR (Completion_rest_engraver,
- /* doc */
- "This engraver replaces @code{Rest_engraver}. It plays"
- " some trickery to break long rests into the next measure."
- ,
- /* create */
- "Rest "
- "Dots "
- ,
- /* read */
- "middleCPosition "
- "measurePosition "
- "measureLength "
- ,
- /* write */
- "restCompletionBusy "
- );
+ /* doc */
+ "This engraver replaces @code{Rest_engraver}. It plays"
+ " some trickery to break long rests into the next measure.",
+
+ /* create */
+ "Rest ",
+
+ /* read */
+ "completionFactor "
+ "completionUnit "
+ "middleCPosition "
+ "measurePosition "
+ "measureLength ",
+
+ /* write */
+ "restCompletionBusy "
+ );
projects / lilypond.git / blobdiff