* Documentation/user/notation.itely: fixed 2 typos

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

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index f5bb1bbe39542c3afe5ab3d492ac8ea9fa6f4a35..656264706b93f65613594b731b675292e5cefc43 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "music.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "event.hh"
 #include "music-wrapper-iterator.hh"
 #include "direction.hh"
@@ -16,12 +16,12 @@
 class Auto_change_iterator : public Music_wrapper_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  DECLARE_SCHEME_CALLBACK(constructor, ());
+  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;
@@ -29,6 +29,11 @@ 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_;
+
 };
 
 
@@ -37,8 +42,8 @@ void
 Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
                                 String to_id)
 {
-  Translator_group * current = it->get_outlet ();
-  Translator_group * last = 0;
+  Context * current = it->get_outlet ();
+  Context * last = 0;
 
   /*
     Cut & Paste from Change_iterator (ugh).
@@ -53,10 +58,10 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   while (current && !current->is_alias (to_type_sym))
     {
       last = current;
-      current = current->daddy_trans_;
+      current = current->get_parent_context ();
     }
 
-  if (current && current->id_string_ == to_id)
+  if (current && current->id_string () == to_id)
     {
       String msg;
       msg += _ ("Can't switch translators, I'm there already");
@@ -65,10 +70,10 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   if (current) 
     if (last)
       {
-       Translator_group * dest = 
-         it->get_outlet ()->find_create_translator (to_type_sym, to_id, SCM_EOL);
-       current->remove_translator (last);
-       dest->add_used_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
       {
@@ -87,18 +92,17 @@ void
 Auto_change_iterator::process (Moment m)
 {
   Music_wrapper_iterator::process (m);
-
   
   Moment now = get_outlet ()->now_mom ();
   Moment *splitm = 0;
   
-  for (; gh_pair_p (split_list_); split_list_ = gh_cdr (split_list_))
+  for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
     {
-      splitm = unsmob_moment (gh_caar (split_list_));
-      if (*splitm > now)
+      splitm = unsmob_moment (scm_caar (split_list_));
+      if ((*splitm + start_moment_) > now)
        break ;
 
-      SCM tag = gh_cdar (split_list_);
+      SCM tag = scm_cdar (split_list_);
       Direction d = to_dir  (tag);
       
       if (d && d != where_dir_)
@@ -121,8 +125,32 @@ Auto_change_iterator::Auto_change_iterator ()
 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_translator (up);
+  down_.set_translator (down);
+
+  Context *voice = up->find_create_context (ly_symbol2scm ("Voice"),
+                                          "", SCM_EOL);
+  set_translator (voice);
   Music_wrapper_iterator::construct_children ();
-  split_list_ =  get_music ()->get_mus_property ("split-list");
+
 }
 
+void
+Auto_change_iterator::do_quit()
+{
+  up_.set_translator (0);
+  down_.set_translator (0);
+  
+}
 IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);