* The grand 2005-2006 replace.

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

diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index f6b3e8f1a981b8f30c5b910ee2a8c219e047df76..9949e9f227ca62bb7d2c6d057be811639c5d5be7 100644 (file)
--- a/lily/slash-repeat-engraver.cc
+++ b/lily/slash-repeat-engraver.cc
@@ -1,11 +1,10 @@
-/*   
-     slash-repeat-engraver.cc --  implement Chord_tremolo_engraver
-  
+/*
+  slash-repeat-engraver.cc -- implement Slash_repeat_engraver
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "repeated-music.hh"
 #include "global-context.hh"
@@ -18,15 +17,14 @@
 #include "score-engraver.hh"
 
 /**
-  This acknowledges repeated music with "percent" style.  It typesets
-  a % sign.  
+   This acknowledges repeated music with "percent" style.  It typesets
+   a % sign.
 
-  TODO:
+   TODO:
 
-  - BEAT case: Create items for single beat repeats, i.e. c4 / / /
+   - BEAT case: Create items for single beat repeats, i.e. c4 / / /
 
-  - DOUBLE_MEASURE case: attach a % to an appropriate barline.
-  
+   - DOUBLE_MEASURE case: attach a % to an appropriate barline.
 */
 class Slash_repeat_engraver : public Engraver
 {
@@ -44,13 +42,12 @@ protected:
   Moment next_moment_;
   Moment body_length_;
 
-  Item * beat_slash_;
-  Item * double_percent_;
+  Item *beat_slash_;
+  Item *double_percent_;
 protected:
-  virtual bool try_music (Music*);
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  virtual bool try_music (Music *);
+  void start_translation_timestep ();
+  void process_music ();
 };
 
 Slash_repeat_engraver::Slash_repeat_engraver ()
@@ -60,7 +57,7 @@ Slash_repeat_engraver::Slash_repeat_engraver ()
 }
 
 bool
-Slash_repeat_engraver::try_music (Music * m)
+Slash_repeat_engraver::try_music (Music *m)
 {
   if (m->is_mus_type ("repeated-music")
       && !repeat_
@@ -68,27 +65,24 @@ Slash_repeat_engraver::try_music (Music * m)
       == Percent_repeat_iterator::constructor_proc)
     {
       body_length_ = Repeated_music::body_get_length (m);
-      int count =   Repeated_music::repeat_count (m);
-      
+      int count = Repeated_music::repeat_count (m);
+
       Moment now = now_mom ();
       start_mom_ = now;
       stop_mom_ = start_mom_ + Moment (count) * body_length_;
       next_moment_ = start_mom_ + body_length_;
 
-      Moment meas_len = robust_scm2moment (m->get_property ("measureLength"), Moment (0));
-      if (body_length_ < meas_len 
-         && meas_len.main_part_.mod_rat (body_length_.main_part_)
-         == Moment (Rational (0, 0)))
-       {
-         repeat_ = m;
-       }
+      Moment meas_length
+       = robust_scm2moment (get_property ("measureLength"), Moment (0));
+      if (body_length_ < meas_length)
+       repeat_ = m;
       else
        return false;
-      
+
       Global_context *global = get_global_context ();
-      for (int i = 0; i < count; i++)  
+      for (int i = 0; i < count; i++)
        global->add_moment_to_process (next_moment_ + Moment (i) * body_length_);
-  
+
       return true;
     }
 
@@ -107,29 +101,19 @@ Slash_repeat_engraver::process_music ()
     }
 }
 
-
 void
 Slash_repeat_engraver::start_translation_timestep ()
 {
   if (stop_mom_ == now_mom ())
-    {
-      repeat_ = 0;
-    }
-}
-
-void
-Slash_repeat_engraver::stop_translation_timestep ()
-{
+    repeat_ = 0;
   beat_slash_ = 0;
 }
 
-
-
+#include "translator.icc"
 
 ADD_TRANSLATOR (Slash_repeat_engraver,
-/* descr */       "Make beat repeats.",
-/* creats*/       "RepeatSlash",
-/* accepts */     "repeated-music",
-/* acks  */      "",
-/* reads */       "measureLength",
-/* write */       "");
+               /* doc */ "Make beat repeats.",
+               /* create */ "RepeatSlash",
+               /* accept */ "repeated-music",
+               /* read */ "measureLength",
+               /* write */ "");