Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen

[lilypond.git] / lily / slash-repeat-engraver.cc

diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index 18d5312311b01d2bb74dfa90e62a6b1c328161c5..7df5c317a0e8e4ac80006969f2d3fafcc9bc7ace 100644 (file)
--- a/lily/slash-repeat-engraver.cc
+++ b/lily/slash-repeat-engraver.cc
@@ -3,14 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg <mandolaerik@gmail.com>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg
+  <mandolaerik@gmail.com>
 */
 
 #include "bar-line.hh"
 #include "global-context.hh"
+#include "international.hh"
 #include "item.hh"
 #include "misc.hh"
-#include "percent-repeat-iterator.hh"
 #include "repeated-music.hh"
 #include "score-engraver.hh"
 #include "spanner.hh"
@@ -48,7 +49,12 @@ Slash_repeat_engraver::listen_percent (Stream_event *ev)
     = robust_scm2moment (get_property ("measureLength"), Moment (0));
   
   if (get_event_length (ev) < meas_length)
-    slash_ = ev;
+    ASSIGN_EVENT_ONCE (slash_, ev);
+
+  /*
+    don't warn if nothing happens: this can happen if there are whole
+    measure repeats.
+   */
 }
 
 void
@@ -64,6 +70,5 @@ Slash_repeat_engraver::process_music ()
 ADD_TRANSLATOR (Slash_repeat_engraver,
                /* doc */ "Make beat repeats.",
                /* create */ "RepeatSlash",
-               /* accept */ "percent-event",
                /* read */ "measureLength",
                /* write */ "");