X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpercent-repeat-engraver.cc;h=a6c47e872c7f50e86fb6d1a0abf110f3d7153087;hb=d9bc24cb0b51b2d863e8d816c203137b88daec5c;hp=81d831aff87ea508eb6c148363e7f9391325a2b4;hpb=e0aab46ee287f06765b982c49fd0491ab033fce7;p=lilypond.git

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index 81d831aff8..a6c47e872c 100644
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -14,10 +14,10 @@
 #include "international.hh"
 #include "item.hh"
 #include "misc.hh"
-#include "percent-repeat-iterator.hh"
 #include "repeated-music.hh"
 #include "side-position-interface.hh"
 #include "spanner.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
 #include "translator.icc"
@@ -34,7 +34,7 @@ public:
   TRANSLATOR_DECLARATIONS (Percent_repeat_engraver);
   
 protected:
-  Music *percent_event_;
+  Stream_event *percent_event_;
 
   /// moment (global time) where percent started.
   Moment stop_mom_;
@@ -51,9 +51,13 @@ protected:
   Spanner *percent_;
   Spanner *percent_counter_;
 
+  
+  Grob *first_command_column_;
+  Moment command_moment_;
+  
 protected:
   virtual void finalize ();
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (percent);
 
   void stop_translation_timestep ();
   void start_translation_timestep ();
@@ -64,43 +68,67 @@ Percent_repeat_engraver::Percent_repeat_engraver ()
 {
   percent_ = 0;
   percent_counter_ = 0;
-
   percent_event_ = 0;
+
+  first_command_column_ = 0;
+  command_moment_ = Moment (-1);
+}
+
+void
+Percent_repeat_engraver::start_translation_timestep ()
+{
+  if (now_mom ().main_part_ != command_moment_.main_part_)
+    {
+      first_command_column_ = unsmob_grob (get_property ("currentCommandColumn"));
+      command_moment_ = now_mom ();
+    }
+
+  if (stop_mom_.main_part_ == now_mom ().main_part_)
+    {
+      if (percent_)
+      	typeset_perc ();
+      percent_event_ = 0;
+      repeat_sign_type_ = UNKNOWN;
+    }
 }
 
-bool
-Percent_repeat_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Percent_repeat_engraver, percent);
+void
+Percent_repeat_engraver::listen_percent (Stream_event *ev)
 {
-  if (m->is_mus_type ("percent-event")
-      && !percent_event_)
+  if (!percent_event_)
     {
-      Moment body_length = m->get_length ();
+      Moment body_length = get_event_length (ev);
       Moment meas_len (robust_scm2moment (get_property ("measureLength"),
 					  Moment (1)));
-
       if (meas_len == body_length)
-      {
-	repeat_sign_type_ = MEASURE;
-      	start_mom_ = now_mom ();
-      	stop_mom_ = now_mom () + body_length;
-	get_global_context ()->add_moment_to_process (stop_mom_);
-      }
+	{
+	  repeat_sign_type_ = MEASURE;
+	  start_mom_ = now_mom ();
+	  stop_mom_ = now_mom () + body_length;
+	  get_global_context ()->add_moment_to_process (stop_mom_);
+	}
       else if (Moment (2) * meas_len == body_length)
-      {
-	repeat_sign_type_ = DOUBLE_MEASURE;
-	start_mom_ = now_mom () + meas_len;
-	stop_mom_ = now_mom () + body_length; /* never used */
-	get_global_context ()->add_moment_to_process (start_mom_);
-      }
+	{
+	  repeat_sign_type_ = DOUBLE_MEASURE;
+	  start_mom_ = now_mom () + meas_len;
+	  stop_mom_ = now_mom () + body_length; /* never used */
+	  get_global_context ()->add_moment_to_process (start_mom_);
+	}
       else
-	return false;
-
-      percent_event_ = m;
-
-      return true;
+	{
+	  /*
+	    don't warn about percent repeats: slash repeats are not
+	    exactly 1 or 2 measures long.
+	   */
+	  return;
+	}
+      percent_event_ = ev;
     }
-
-  return false;
+  else
+    /* print a warning: no assignment happens because
+       percent_event_ != 0 */
+    ASSIGN_EVENT_ONCE (percent_event_, ev);
 }
 
 void
@@ -112,9 +140,10 @@ Percent_repeat_engraver::process_music ()
 	{
 	  if (percent_)
 	    typeset_perc ();
+	  
 	  percent_ = make_spanner ("PercentRepeat", percent_event_->self_scm ());
 
-	  Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+	  Grob *col = first_command_column_;
 	  percent_->set_bound (LEFT, col);
 
 	  SCM count = percent_event_->get_property ("repeat-count");
@@ -179,7 +208,7 @@ Percent_repeat_engraver::typeset_perc ()
 {
   if (percent_)
     {
-      Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
+      Grob *col = first_command_column_;
 
       percent_->set_bound (RIGHT, col);
       percent_ = 0;
@@ -190,17 +219,7 @@ Percent_repeat_engraver::typeset_perc ()
     }
 }
 
-void
-Percent_repeat_engraver::start_translation_timestep ()
-{
-  if (stop_mom_.main_part_ == now_mom ().main_part_)
-    {
-      if (percent_)
-      	typeset_perc ();
-      percent_event_ = 0;
-      repeat_sign_type_ = UNKNOWN;
-    }
-}
+
 
 void
 Percent_repeat_engraver::stop_translation_timestep ()
@@ -216,9 +235,6 @@ ADD_TRANSLATOR (Percent_repeat_engraver,
 		"DoublePercentRepeatCounter "
 		"PercentRepeat "
 		"PercentRepeatCounter ",
-		
-		/* accept */
-		"percent-event ",
 
 		/* read */
 		"countPercentRepeats "