release: 1.3.147

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 8c3c2fe3a68822abbf0aa33f859717a69d9f24c2..7d5a5155be7a2a0af340e5950efc6833b4447e13 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,52 +3,26 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 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-chord-iterator.hh"
-#include "sequential-music-iterator.hh"
-#include "simultaneous-music-iterator.hh"
 #include "translator-group.hh"
-#include "translation-property.hh"
-#include "change-iterator.hh"
-#include "change-translator.hh"
 #include "music-wrapper.hh"
 #include "music-wrapper-iterator.hh"
-#include "time-scaled-music-iterator.hh"
-#include "time-scaled-music.hh"
-#include "context-specced-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 "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"
+#include "context-specced-music.hh"
 
 Music_iterator::Music_iterator ()
 {
-  //  clone_i_ = 0;
 }
 
 Music_iterator::Music_iterator (Music_iterator const& src)
 {
-  //  clone_i_ = src.clone_i_ + 1;
   handle_ = *src.handle_.clone ();
   music_l_ = src.music_l_;
   music_length_ = src.music_length_;
@@ -98,7 +72,7 @@ Music_iterator::ok () const
 }
 
 void
-Music_iterator::skip (Moment )
+Music_iterator::skip (Moment)
 {
 }
 
@@ -113,43 +87,15 @@ 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   *> (m))
-    p = new Request_chord_iterator;
-  else if (dynamic_cast<Lyric_combine_music *> (m))
-    p = new Lyric_combine_music_iterator;
-  else if (dynamic_cast<Simultaneous_music *> (m)) 
-    p =  new Simultaneous_music_iterator;
-  else if (dynamic_cast<Sequential_music *> (m)) 
-    p =  new Sequential_music_iterator;
-  else if (dynamic_cast<Translation_property *> (m))
-    p = new Property_iterator;
-  else if (dynamic_cast<Change_translator *> (m))
-    p = new Change_iterator;
-  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 *> (m))
-    p = new Grace_iterator;
-  else if (dynamic_cast<Auto_change_music *> (m))
-    p = new Auto_change_iterator;
-  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  * n = dynamic_cast<Repeated_music  *> (m))
+  SCM ctor = m->get_mus_property ("iterator-ctor") ;
+  if (unsmob_cxx_function (ctor))
     {
-      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;
+      Cxx_function f =  unsmob_cxx_function (ctor);
+      
+      p = (Music_iterator*) (*f) (SCM_EOL);
     }
+  else if (dynamic_cast<Music_wrapper   *> (m))
+    p = new Music_wrapper_iterator;
   else
     {
       p = new Simple_music_iterator ;
@@ -163,7 +109,7 @@ Music_iterator::static_get_iterator_p (Music *m)
 
 
 Moment
-Music_iterator::music_length_mom() const
+Music_iterator::music_length_mom () const
 {
   return music_length_;
 }
@@ -174,8 +120,18 @@ Music_iterator::init_translator (Music *m, Translator_group *report_l)
   music_l_ = 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_);
+      SCM ct = csm->get_mus_property ("context-type");
+      String c_type;
+      if (gh_string_p (ct))
+         c_type =  ly_scm2string (ct);
+      
+      String c_id;
+      SCM ci = csm->get_mus_property ("context-id");
+      if (gh_string_p (ci))
+       c_id = ly_scm2string (ci);
+      
+      Translator_group* a
+       =report_l->find_create_translator_l (c_type, c_id);
 
       set_translator (a);
       
@@ -199,7 +155,7 @@ Music_iterator::get_iterator_p (Music *m) const
 Music_iterator*
 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);
@@ -212,3 +168,4 @@ Music_iterator::try_music_in_children (Music *) const
   return 0;
 }
 
+IMPLEMENT_CTOR_CALLBACK (Music_iterator);