*** empty log message ***

[lilypond.git] / lily / auto-change-iterator.cc

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index cd4a350c85267b0d02cccd0afa940ce8417c2d43..eb7f5e39a37f091f383e123ab1979187638457a2 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,23 +3,46 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "auto-change-music.hh"
-#include "auto-change-iterator.hh"
-#include "translator-group.hh"
-#include "musical-request.hh"
+#include "context.hh"
+#include "event.hh"
+#include "music-wrapper-iterator.hh"
+#include "direction.hh"
+
+class Auto_change_iterator : public Music_wrapper_iterator
+{
+public:
+  DECLARE_SCHEME_CALLBACK (constructor, ());
+  
+  Auto_change_iterator ();
+
+protected:
+  virtual void do_quit ();
+  virtual void construct_children ();
+  virtual void process (Moment);  
+  Array<Pitch> pending_pitch (Moment)const;
+private:
+  SCM split_list_;
+  Direction where_dir_;
+  void change_to (Music_iterator* , SCM, String);
+  Moment start_moment_;
+
+  Interpretation_context_handle up_;
+  Interpretation_context_handle down_;
+
+};
 
 
 
 void
-Auto_change_iterator::change_to (Music_iterator *it, String to_type,
+Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
                                 String to_id)
 {
-  Translator_group * current = it->report_to_l ();
-  Translator_group * last = 0;
+  Context * current = it->get_outlet ();
+  Context * last = 0;
 
   /*
     Cut & Paste from Change_iterator (ugh).
@@ -31,13 +54,13 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type,
      
      If \translator Staff = bass, then look for Staff = *
    */
-  while  (current && current->type_str_ != to_type)
+  while (current && !current->is_alias (to_type_sym))
     {
       last = current;
-      current = current->daddy_trans_l_;
+      current = current->get_parent_context ();
     }
 
-  if (current && current->id_str_ == to_id)
+  if (current && current->id_string () == to_id)
     {
       String msg;
       msg += _ ("Can't switch translators, I'm there already");
@@ -46,10 +69,10 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type,
   if (current) 
     if (last)
       {
-       Translator_group * dest = 
-         it->report_to_l ()->find_create_translator_l (to_type, to_id);
-       current->remove_translator_p (last);
-       dest->add_group_translator (last);
+       Context * dest = 
+         it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL);
+       current->remove_context (last);
+       dest->add_context (last);
       }
     else
       {
@@ -57,45 +80,76 @@ Auto_change_iterator::change_to (Music_iterator *it, String to_type,
          We could change the current translator's id, but that would make 
          errors hard to catch
          
-          last->translator_id_str_  = change_l ()->change_to_id_str_;
        */
-       //      error (_ ("I'm one myself"));
       }
   else
-    ; //    error (_ ("none of these in my family"));
+    ;
 
 }
 
-Pitch_interrogate_req* spanish_inquisition; // nobody expects it
-
 void
 Auto_change_iterator::process (Moment m)
 {
   Music_wrapper_iterator::process (m);
-
-  if (!spanish_inquisition)
-    spanish_inquisition = new Pitch_interrogate_req;
-
-  Music_iterator *it = try_music (spanish_inquisition);
-
-  if (it && spanish_inquisition->pitch_arr_.size ())
+  
+  Moment now = get_outlet ()->now_mom ();
+  Moment *splitm = 0;
+  
+  for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
     {
-      Musical_pitch p = spanish_inquisition->pitch_arr_[0];
-      Direction s = Direction (sign(p.steps ()));
-      if (s != where_dir_)
+      splitm = unsmob_moment (scm_caar (split_list_));
+      if ((*splitm + start_moment_) > now)
+       break ;
+
+      SCM tag = scm_cdar (split_list_);
+      Direction d = to_dir  (tag);
+      
+      if (d && d != where_dir_)
        {
-         where_dir_ = s;
-         String to_id =  (s >= 0) ?  "up" : "down";
-         Auto_change_music const * auto_mus = dynamic_cast<Auto_change_music const* > (music_l_);
-
-         change_to (it, auto_mus->what_str_, to_id);     
+         where_dir_ = d;
+         String to_id = (d >= 0) ?  "up" : "down";
+         change_to (child_iter_,
+                    ly_symbol2scm ("Staff"),
+                    to_id);
        }
     }
-
-  spanish_inquisition->pitch_arr_.clear ();
 }
 
-Auto_change_iterator::Auto_change_iterator( )
+Auto_change_iterator::Auto_change_iterator ()
 {
   where_dir_ = CENTER;
+  split_list_ = SCM_EOL;
+}
+
+void
+Auto_change_iterator::construct_children ()
+{
+  split_list_ =  get_music ()->get_property ("split-list");
+  start_moment_ = get_outlet ()->now_mom ();
+
+  SCM props = get_outlet()->get_property ("trebleStaffProperties");
+  Context *up = get_outlet()->find_create_context (ly_symbol2scm ("Staff"),
+                                                  "up", props);
+
+  props = get_outlet()->get_property ("bassStaffProperties");
+  Context *down = get_outlet()->find_create_context (ly_symbol2scm ("Staff"),
+                                                  "down", props);
+  
+  up_.set_context (up);
+  down_.set_context (down);
+
+  Context *voice = up->find_create_context (ly_symbol2scm ("Voice"),
+                                          "", SCM_EOL);
+  set_context (voice);
+  Music_wrapper_iterator::construct_children ();
+
+}
+
+void
+Auto_change_iterator::do_quit()
+{
+  up_.set_context (0);
+  down_.set_context (0);
+  
 }
+IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);