* lily/system.cc (get_line):

[lilypond.git] / lily / unfolded-repeat-iterator.cc

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index f4f56af6e4441ccc7bbec9f6be8084822785e362..70ee5a4dfbb44727e246fdc01faf069a9835b1b3 100644 (file)
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -4,19 +4,18 @@ unfolded-repeat-iterator.cc --  implement Unfolded_repeat_iterator, Volta_repeat
 source file of the GNU LilyPond music typesetter
 
 
-(c) 2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "music.hh"
 #include "sequential-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
 
 class Unfolded_repeat_iterator : public Sequential_iterator
 {
 public:
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  VIRTUAL_COPY_CONS (Music_iterator);
+  DECLARE_SCHEME_CALLBACK (constructor, ());
 protected:
   virtual SCM get_music_list () const;
 };
@@ -28,10 +27,10 @@ Unfolded_repeat_iterator::get_music_list () const
   SCM l = SCM_EOL;
   SCM *tail = &l;
   
-  SCM body = get_music ()->get_mus_property ("element");
-  SCM alts = get_music ()->get_mus_property ("elements");
+  SCM body = get_music ()->get_property ("element");
+  SCM alts = get_music ()->get_property ("elements");
   int alt_count = scm_ilength (alts);
-  int rep_count = gh_scm2int (get_music ()->get_mus_property ("repeat-count"));
+  int rep_count = gh_scm2int (get_music ()->get_property ("repeat-count"));
 
   for (int i = 0; i < rep_count; i++)
     {
@@ -56,44 +55,45 @@ Unfolded_repeat_iterator::get_music_list () const
 class Volta_repeat_iterator : public Sequential_iterator
 {
 public:
-  DECLARE_SCHEME_CALLBACK(constructor, ());
-  VIRTUAL_COPY_CONS (Music_iterator);
-  Volta_repeat_iterator();
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  Volta_repeat_iterator ();
 
   void add_repeat_command (SCM);
 protected:
   virtual SCM get_music_list () const;
   virtual void next_element (bool);
-  virtual void construct_children();
+  virtual void construct_children ();
   virtual void process (Moment);
-  
+
+  bool first_time_;
   int alt_count_;
   int rep_count_;
   int done_count_;
 };
 
 
-Volta_repeat_iterator::Volta_repeat_iterator()
+Volta_repeat_iterator::Volta_repeat_iterator ()
 {
   done_count_ = alt_count_ = rep_count_= 0;
+  first_time_ = true;
 }
 
 SCM
-Volta_repeat_iterator::get_music_list()const
+Volta_repeat_iterator::get_music_list ()const
 {
-  return gh_cons (get_music ()->get_mus_property ("element"),
-                 get_music ()->get_mus_property ("elements"));
+  return gh_cons (get_music ()->get_property ("element"),
+                 get_music ()->get_property ("elements"));
 }
 
 void
 Volta_repeat_iterator::construct_children ()
 {
-  Sequential_iterator::construct_children();
+  Sequential_iterator::construct_children ();
   
-  SCM alts = get_music ()->get_mus_property ("elements");
+  SCM alts = get_music ()->get_property ("elements");
 
   alt_count_ = scm_ilength (alts);
-  rep_count_ = gh_scm2int (get_music ()->get_mus_property ("repeat-count"));
+  rep_count_ = gh_scm2int (get_music ()->get_property ("repeat-count"));
   done_count_ = 0;
 }
 
@@ -105,9 +105,9 @@ void
 Volta_repeat_iterator::add_repeat_command (SCM what)
 {
   SCM reps = ly_symbol2scm ("repeatCommands");
-  SCM current_reps = report_to ()->internal_get_property (reps);
+  SCM current_reps = get_outlet ()->internal_get_property (reps);
 
-  Translator_group * where = report_to ()->where_defined (reps);
+  Context * where = get_outlet ()->where_defined (reps);
   if (where
       && current_reps == SCM_EOL || gh_pair_p (current_reps))
     {
@@ -159,13 +159,14 @@ Volta_repeat_iterator::next_element (bool side_effect)
 void
 Volta_repeat_iterator::process (Moment m)
 {
-  if (!m.to_bool ())
+  if (first_time_)
     {
       add_repeat_command (ly_symbol2scm ("start-repeat"));
+      first_time_ = false;
     }
-  Sequential_iterator::process(m);
+  Sequential_iterator::process (m);
 }
 
 
-IMPLEMENT_CTOR_CALLBACK(Volta_repeat_iterator);
-IMPLEMENT_CTOR_CALLBACK(Unfolded_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Volta_repeat_iterator);
+IMPLEMENT_CTOR_CALLBACK (Unfolded_repeat_iterator);