* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index 09009b0baf5650aeb991d2ef84799f0be0b2fa4b..1914d1f52f3f5d617a110535ae192d1b4fe0d90d 100644 (file)
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -3,23 +3,19 @@
   
   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 "engraver.hh"
 #include "repeated-music.hh"
-#include "engraver-group-engraver.hh"
-#include "global-translator.hh"
+#include "global-context.hh"
 #include "warn.hh"
 #include "misc.hh"
 #include "spanner.hh"
 #include "item.hh"
 #include "percent-repeat-iterator.hh"
 #include "bar-line.hh"
-
 #include "score-engraver.hh"
-#include "translator-group.hh"
 
 /**
   This acknowledges repeated music with "percent" style.  It typesets
@@ -36,9 +32,9 @@ class Percent_repeat_engraver : public Engraver
 {
   void typeset_perc ();
 public:
-  TRANSLATOR_DECLARATIONS(Percent_repeat_engraver);
+  TRANSLATOR_DECLARATIONS (Percent_repeat_engraver);
 protected:
-  Repeated_music * repeat_;
+  Music *repeat_;
 
   /// moment (global time) where beam started.
   Moment start_mom_;
@@ -70,7 +66,7 @@ Percent_repeat_engraver::Percent_repeat_engraver ()
 {
   perc_  = 0;
   finished_perc_ = 0;
-  repeat_ =0;
+  repeat_ = 0;
 
   double_percent_ = 0;
 }
@@ -78,25 +74,20 @@ Percent_repeat_engraver::Percent_repeat_engraver ()
 bool
 Percent_repeat_engraver::try_music (Music * m)
 {
-  Repeated_music * rp = dynamic_cast<Repeated_music*> (m);
-  if (rp
-      && rp->get_mus_property ("iterator-ctor")
+  if (m->is_mus_type ("repeated-music")
+      && m->get_property ("iterator-ctor")
          == Percent_repeat_iterator::constructor_proc
       && !repeat_)
     {
-      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 (unsmob_moment (m))
-       meas_len = *unsmob_moment (m);
-
+      Moment meas_len (robust_scm2moment (get_property ("measureLength"), Moment (1)));
       if (meas_len == body_length_)
        repeat_sign_type_ = MEASURE;
       else if (Moment (2)* meas_len == body_length_)
@@ -110,12 +101,21 @@ Percent_repeat_engraver::try_music (Music * m)
          return false;
        }
 
-      repeat_ = rp;
+      repeat_ = m;
 
       
-      Global_translator *global =top_engraver();
+      Global_context *global = get_global_context ();
       for (int i = 0; i < count; i++)  
-       global->add_moment_to_process (next_moment_ + Moment (i) * body_length_);
+       {
+         global->add_moment_to_process (next_moment_ + Moment (i) * body_length_);
+
+         /*
+           bars between % too.
+          */
+         if (repeat_sign_type_ == DOUBLE_MEASURE)
+           global->add_moment_to_process (next_moment_ + meas_len + Moment (i) * body_length_);
+         
+       }
   
       return true;
     }
@@ -132,25 +132,22 @@ Percent_repeat_engraver::process_music ()
        {
          finished_perc_ = perc_;
          typeset_perc ();
-         perc_ = make_spanner ("PercentRepeat");
-         SCM col =get_property ("currentCommandColumn");
+         perc_ = make_spanner ("PercentRepeat", repeat_->self_scm ());
+         SCM col = get_property ("currentCommandColumn");
          perc_->set_bound (LEFT, unsmob_grob (col));
-         announce_grob(perc_, repeat_->self_scm());
        }
       else if (repeat_sign_type_ == DOUBLE_MEASURE)
        {
-         double_percent_ = make_item ("DoublePercentRepeat");
-         announce_grob(double_percent_, repeat_->self_scm());
-
+         double_percent_ = make_item ("DoublePercentRepeat", repeat_->self_scm ());
       /*
        forbid breaks on a % line. Should forbid all breaks, really.
        */
 
-           top_engraver()->forbid_breaks ();   // guh. Use properties!      
+         get_score_engraver ()->forbid_breaks ();      // guh. Use properties!      
        }
       next_moment_ = next_moment_ + body_length_;
 
-      top_engraver()->add_moment_to_process (next_moment_);
+      get_global_context ()->add_moment_to_process (next_moment_);
     }
 }
 
@@ -170,17 +167,12 @@ Percent_repeat_engraver::typeset_perc ()
 {
   if (finished_perc_)
     {
-      SCM col =get_property ("currentCommandColumn");
+      SCM col = get_property ("currentCommandColumn");
       finished_perc_->set_bound (RIGHT, unsmob_grob (col));
-      typeset_grob (finished_perc_);
       finished_perc_ = 0;
     }
 
-  if (double_percent_)
-    {
-      typeset_grob (double_percent_);
-      double_percent_ = 0;
-    }
+  double_percent_ = 0;
 }
 
 
@@ -212,7 +204,7 @@ Percent_repeat_engraver::stop_translation_timestep ()
 
 
 
-ENTER_DESCRIPTION(Percent_repeat_engraver,
+ADD_TRANSLATOR (Percent_repeat_engraver,
 /* descr */       "Make whole bar and double bar repeats.",
 /* creats*/       "PercentRepeat DoublePercentRepeat",
 /* accepts */     "repeated-music",