X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Funfolded-repeat-iterator.cc;h=5bfab328f206a54001e7489d4ffcfd6144c133b3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=92b501f0a5578ab038f734810e0d128cb6bb4ec8;hpb=0e0a18dbaa12275d0a07b76104243a15da821a15;p=lilypond.git

diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc
index 92b501f0a5..5bfab328f2 100644
--- a/lily/unfolded-repeat-iterator.cc
+++ b/lily/unfolded-repeat-iterator.cc
@@ -1,179 +1,52 @@
-/*   
-  unfolded-repeat-iterator.cc --  implement Unfolded_repeat_iterator
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  unfolded-repeat-iterator.cc -- implement Unfolded_repeat_iterator
 
+  source file of the GNU LilyPond music typesetter
 
-#include "repeated-music.hh"
-#include "music-list.hh"
-#include "unfolded-repeat-iterator.hh"
-#include "debug.hh"
-#include "translator-group.hh"
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-Unfolded_repeat_iterator::~Unfolded_repeat_iterator ()
-{
-  delete current_iter_p_;
-}
+#include "music.hh"
+#include "sequential-iterator.hh"
+#include "context.hh"
 
-Unfolded_repeat_iterator::Unfolded_repeat_iterator ()
+class Unfolded_repeat_iterator : public Sequential_iterator
 {
-  done_count_ =0;
-  current_iter_p_ =0;
-  do_main_b_ = false;
-  alternative_count_i_ =0;
-}
-
-/**
+public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+protected:
+  virtual SCM get_music_list () const;
+};
 
-If we are in the body of the repeat always go to the current alternative.
-
-If we are not in the body, then we are in an alternative.  If we are
-fully unfolding, advance the current alternative and go back to main.
-If we are semi-unfolding, advance the current alternative, and go to
-the  alternative just set.
-   
- */
-void
-Unfolded_repeat_iterator::next_element () 
+SCM
+Unfolded_repeat_iterator::get_music_list () const
 {
-  Repeated_music * mus =dynamic_cast<Repeated_music *> (music_l_);
-  delete current_iter_p_;
-  current_iter_p_ =0;
+  SCM l = SCM_EOL;
+  SCM *tail = &l;
 
+  SCM body = get_music ()->get_property ("element");
+  SCM alts = get_music ()->get_property ("elements");
+  int alt_count = scm_ilength (alts);
+  int rep_count = scm_to_int (get_music ()->get_property ("repeat-count"));
 
-  if (do_main_b_)
+  for (int i = 0; i < rep_count; i++)
     {
-      done_mom_ += mus->body ()->length_mom ();
+      if (unsmob_music (body))
+	*tail = scm_cons (body, SCM_EOL);
 
-      if (!mus->volta_fold_b_)
-	done_count_ ++;
-     
-      if (gh_pair_p (alternative_cons_))
-	{
-	  current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_)));
-	  do_main_b_ = false;
-	}
-      else if (done_count_ <  mus->repeats_i_ && !mus->volta_fold_b_) 
-	{
-	  current_iter_p_ = get_iterator_p (mus->body ());
-	  do_main_b_ = true;
-	}
-    }
-  else
-    {
-      /*
-	we're not in the main part. So we're either in an alternative, or
-	we just finished.
-      */
-      if (alternative_cons_)
-	{
-	  done_mom_ += unsmob_music (gh_car (alternative_cons_))->length_mom ();
+      tail = SCM_CDRLOC (*tail);
 
-	  if (mus->volta_fold_b_ || 
-	      mus->repeats_i_ - done_count_  < alternative_count_i_)
-	    alternative_cons_ = gh_cdr (alternative_cons_);
-	  
-	  /*
-	    we've done the main body as well, but didn't go over the other
-	    increment.  */
-	  if (mus->volta_fold_b_)
-	    done_count_ ++;
-	}
-      
-      if (done_count_ < mus->repeats_i_ && gh_pair_p (alternative_cons_))
+      if (alt_count)
 	{
-	  if (mus->volta_fold_b_)
-	    current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_)));
-	  else
-	    {
-	      current_iter_p_ = get_iterator_p (mus->body ());
-	      do_main_b_ = true;
-	    }
-	}
-    }
-}
+	  *tail = scm_cons (scm_car (alts), SCM_EOL);
+	  tail = SCM_CDRLOC (*tail);
+	  if (i >= rep_count - alt_count)
 
-
-bool
-Unfolded_repeat_iterator::ok () const
-{
-  return current_iter_p_ ;
-}
-
-Moment
-Unfolded_repeat_iterator::next_moment () const
-{
-  return done_mom_ + current_iter_p_->next_moment ();
-}
-
-void
-Unfolded_repeat_iterator::construct_children ()
-{
-  Repeated_music * mus =dynamic_cast<Repeated_music *> (music_l_);
-  
-  alternative_cons_ = (mus->alternatives ())
-    ? mus->alternatives ()->music_list ()
-    : SCM_EOL;
-
-  for (SCM p = alternative_cons_; gh_pair_p (p); p = gh_cdr (p))
-    alternative_count_i_ ++;
-
-  if (mus->body ())
-    {
-      current_iter_p_  = get_iterator_p (mus->body ());
-      do_main_b_ = true;
-    }
-  else if (gh_pair_p (alternative_cons_))
-    {
-      current_iter_p_ = get_iterator_p (unsmob_music (gh_car (alternative_cons_)));
-      do_main_b_ = false;
-    }
-}
-
-void
-Unfolded_repeat_iterator::do_process (Moment m) 
-{
-  if (!m)
-    {
-      Music_iterator *yeah = try_music (music_l_);
-      if (yeah)
-	set_translator (yeah->report_to_l ());
-      else
-	music_l_->origin ()->warning ( _("no one to print a volta bracket"));
-    }
-  while (1)
-    {
-      while (!current_iter_p_->ok ())
-	{
-	  next_element();
-
-	  if (!current_iter_p_)
-	    return;
+	    alts = scm_cdr (alts);
 	}
-      
-      if (m - done_mom_ >= current_iter_p_->next_moment ())
-	current_iter_p_->process (m - done_mom_);
-      else
-	return;
     }
-}
-  
-void
-Unfolded_repeat_iterator::do_print () const
-{
-#ifndef NPRINT
-  DEBUG_OUT << "count " << done_count_ << "done time " << Rational (done_mom_) << '\n';
-  DEBUG_OUT << "current: ";
-  current_iter_p_->print();
-#endif
-}
 
-Music_iterator* 
-Unfolded_repeat_iterator::try_music_in_children (Music  * m) const
-{
-  return  current_iter_p_->try_music (m);
+  return l;
 }
+
+IMPLEMENT_CTOR_CALLBACK (Unfolded_repeat_iterator);