release: 1.1.43

[lilypond.git] / lily / new-repeated-music-iterator.cc

diff --git a/lily/new-repeated-music-iterator.cc b/lily/new-repeated-music-iterator.cc
index 66028bb2027a65fb21ad997ce2d7e7c2f1eeb1b3..0c168dde63eda96eba0ee583dd09b42d3f952328 100644 (file)
--- a/lily/new-repeated-music-iterator.cc
+++ b/lily/new-repeated-music-iterator.cc
@@ -1,6 +1,5 @@
-#if 0
 /*   
-  new-repeated-music-iterator.cc --  implement New_repeated_music_iterator
+  new-repeated-music-iterator.cc --  implement Folded_repeat_iterator
   
   source file of the GNU LilyPond music typesetter
   
@@ -8,34 +7,112 @@
   
  */
 
-#include "music-iterator.hh"
+#include "folded-repeat-iterator.hh"
+#include "new-repeated-music.hh"
+#include "music-list.hh"
+#include "simultaneous-music-iterator.hh"
+#include "translator-group.hh"
 
+Folded_repeat_iterator::Folded_repeat_iterator ()
+{
+  main_iter_p_ = 0;
+  alternative_iter_p_ = 0;
+}
 
-/**
-   
- */
-class New_repeated_music_iterator : public Music_iterator
+bool
+Folded_repeat_iterator::ok () const
+{
+  return main_iter_p_ || alternative_iter_p_;
+}
+
+Folded_repeat_iterator::~Folded_repeat_iterator ()
+{
+  delete main_iter_p_;
+  delete alternative_iter_p_;
+}
+
+Moment
+Folded_repeat_iterator::next_moment () const
+{
+  if (main_iter_p_)
+    {
+      return main_iter_p_->next_moment ();
+    }
+  else
+    return main_length_mom_ + alternative_iter_p_->next_moment ();
+}
+
+void
+Folded_repeat_iterator::construct_children ()
+{
+  New_repeated_music const *  mus = dynamic_cast<New_repeated_music const*> (music_l_);
+  main_iter_p_ = get_iterator_p (mus->repeat_body_p_);
+  if (!main_iter_p_->ok())
+    {
+      leave_body ();
+      enter_alternative ();
+    }
+}
+
+void
+Folded_repeat_iterator::do_process_and_next (Moment m)
 {
-  Music_iterator * main_iter_p_;
-  Music_iterator * alternative_iter_p_;
-  int count_;
+  if (!m)
+    {
+      bool success = report_to_l ()->try_music (music_l_);
+      if (!success)
+       music_l_->warning ( _("No one to print a volta bracket"));
+    }
   
-public:
-  New_repeated_music_iterator ();
-  ~New_repeated_music_iterator ();
+  New_repeated_music const * mus = dynamic_cast<New_repeated_music const*> (music_l_);
   
+  if (main_iter_p_)
+    {
+      main_iter_p_->process_and_next (m);
+      if (!main_iter_p_->ok ())
+       leave_body ();
+    }
+
+  if (!main_iter_p_ && !alternative_iter_p_)
+    {
+      enter_alternative ();
+    }
   
-  virtual void construct_children ();
-  virtual Moment next_moment () const;
-  virtual bool ok () const;
+  if (alternative_iter_p_)
+    {
+      alternative_iter_p_->process_and_next (m - main_length_mom_);
+      if (!alternative_iter_p_->ok ())
+       {
+         delete alternative_iter_p_;
+         alternative_iter_p_ =0;
+       }
+    }
+}
 
-protected:
-  virtual void do_print () const;
-  virtual void do_process_and_next (Moment);
-};
+void
+Folded_repeat_iterator::leave_body ()
+{
+  New_repeated_music const *  mus = dynamic_cast<New_repeated_music const*> (music_l_);
+  delete main_iter_p_;
+  main_iter_p_ = 0;
+  main_length_mom_ +=  mus->repeat_body_p_->length_mom ();
+}
 
-New_repeated_music_iterator::New_repeated_music_iterator ()
+void
+Folded_repeat_iterator::enter_alternative ()
 {
+  New_repeated_music const *  mus = dynamic_cast<New_repeated_music const*> (music_l_);  
+  Simultaneous_music_iterator * s = new Simultaneous_music_iterator;
+  s->separate_contexts_b_ = true;
+  s->init_translator (mus->alternatives_p_, report_to_l ());
   
+  alternative_iter_p_ = s;
+  alternative_iter_p_->construct_children ();
 }
+
+void
+Folded_repeat_iterator::do_print () const
+{
+#ifndef NPRINT
 #endif
+}