/*
multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
- (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2009 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "staff-symbol-referencer.hh"
#include "stream-event.hh"
#include "moment.hh"
+#include "spanner.hh"
#include "translator.icc"
/* 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_);
+ stop_moment_ = now_mom () + get_event_length (rest_ev_, now_mom ());
/*
if (ASSIGN_EVENT_ONCE (rest_ev_, ev))
stop_moment_ = now_mom () + get_event_length (rest_ev_);
Multi_measure_rest_engraver::stop_translation_timestep ()
{
/* We cannot do this earlier, as breakableSeparationItem is not yet
- there. */
+ there.
+
+ Actually, we no longer use breakableSeparationItem -- should this be moved?
+ -- jneem */
if (bar_seen_)
{
- Grob *cmc = unsmob_grob (get_property ("breakableSeparationItem"));
- if (!cmc)
- cmc = unsmob_grob (get_property ("currentCommandColumn"));
+ Grob *cmc = unsmob_grob (get_property ("currentCommandColumn"));
/* Ugh, this is a kludge - need this for multi-measure-rest-grace.ly */
last_command_item_ = dynamic_cast<Item *> (cmc);
ADD_TRANSLATOR (Multi_measure_rest_engraver,
/* doc */
- "Engraves multi-measure rests that are produced with @code{R}. Reads "
- "measurePosition and internalBarNumber to determine what number to print "
- "over the MultiMeasureRest. Reads 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",
+ "Engrave multi-measure rests that are produced with"
+ " @samp{R}. It reads @code{measurePosition} and"
+ " @code{internalBarNumber} to determine what number to print"
+ " over the @ref{MultiMeasureRest}. Reads @code{measureLength}"
+ " to determine whether it should use a whole rest or a breve"
+ " rest to represent one measure.",
+
+ /* create */
+ "MultiMeasureRest "
+ "MultiMeasureRestNumber "
+ "MultiMeasureRestText ",
+
/* read */
"internalBarNumber "
"restNumberThreshold "
"breakableSeparationItem "
"currentCommandColumn "
"measurePosition "
- "measureLength",
- /* write */ "");
+ "measureLength ",
+
+ /* write */
+ ""
+ );