X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmulti-measure-rest-engraver.cc;h=9391aac0b880d9f56f5b4fc30e1c74a744857121;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3c7eed7524500cdbf455151667b93c1db892aa6e;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 3c7eed7524..9391aac0b8 100644
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -1,7 +1,7 @@
 /*
   multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver
 
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2008 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
@@ -10,7 +10,11 @@
 #include "engraver-group.hh"
 #include "side-position-interface.hh"
 #include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
 #include "moment.hh"
+#include "spanner.hh"
+
+#include "translator.icc"
 
 /**
    The name says it all: make multi measure rests
@@ -21,15 +25,16 @@ public:
   TRANSLATOR_DECLARATIONS (Multi_measure_rest_engraver);
 
 protected:
-  virtual bool try_music (Music *);
   void process_music ();
   void stop_translation_timestep ();
   void start_translation_timestep ();
   virtual void finalize ();
+  DECLARE_TRANSLATOR_LISTENER (multi_measure_rest);
+  DECLARE_TRANSLATOR_LISTENER (multi_measure_text);
 
 private:
-  Music *rest_ev_;
-  vector<Music*> text_events_;
+  Stream_event *rest_ev_;
+  vector<Stream_event*> text_events_;
   int start_measure_;
   Rational last_main_moment_;
   Moment stop_moment_;
@@ -57,22 +62,25 @@ Multi_measure_rest_engraver::Multi_measure_rest_engraver ()
   rest_ev_ = 0;
 }
 
-bool
-Multi_measure_rest_engraver::try_music (Music *event)
+IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_rest);
+void
+Multi_measure_rest_engraver::listen_multi_measure_rest (Stream_event *ev)
 {
-  if (event->is_mus_type ("multi-measure-rest-event"))
-    {
-      rest_ev_ = event;
-      stop_moment_ = now_mom () + rest_ev_->get_length ();
+  /* 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_, now_mom ());
+  /*
+  if (ASSIGN_EVENT_ONCE (rest_ev_, ev))
+    stop_moment_ = now_mom () + get_event_length (rest_ev_);
+  */
+}
 
-      return true;
-    }
-  else if (event->is_mus_type ("multi-measure-text-event"))
-    {
-      text_events_.push_back (event);
-      return true;
-    }
-  return false;
+IMPLEMENT_TRANSLATOR_LISTENER (Multi_measure_rest_engraver, multi_measure_text);
+void
+Multi_measure_rest_engraver::listen_multi_measure_text (Stream_event *ev)
+{
+  text_events_.push_back (ev);
 }
 
 void
@@ -91,8 +99,7 @@ Multi_measure_rest_engraver::process_music ()
 	{
 	  for (vsize i = 0; i < text_events_.size (); i++)
 	    {
-
-	      Music *e = text_events_[i];
+	      Stream_event *e = text_events_[i];
 	      Spanner *sp
 		= make_spanner ("MultiMeasureRestText", e->self_scm ());
 	      SCM t = e->get_property ("text");
@@ -131,7 +138,7 @@ Multi_measure_rest_engraver::process_music ()
 	}
 
       start_measure_
-	= scm_to_int (get_property ("currentBarNumber"));
+	= scm_to_int (get_property ("internalBarNumber"));
     }
 
   bar_seen_ = bar_seen_ || scm_is_string (get_property ("whichBar"));
@@ -141,12 +148,13 @@ void
 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);
@@ -198,7 +206,7 @@ Multi_measure_rest_engraver::start_translation_timestep ()
       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_;
 
       /*
@@ -242,21 +250,28 @@ Multi_measure_rest_engraver::finalize ()
 {
 }
 
-#include "translator.icc"
-
 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 "
-		"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 */
-		"currentBarNumber "
+		"internalBarNumber "
 		"restNumberThreshold "
 		"breakableSeparationItem "
 		"currentCommandColumn "
 		"measurePosition "
-		"measureLength",
-		/* write */ "");
+		"measureLength ",
+		
+		/* write */
+		""
+		);