]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/music-iterator.cc
release: 1.3.88
[lilypond.git] / lily / music-iterator.cc
index e5774c9f32221881dc72a1b33ef83fc0e2caa5fd..51ae61f1ce333ff0c6bd46d767dfb3492989f3e0 100644 (file)
@@ -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"
 #include "lyric-combine-music-iterator.hh"
 #include "auto-change-music.hh"
 #include "auto-change-iterator.hh"
+#include "part-combine-music.hh"
+#include "part-combine-music-iterator.hh"
+#include "request.hh"
+#include "simple-music-iterator.hh"
+#include "output-property.hh"
+#include "chord-tremolo-iterator.hh"
 
-void
-Music_iterator::do_print() const
+Music_iterator::Music_iterator ()
 {
+  //  clone_i_ = 0;
 }
 
-void
-Music_iterator::print() const
+Music_iterator::Music_iterator (Music_iterator const& src)
 {
-#ifndef NPRINT
-  if (!flower_dstream)
-    return ;
-  DEBUG_OUT << classname(this) << "{";
-  Translator_group *t =     report_to_l();
-  DEBUG_OUT << "report to " << t->type_str_ << " = " << t->id_str_ << "\n";
-  if (ok())
-    DEBUG_OUT << "next at " << next_moment() << " ";
-  else
-    DEBUG_OUT << "not feeling well today..";
-  do_print();
-  DEBUG_OUT << "}\n";
-#endif
+  //  clone_i_ = src.clone_i_ + 1;
+  handle_ = *src.handle_.clone ();
+  music_l_ = src.music_l_;
 }
 
-Translator_group*
-Music_iterator::get_req_translator_l()
+Music_iterator::~Music_iterator ()
 {
-  assert (report_to_l());
-  if (report_to_l()->is_bottom_translator_b ())
-    return report_to_l();
-
-  set_translator (report_to_l()->get_default_interpreter ());
-  return report_to_l();
 }
 
 
+
+
 Translator_group* 
-Music_iterator::report_to_l() const
+Music_iterator::report_to_l () const
 {
   return handle_.report_to_l ();
 }
 
 
 void
-Music_iterator::set_translator (Translator_group*trans)
+Music_iterator::set_translator (Translator_group *trans)
 {
   handle_.set_translator (trans);
 }
 
 void
-Music_iterator::construct_children()
-{
-}
-
-Music_iterator::~Music_iterator()
+Music_iterator::construct_children ()
 {
 }
 
 Moment
-Music_iterator::next_moment() const
+Music_iterator::pending_moment () const
 {
   return 0;
 }
 
 
 void
-Music_iterator::process_and_next (Moment m)
+Music_iterator::process (Moment)
 {
-  do_process_and_next (m);
 }
 
-void
-Music_iterator::do_process_and_next (Moment)
+bool
+Music_iterator::ok () const
 {
-  first_b_ = false;
+  return false;
 }
 
-bool
-Music_iterator::ok() const
+SCM
+Music_iterator::get_music (Moment)const
 {
-  return first_b_;
+  return SCM_EOL;
 }
 
 Music_iterator*
-Music_iterator::static_get_iterator_p (Music const *m, bool playing)
+Music_iterator::static_get_iterator_p (Music *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))
+  if (dynamic_cast<Request_chord   *> (m))
     p = new Request_chord_iterator;
-  else if (dynamic_cast<Lyric_combine_music const*> (m))
+  else if (dynamic_cast<Lyric_combine_music *> (m))
     p = new Lyric_combine_music_iterator;
-  else if (dynamic_cast<Simultaneous_music  const *> (m)) 
+  else if (dynamic_cast<Simultaneous_music *> (m)) 
     p =  new Simultaneous_music_iterator;
-  else if (dynamic_cast<Sequential_music  const *> (m)) 
+  else if (dynamic_cast<Sequential_music *> (m)) 
     p =  new Sequential_music_iterator;
-  else if (dynamic_cast<Translation_property  const *> (m))
+  else if (dynamic_cast<Translation_property *> (m))
     p = new Property_iterator;
-  else if (dynamic_cast<Change_translator  const *> (m))
+  else if (dynamic_cast<Change_translator *> (m))
     p = new Change_iterator;
-  else if (dynamic_cast<Time_scaled_music  const *> (m))
+  else if (dynamic_cast<Push_translation_property*> (m))
+    p = new Push_property_iterator;
+  else if (dynamic_cast<Pop_translation_property*> (m))
+    p = new Pop_property_iterator;
+  else if (dynamic_cast<Time_scaled_music *> (m))
     p = new Time_scaled_music_iterator;
-  else if (dynamic_cast<Grace_music const*> (m))
+  else if (dynamic_cast<Grace_music *> (m))
     p = new Grace_iterator;
-  else if (dynamic_cast<Auto_change_music const*> (m))
+  else if (dynamic_cast<Auto_change_music *> (m))
     p = new Auto_change_iterator;
-  else if (dynamic_cast<Music_wrapper  const *> (m))
+  else if (dynamic_cast<Part_combine_music *> (m))
+    p = new Part_combine_music_iterator;
+  else if (dynamic_cast<Music_wrapper   *> (m))
     p = new Music_wrapper_iterator;
-  else if (Repeated_music const * n = dynamic_cast<Repeated_music const *> (m))
+  else if (Repeated_music  * n = dynamic_cast<Repeated_music  *> (m))
     {
-      if (n->fold_b_ && !playing)
+      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->playback_b_ = playing;
+    {
+      p = new Simple_music_iterator ;
+    }
 
   p->music_l_ = m;
   return p;
 }
 
 void
-Music_iterator::init_translator (Music const *m, Translator_group  *report_l)
+Music_iterator::init_translator (Music *m, Translator_group *report_l)
 {
   music_l_ = m;
-  if (Context_specced_music const * csm =dynamic_cast<Context_specced_music const*>(m))
+  if (Context_specced_music * csm =dynamic_cast<Context_specced_music *> (m))
     {
       Translator_group* a =report_l->
        find_create_translator_l (csm->translator_type_str_, csm->translator_id_str_);
@@ -169,31 +166,25 @@ Music_iterator::init_translator (Music const *m, Translator_group  *report_l)
       
     }
 
-  if (! report_to_l())
+  if (! report_to_l ())
     set_translator (report_l);
 }
 
 
 Music_iterator*
-Music_iterator::get_iterator_p (Music const*m) const
+Music_iterator::get_iterator_p (Music *m) const
 {
-  Music_iterator*p = static_get_iterator_p (m, playback_b_);
-  p->init_translator (m, report_to_l());
+  Music_iterator*p = static_get_iterator_p (m);
+  p->init_translator (m, report_to_l ());
   
-  p->construct_children();
+  p->construct_children ();
   return p;
 }
 
-Music_iterator::Music_iterator()
-{
-  playback_b_ = false;
-  first_b_ = true;
-}
-
 Music_iterator*
-Music_iterator::try_music (Music const *m) const
+Music_iterator::try_music (Music *m) const
 {
-  bool b = report_to_l ()->try_music ((Music*)m); // ugh
+  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);
@@ -201,7 +192,7 @@ Music_iterator::try_music (Music const *m) const
 }
 
 Music_iterator*
-Music_iterator::try_music_in_children (Music const *  ) const
+Music_iterator::try_music_in_children (Music *) const
 {
   return 0;
 }