patch::: 1.3.47.jcn3

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index f9625b848b20952054a6e6cab6489756fab8fe85..1ad45da5238e29a404f5cb51923948a5069098cd 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,8 +3,12 @@
 
   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"
@@ -30,6 +34,10 @@
 #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"
+#include "chord-tremolo-iterator.hh"
 
 void
 Music_iterator::do_print() const
@@ -40,17 +48,17 @@ void
 Music_iterator::print() const
 {
 #ifndef NPRINT
-  if (!check_debug)
+  if (!flower_dstream)
     return ;
-  DOUT << classname(this) << "{";
+  DEBUG_OUT << classname(this) << "{";
   Translator_group *t =     report_to_l();
-  DOUT << "report to " << t->type_str_ << " = " << t->id_str_ << "\n";
+  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
 }
 
@@ -142,14 +150,17 @@ Music_iterator::static_get_iterator_p (Music const *m)
     p = new Music_wrapper_iterator;
   else if (Repeated_music const * n = dynamic_cast<Repeated_music const *> (m))
     {
-      if (n->fold_b_)
+      if (n->type_ == "tremolo")
+       p = new Chord_tremolo_iterator;
+      else if (n->fold_b_)
        p = new Folded_repeat_iterator;
       else
        p = new Unfolded_repeat_iterator;
     }
   else
-    assert (0);
-
+    {
+      p = new Simple_music_iterator ;
+    }
 
   p->music_l_ = m;
   return p;