X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslash-repeat-engraver.cc;h=aa80c2e2e544afc7e69330a5e10a09ace6ea37d1;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=c0673188a63824e3ae5bf46789d60fe4d28bc247;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index c0673188a6..aa80c2e2e5 100644
--- a/lily/slash-repeat-engraver.cc
+++ b/lily/slash-repeat-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>, Erik Sandberg
   <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,22 +18,15 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "bar-line.hh"
-#include "global-context.hh"
-#include "international.hh"
 #include "item.hh"
-#include "misc.hh"
-#include "repeated-music.hh"
-#include "score-engraver.hh"
-#include "spanner.hh"
+#include "engraver.hh"
 #include "stream-event.hh"
-#include "warn.hh"
 
 #include "translator.icc"
 
-/**
-   This acknowledges repeated music with "percent" style.  It typesets
-   a slash sign.
+/*
+  This acknowledges repeated music with "percent" style.  It typesets
+  a slash sign or double percent sign.
 */
 class Slash_repeat_engraver : public Engraver
 {
@@ -42,30 +35,20 @@ public:
 protected:
   Stream_event *slash_;
 protected:
-  DECLARE_TRANSLATOR_LISTENER (percent);
+  void listen_repeat_slash (Stream_event *);
   void process_music ();
 };
 
-Slash_repeat_engraver::Slash_repeat_engraver ()
+Slash_repeat_engraver::Slash_repeat_engraver (Context *c)
+  : Engraver (c)
 {
   slash_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Slash_repeat_engraver, percent);
 void
-Slash_repeat_engraver::listen_percent (Stream_event *ev)
+Slash_repeat_engraver::listen_repeat_slash (Stream_event *ev)
 {
-  /*todo: separate events for percent and slash */
-  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.
-   */
+  ASSIGN_EVENT_ONCE (slash_, ev);
 }
 
 void
@@ -73,21 +56,32 @@ Slash_repeat_engraver::process_music ()
 {
   if (slash_)
     {
-      make_item ("RepeatSlash", slash_->self_scm ());
+      SCM count = slash_->get_property ("slash-count");
+      if (scm_to_int (count) == 0)
+        make_item ("DoubleRepeatSlash", slash_->self_scm ());
+      else
+        make_item ("RepeatSlash", slash_->self_scm ());
       slash_ = 0;
     }
 }
 
+void
+Slash_repeat_engraver::boot ()
+{
+  ADD_LISTENER (Slash_repeat_engraver, repeat_slash);
+}
+
 ADD_TRANSLATOR (Slash_repeat_engraver,
-		/* doc */
-		"Make beat repeats.",
+                /* doc */
+                "Make beat repeats.",
 
-		/* create */
-		"RepeatSlash ",
+                /* create */
+                "DoubleRepeatSlash "
+                "RepeatSlash ",
 
-		/* read */
-		"measureLength ",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );