* lilypond/scm-option.cc (ly_option_usage): Add final newline.

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

diff --git a/lily/slash-repeat-engraver.cc b/lily/slash-repeat-engraver.cc
index 7020be066f3144ff389110c8fdb59bbf29f94742..ee1ea2fd441213d131faadd664d92995ed7739a5 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "repeated-music.hh"
 #include "global-context.hh"
@@ -18,22 +17,21 @@
 #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
 {
 public:
   TRANSLATOR_DECLARATIONS (Slash_repeat_engraver);
 protected:
-  Repeated_music * repeat_;
+  Music *repeat_;
 
   /// moment (global time) where beam started.
   Moment start_mom_;
@@ -44,10 +42,10 @@ 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 bool try_music (Music *);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void process_music ();
@@ -60,40 +58,34 @@ Slash_repeat_engraver::Slash_repeat_engraver ()
 }
 
 bool
-Slash_repeat_engraver::try_music (Music * m)
+Slash_repeat_engraver::try_music (Music *m)
 {
-  Repeated_music * rp = dynamic_cast<Repeated_music*> (m);
-  if (rp
+  if (m->is_mus_type ("repeated-music")
       && !repeat_
-      && rp->get_property ("iterator-ctor")
+      && m->get_property ("iterator-ctor")
       == Percent_repeat_iterator::constructor_proc)
     {
-      body_length_ = rp->body_get_length ();
-      int count =   rp->repeat_count ();
-      
+      body_length_ = Repeated_music::body_get_length (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_;
 
-      SCM m = get_property ("measureLength");
-      Moment meas_len;
-      if (Moment *mp = unsmob_moment (m))
-       meas_len = *mp;
-
-      if (body_length_ < meas_len 
-         && meas_len.main_part_.mod_rat (body_length_.main_part_)
-         == Moment (Rational (0,0)))
+      Moment meas_length
+       = robust_scm2moment (get_property ("measureLength"), Moment (0));
+      if (body_length_ < meas_length)
        {
-         repeat_ = rp;
+         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;
     }
 
@@ -112,7 +104,6 @@ Slash_repeat_engraver::process_music ()
     }
 }
 
-
 void
 Slash_repeat_engraver::start_translation_timestep ()
 {
@@ -128,13 +119,10 @@ Slash_repeat_engraver::stop_translation_timestep ()
   beat_slash_ = 0;
 }
 
-
-
-
 ADD_TRANSLATOR (Slash_repeat_engraver,
-/* descr */       "Make beat repeats.",
-/* creats*/       "RepeatSlash",
-/* accepts */     "repeated-music",
-/* acks  */      "",
-/* reads */       "measureLength",
-/* write */       "");
+               /* descr */ "Make beat repeats.",
+               /* creats*/ "RepeatSlash",
+               /* accepts */ "repeated-music",
+               /* acks  */ "",
+               /* reads */ "measureLength",
+               /* write */ "");