2003 -> 2004

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

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index 7dac5fc84d7b8f7641af8d2fe1763e84987aa599..09009b0baf5650aeb991d2ef84799f0be0b2fa4b 100644 (file)
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,7 +16,7 @@
 #include "spanner.hh"
 #include "item.hh"
 #include "percent-repeat-iterator.hh"
-#include "bar.hh"
+#include "bar-line.hh"
 
 #include "score-engraver.hh"
 #include "translator-group.hh"
@@ -51,16 +51,13 @@ protected:
 
   enum {
     UNKNOWN,
-    BEAT,
     MEASURE,
     DOUBLE_MEASURE,
   } repeat_sign_type_ ;
 
-  Item * beat_slash_;
   Item * double_percent_;
-  Spanner * perc_p_;
-  Spanner * finished_perc_p_;
-  Item * stem_tremolo_;
+  Spanner * perc_;
+  Spanner * finished_perc_;
 protected:
   virtual void finalize ();
   virtual bool try_music (Music*);
@@ -71,11 +68,10 @@ protected:
 
 Percent_repeat_engraver::Percent_repeat_engraver ()
 {
-  perc_p_  = finished_perc_p_ = 0;
+  perc_  = 0;
+  finished_perc_ = 0;
   repeat_ =0;
-  stem_tremolo_ = 0;
 
-  beat_slash_ = 0;
   double_percent_ = 0;
 }
 
@@ -85,10 +81,10 @@ Percent_repeat_engraver::try_music (Music * m)
   Repeated_music * rp = dynamic_cast<Repeated_music*> (m);
   if (rp
       && rp->get_mus_property ("iterator-ctor")
-         == Percent_repeat_iterator::constructor_cxx_function
+         == Percent_repeat_iterator::constructor_proc
       && !repeat_)
     {
-      body_length_ = rp->body_length_mom ();
+      body_length_ = rp->body_get_length ();
       int count =   rp->repeat_count ();
       
       Moment now = now_mom ();
@@ -101,10 +97,7 @@ Percent_repeat_engraver::try_music (Music * m)
       if (unsmob_moment (m))
        meas_len = *unsmob_moment (m);
 
-      if (body_length_ < meas_len &&
-         meas_len.main_part_.mod_rat (body_length_.main_part_) == Moment (Rational (0,0)))
-       repeat_sign_type_ = BEAT;
-      else if (meas_len == body_length_)
+      if (meas_len == body_length_)
        repeat_sign_type_ = MEASURE;
       else if (Moment (2)* meas_len == body_length_)
        {
@@ -120,17 +113,9 @@ Percent_repeat_engraver::try_music (Music * m)
       repeat_ = rp;
 
       
-      Global_translator *global_l =0;
-      Translator *t = this;
-      do
-       {
-         t = t->daddy_trans_l_ ;
-         global_l = dynamic_cast<Global_translator*> (t);
-       }
-      while (!global_l);
-
+      Global_translator *global =top_engraver();
       for (int i = 0; i < count; i++)  
-       global_l->add_moment_to_process (now + Moment (1+i) * body_length_);
+       global->add_moment_to_process (next_moment_ + Moment (i) * body_length_);
   
       return true;
     }
@@ -143,25 +128,19 @@ Percent_repeat_engraver::process_music ()
 {
   if (repeat_ && now_mom () == next_moment_)
     {
-      if (repeat_sign_type_ == BEAT)
-       {
-         beat_slash_ = new Item (get_property ("RepeatSlash"));
-         announce_grob (beat_slash_, repeat_);
-       }
-      else if (repeat_sign_type_ == MEASURE)
+      if (repeat_sign_type_ == MEASURE)
        {
-         finished_perc_p_ = perc_p_;
+         finished_perc_ = perc_;
          typeset_perc ();
-         perc_p_ = new Spanner (get_property ("PercentRepeat"));
+         perc_ = make_spanner ("PercentRepeat");
          SCM col =get_property ("currentCommandColumn");
-         perc_p_->set_bound (LEFT, unsmob_grob (col));
-         announce_grob (perc_p_, repeat_);
+         perc_->set_bound (LEFT, unsmob_grob (col));
+         announce_grob(perc_, repeat_->self_scm());
        }
       else if (repeat_sign_type_ == DOUBLE_MEASURE)
-       
        {
-         double_percent_ = new Item (get_property ("DoublePercentRepeat"));
-         announce_grob (double_percent_, repeat_);
+         double_percent_ = make_item ("DoublePercentRepeat");
+         announce_grob(double_percent_, repeat_->self_scm());
 
       /*
        forbid breaks on a % line. Should forbid all breaks, really.
@@ -170,6 +149,8 @@ Percent_repeat_engraver::process_music ()
            top_engraver()->forbid_breaks ();   // guh. Use properties!      
        }
       next_moment_ = next_moment_ + body_length_;
+
+      top_engraver()->add_moment_to_process (next_moment_);
     }
 }
 
@@ -177,28 +158,22 @@ void
 Percent_repeat_engraver::finalize ()
 {
   typeset_perc ();
-  if (perc_p_)
+  if (perc_)
     {
-      repeat_->origin ()->warning (_ ("unterminated chord tremolo"));
-      perc_p_->suicide ();
+      repeat_->origin ()->warning (_ ("unterminated percent repeat"));
+      perc_->suicide ();
     }
 }
 
 void
 Percent_repeat_engraver::typeset_perc ()
 {
-  if (finished_perc_p_)
+  if (finished_perc_)
     {
       SCM col =get_property ("currentCommandColumn");
-      finished_perc_p_->set_bound (RIGHT, unsmob_grob (col));
-      typeset_grob (finished_perc_p_);
-      finished_perc_p_ = 0;
-    }
-
-  if (beat_slash_)
-    {
-      typeset_grob (beat_slash_);
-      beat_slash_ = 0;
+      finished_perc_->set_bound (RIGHT, unsmob_grob (col));
+      typeset_grob (finished_perc_);
+      finished_perc_ = 0;
     }
 
   if (double_percent_)
@@ -216,13 +191,13 @@ Percent_repeat_engraver::start_translation_timestep ()
 {
   if (stop_mom_ == now_mom ())
     {
-      if (perc_p_)
+      if (perc_)
        {
-         finished_perc_p_ = perc_p_;
+         finished_perc_ = perc_;
          typeset_perc ();
        }
       repeat_ = 0;
-      perc_p_ = 0;
+      perc_ = 0;
       repeat_sign_type_ = UNKNOWN;
     }
 }
@@ -238,8 +213,9 @@ Percent_repeat_engraver::stop_translation_timestep ()
 
 
 ENTER_DESCRIPTION(Percent_repeat_engraver,
-/* descr */       "Make beat, whole bar and double bar repeats.",
-/* creats*/       "PercentRepeat RepeatSlash DoublePercentRepeat",
-/* acks  */       "",
+/* descr */       "Make whole bar and double bar repeats.",
+/* creats*/       "PercentRepeat DoublePercentRepeat",
+/* accepts */     "repeated-music",
+/* acks  */      "",
 /* reads */       "measureLength currentCommandColumn",
 /* write */       "");