#include "staff-symbol-referencer.hh"
#include "stream-event.hh"
#include "moment.hh"
+#include "spanner.hh"
#include "translator.icc"
void
Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev)
{
+ /* FIXME: Should use ASSIGN_EVENT_ONCE. Can't do that yet because of
+ the kill-mm-rests hack in part-combine-iterator. */
rest_ev_ = ev;
stop_moment_ = now_mom () + get_event_length (rest_ev_);
+ /*
+ if (ASSIGN_EVENT_ONCE (rest_ev_, ev))
+ stop_moment_ = now_mom () + get_event_length (rest_ev_);
+ */
}
IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_text);
}
start_measure_
- = scm_to_int (get_property ("currentBarNumber"));
+ = scm_to_int (get_property ("internalBarNumber"));
}
bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar"));
last_rest_ = mmrest_;
last_numbers_ = numbers_;
- int cur = scm_to_int (get_property ("currentBarNumber"));
+ int cur = scm_to_int (get_property ("internalBarNumber"));
int num = cur - start_measure_;
/*
ADD_TRANSLATOR (Multi_measure_rest_engraver,
/* doc */
"Engraves multi-measure rests that are produced with @code{R}. Reads "
- "measurePosition and currentBarNumber to determine what number to print "
- "over the MultiMeasureRest. Reads measureLength to determine if it "
+ "@code{measurePosition} and @code{internalBarNumber} to determine what number to print "
+ "over the @ref{MultiMeasureRest}. Reads @code{measureLength} to determine if it "
"should use a whole rest or a breve rest to represent 1 measure ",
- /* create */ "MultiMeasureRest MultiMeasureRestNumber MultiMeasureRestText",
- /* accept */ "multi-measure-rest-event multi-measure-text-event",
+
+ /* create */
+ "MultiMeasureRest "
+ "MultiMeasureRestNumber "
+ "MultiMeasureRestText ",
+
/* read */
- "currentBarNumber "
+ "internalBarNumber "
"restNumberThreshold "
"breakableSeparationItem "
"currentCommandColumn "
"measurePosition "
- "measureLength",
+ "measureLength ",
+
/* write */ "");