X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=01e0a5dc5d2ee4416b808a212b4da8d6b005e329;hb=bb36bac02a64770871780231ecc709cb18b20932;hp=40f2236f86f19e631142d14c67985573eec04c09;hpb=b43244dd4eeca1a96e0cdb258231ef0b6cca1a8f;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 40f2236f86..01e0a5dc5d 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "debug.hh"
 #include "music-list.hh"
 #include "music-iterator.hh"
 #include "property-iterator.hh"
-#include "request-iterator.hh"
+#include "request-chord-iterator.hh"
 #include "sequential-music-iterator.hh"
 #include "simultaneous-music-iterator.hh"
 #include "translator-group.hh"
@@ -18,10 +18,18 @@
 #include "change-translator.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
-#include "compressed-music-iterator.hh"
-#include "compressed-music.hh"
+#include "time-scaled-music-iterator.hh"
+#include "time-scaled-music.hh"
+#include "context-specced-music.hh"
 #include "repeated-music.hh"
-#include "repeated-music-iterator.hh"
+#include "folded-repeat-iterator.hh"
+#include "unfolded-repeat-iterator.hh"
+#include "grace-iterator.hh"
+#include "grace-music.hh"
+#include "lyric-combine-music.hh"
+#include "lyric-combine-music-iterator.hh"
+#include "auto-change-music.hh"
+#include "auto-change-iterator.hh"
 
 void
 Music_iterator::do_print() const
@@ -32,17 +40,17 @@ void
 Music_iterator::print() const
 {
 #ifndef NPRINT
-  if (!check_debug)
+  if (!flower_dstream)
     return ;
-  DOUT << classname(this) << "{";
-  DOUT << "report to " << 
-    report_to_l() << " (" << classname (report_to_l ()) << ")\n";
+  DEBUG_OUT << classname(this) << "{";
+  Translator_group *t =     report_to_l();
+  DEBUG_OUT << "report to " << t->type_str_ << " = " << t->id_str_ << "\n";
   if (ok())
-    DOUT << "next at " << next_moment() << " ";
+    DEBUG_OUT << "next at " << next_moment() << " ";
   else
-    DOUT << "not feeling well today..";
+    DEBUG_OUT << "not feeling well today..";
   do_print();
-  DOUT << "}\n";
+  DEBUG_OUT << "}\n";
 #endif
 }
 
@@ -106,11 +114,16 @@ 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;
+
+  /* It would be nice to do this decentrally, but the order of this is
+     significant.  */
   if (dynamic_cast<Request_chord  const *> (m))
     p = new Request_chord_iterator;
+  else if (dynamic_cast<Lyric_combine_music const*> (m))
+    p = new Lyric_combine_music_iterator;
   else if (dynamic_cast<Simultaneous_music  const *> (m)) 
     p =  new Simultaneous_music_iterator;
   else if (dynamic_cast<Sequential_music  const *> (m)) 
@@ -119,35 +132,53 @@ 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<Grace_music const*> (m))
+    p = new Grace_iterator;
+  else if (dynamic_cast<Auto_change_music const*> (m))
+    p = new Auto_change_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 (Repeated_music const * n = dynamic_cast<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;
 }
@@ -157,4 +188,19 @@ Music_iterator::Music_iterator()
   first_b_ = true;
 }
 
+Music_iterator*
+Music_iterator::try_music (Music const *m) const
+{
+  bool b = report_to_l ()->try_music ((Music*)m); // ugh
+  Music_iterator * it = b ? (Music_iterator*) this : 0;	// ugh
+  if (!it)
+    it = try_music_in_children (m);
+  return it;
+}
+
+Music_iterator*
+Music_iterator::try_music_in_children (Music const *  ) const
+{
+  return 0;
+}