release: 1.3.27

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index bcb465f22b1c49d598a14dc99afdc0eed833d470..edbb722e24993471aa7357f20b9df7ad7ee49e91 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,13 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+
+/*
+  UGH. too many includes.
+ */
 #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"
@@ -21,9 +25,18 @@
 #include "time-scaled-music-iterator.hh"
 #include "time-scaled-music.hh"
 #include "context-specced-music.hh"
-#include "new-repeated-music.hh"
+#include "repeated-music.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"
+#include "request.hh"
+#include "request-iterator.hh"
+#include "output-property.hh"
 
 void
 Music_iterator::do_print() const
@@ -34,17 +47,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
 }
 
@@ -111,9 +124,13 @@ Music_iterator*
 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)) 
@@ -124,9 +141,13 @@ Music_iterator::static_get_iterator_p (Music const *m)
     p = new Change_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 (New_repeated_music const * n = dynamic_cast<New_repeated_music const *> (m))
+  else if (Repeated_music const * n = dynamic_cast<Repeated_music const *> (m))
     {
       if (n->fold_b_)
        p = new Folded_repeat_iterator;
@@ -134,8 +155,9 @@ Music_iterator::static_get_iterator_p (Music const *m)
        p = new Unfolded_repeat_iterator;
     }
   else
-    assert (0);
-
+    {
+      p = new Simple_music_iterator ;
+    }
 
   p->music_l_ = m;
   return p;
@@ -174,4 +196,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;
+}