* scm/output-ps.scm (output-scopes): use ly:paper-lookup for font

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

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index f7da5c27803815aa11e26df9973361eb295340f8..83c2f45fafd42715d4b6c9b7304bb4f4e18b37e5 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,7 +16,6 @@
 class Auto_change_iterator : public Music_wrapper_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
   DECLARE_SCHEME_CALLBACK(constructor, ());
   
   Auto_change_iterator ();
@@ -37,8 +36,8 @@ void
 Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
                                 String to_id)
 {
-  Translator_group * current = it->report_to ();
-  Translator_group * last = 0;
+  Context * current = it->get_outlet ();
+  Context * last = 0;
 
   /*
     Cut & Paste from Change_iterator (ugh).
@@ -53,7 +52,7 @@ 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->daddy_context_;
     }
 
   if (current && current->id_string_ == to_id)
@@ -65,10 +64,10 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   if (current) 
     if (last)
       {
-       Translator_group * dest = 
-         it->report_to ()->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,9 +86,8 @@ void
 Auto_change_iterator::process (Moment m)
 {
   Music_wrapper_iterator::process (m);
-
   
-  Moment now = report_to ()->now_mom ();
+  Moment now = get_outlet ()->now_mom ();
   Moment *splitm = 0;
   
   for (; gh_pair_p (split_list_); split_list_ = gh_cdr (split_list_))
@@ -122,7 +120,7 @@ void
 Auto_change_iterator::construct_children ()
 {
   Music_wrapper_iterator::construct_children ();
-  split_list_ =  get_music ()->get_mus_property ("split-list");
+  split_list_ =  get_music ()->get_property ("split-list");
 }
 
 IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);