Metronome-mark: Neil's comments[2]; more cleanups.

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

diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index aa5b52c405ccc72ec952aa9fed23a580711b59fd..c0673188a63824e3ae5bf46789d60fe4d28bc247 100644 (file)
--- a/lily/slash-repeat-engraver.cc
+++ b/lily/slash-repeat-engraver.cc
@@ -1,20 +1,35 @@
 /*
-  slash-repeat-engraver.cc -- implement Slash_repeat_engraver
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2010 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>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "repeated-music.hh"
+#include "bar-line.hh"
 #include "global-context.hh"
-#include "warn.hh"
-#include "misc.hh"
-#include "spanner.hh"
+#include "international.hh"
 #include "item.hh"
-#include "percent-repeat-iterator.hh"
-#include "bar-line.hh"
+#include "misc.hh"
+#include "repeated-music.hh"
 #include "score-engraver.hh"
+#include "spanner.hh"
+#include "stream-event.hh"
+#include "warn.hh"
+
+#include "translator.icc"
 
 /**
    This acknowledges repeated music with "percent" style.  It typesets
@@ -25,9 +40,9 @@ class Slash_repeat_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Slash_repeat_engraver);
 protected:
-  Music *slash_;
+  Stream_event *slash_;
 protected:
-  virtual bool try_music (Music *);
+  DECLARE_TRANSLATOR_LISTENER (percent);
   void process_music ();
 };
 
@@ -36,24 +51,21 @@ Slash_repeat_engraver::Slash_repeat_engraver ()
   slash_ = 0;
 }
 
-bool
-Slash_repeat_engraver::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Slash_repeat_engraver, percent);
+void
+Slash_repeat_engraver::listen_percent (Stream_event *ev)
 {
   /*todo: separate events for percent and slash */
-  if (m->is_mus_type ("percent-event"))
-    {
-      Moment meas_length
-        = robust_scm2moment (get_property ("measureLength"), Moment (0));
-
-      if (m->get_length () < meas_length)
-       slash_ = m;
-      else
-       return false;
-
-      return true;
-    }
-
-  return false;
+  Moment meas_length
+    = robust_scm2moment (get_property ("measureLength"), Moment (0));
+  
+  if (get_event_length (ev) < meas_length)
+    ASSIGN_EVENT_ONCE (slash_, ev);
+  
+  /*
+    don't warn if nothing happens: this can happen if there are whole
+    measure repeats.
+   */
 }
 
 void
@@ -66,11 +78,16 @@ Slash_repeat_engraver::process_music ()
     }
 }
 
-#include "translator.icc"
-
 ADD_TRANSLATOR (Slash_repeat_engraver,
-               /* doc */ "Make beat repeats.",
-               /* create */ "RepeatSlash",
-               /* accept */ "percent-event",
-               /* read */ "measureLength",
-               /* write */ "");
+               /* doc */
+               "Make beat repeats.",
+
+               /* create */
+               "RepeatSlash ",
+
+               /* read */
+               "measureLength ",
+
+               /* write */
+               ""
+               );