X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=7b73db03caea743a8bd1ee6af3a2921c119c4ca0;hb=b230681e00b54adaba3846209250505a0d0b41f0;hp=cf291348c0695d8c6ea984aa44d0a01dee467c7e;hpb=ce9845392e4e22ae9c5f6ec1da914eb301f1892c;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index cf291348c0..7b73db03ca 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,23 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 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 "music.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 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_;
+};
 
 
 
 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 +50,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 +65,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,80 +76,53 @@ 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"));
-
-}
-
-/*
-  Look ahead to find first pitches to determine staff position.
-  WARNING: this means that
-
-  \autochange Staff \notes { .... \context Staff = otherstaff { .. } .. }
-
-  will confuse the autochanger, since it will not notice that the
-  music for OTHERSTAFF is not his.
-
-  PRECONDITION: this->ok() holds.
-*/
-Array<Musical_pitch>
-Auto_change_iterator::pending_pitch (Moment m) const
-{
-  Music_iterator * iter = child_iter_p_ ->clone ();
-  Array<Musical_pitch> ps;
-  while (1)
-    {
-      SCM muses = iter->get_music (m);
-      for (SCM s = muses; gh_pair_p (s); s=gh_cdr (s))
-	if (Note_req* nr = dynamic_cast<Note_req*> (unsmob_music (gh_car (s))))
-	  {
-	    ps.push (nr->pitch_);
-	  }
-
-      if (ps.size ())
-	break;
-
-      iter->skip (m);
-      if (!iter->ok())
-	break;
-      
-      m = iter->pending_moment ();
-    }
+    ;
 
-  delete iter;
-  return ps;
 }
 
 void
 Auto_change_iterator::process (Moment m)
 {
-  /*
-    first we get the pitches, then we do the real work.
-    Music_wrapper_iterator::process() might process (and throw away)
-    pitches we need.  */
-  Array<Musical_pitch> ps = pending_pitch (m);
-
   Music_wrapper_iterator::process (m);
-  if (ps.size ())
+  
+  Moment now = get_outlet ()->now_mom ();
+  Moment *splitm = 0;
+  
+  for (; ly_c_pair_p (split_list_); split_list_ = ly_cdr (split_list_))
     {
-      Musical_pitch p = ps[0];
-      Direction s = Direction (sign(p.steps ()));
-      if (s != 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_);
+      splitm = unsmob_moment (ly_caar (split_list_));
+      if ((*splitm + start_moment_) > now)
+	break ;
 
-	  change_to (child_iter_p_, auto_mus->what_str_, to_id);	  
+      SCM tag = ly_cdar (split_list_);
+      Direction d = to_dir  (tag);
+      
+      if (d && d != where_dir_)
+	{
+	  where_dir_ = d;
+	  String to_id = (d >= 0) ?  "up" : "down";
+	  change_to (child_iter_,
+		     ly_symbol2scm ("Staff"),
+		     to_id);
 	}
     }
 }
 
-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 ()
+{
+  Music_wrapper_iterator::construct_children ();
+  split_list_ =  get_music ()->get_property ("split-list");
+  start_moment_ = get_outlet ()->now_mom ();
 }
+
+IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);