release: 1.1.43

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 511c014330314a7a25dbc328f4bc01cb6b4caf02..bcb465f22b1c49d598a14dc99afdc0eed833d470 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -18,10 +18,12 @@
 #include "change-translator.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
-#include "compressed-music-iterator.hh"
-#include "compressed-music.hh"
-#include "repeated-music.hh"
-#include "repeated-music-iterator.hh"
+#include "time-scaled-music-iterator.hh"
+#include "time-scaled-music.hh"
+#include "context-specced-music.hh"
+#include "new-repeated-music.hh"
+#include "folded-repeat-iterator.hh"
+#include "unfolded-repeat-iterator.hh"
 
 void
 Music_iterator::do_print() const
@@ -106,9 +108,10 @@ Music_iterator::ok() const
 }
 
 Music_iterator*
-Music_iterator::static_get_iterator_p (Music const *m, Translator_group *report_l)
+Music_iterator::static_get_iterator_p (Music const *m)
 {
   Music_iterator * p =0;
+  
   if (dynamic_cast<Request_chord  const *> (m))
     p = new Request_chord_iterator;
   else if (dynamic_cast<Simultaneous_music  const *> (m)) 
@@ -119,35 +122,49 @@ Music_iterator::static_get_iterator_p (Music const *m, Translator_group *report_
     p = new Property_iterator;
   else if (dynamic_cast<Change_translator  const *> (m))
     p = new Change_iterator;
-  else if (dynamic_cast<Compressed_music  const *> (m))
-    p = new Compressed_music_iterator;
+  else if (dynamic_cast<Time_scaled_music  const *> (m))
+    p = new Time_scaled_music_iterator;
   else if (dynamic_cast<Music_wrapper  const *> (m))
     p = new Music_wrapper_iterator;
-  else if (dynamic_cast<Repeated_music const *> (m))
-    p = new Repeated_music_iterator;
+  else if (New_repeated_music const * n = dynamic_cast<New_repeated_music const *> (m))
+    {
+      if (n->fold_b_)
+       p = new Folded_repeat_iterator;
+      else
+       p = new Unfolded_repeat_iterator;
+    }
   else
     assert (0);
 
+
   p->music_l_ = m;
-  if (m->translator_type_str_.length_i ())
+  return p;
+}
+
+void
+Music_iterator::init_translator (Music const *m, Translator_group  *report_l)
+{
+  music_l_ = m;
+  if (Context_specced_music const * csm =dynamic_cast<Context_specced_music const*>(m))
     {
       Translator_group* a =report_l->
-       find_create_translator_l (m->translator_type_str_, m->translator_id_str_);
-      p->set_translator (a);
-    }
+       find_create_translator_l (csm->translator_type_str_, csm->translator_id_str_);
 
-  if (! p->report_to_l())
-    p ->set_translator (report_l);
+      set_translator (a);
+      
+    }
 
-  
-  return p;
+  if (! report_to_l())
+    set_translator (report_l);
 }
 
 
 Music_iterator*
 Music_iterator::get_iterator_p (Music const*m) const
 {
-  Music_iterator*p = static_get_iterator_p (m, report_to_l());
+  Music_iterator*p = static_get_iterator_p (m);
+  p->init_translator (m, report_to_l());
+  
   p->construct_children();
   return p;
 }