2003 -> 2004

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index b42d1f8b0485e86ac6fc24c8e08e3fb6f7c91c78..0a1aa27e5ba1715dfcea660953b1e11dbed4e258 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
 #include "music.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
 #include "translator-group.hh"
 #include "global-translator.hh"
 
@@ -30,7 +30,7 @@ Property_iterator::process (Moment m)
       if (val != SCM_EOL)
        ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
       if (ok)
-       report_to ()->internal_set_property (sym, val);
+       get_outlet ()->internal_set_property (sym, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -40,7 +40,7 @@ Property_unset_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_mus_property ("symbol");
   type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));  
-  report_to ()->unset_property (sym);
+  get_outlet ()->unset_property (sym);
 
   Simple_music_iterator::process (m);
 }
@@ -63,10 +63,10 @@ Property_iterator::do_quit ()
 {
   if (to_boolean (get_music ()->get_mus_property  ("once")))
     {
-      SCM trans = report_to()->self_scm();
+      SCM trans = get_outlet ()->self_scm();
       SCM music = get_music()->self_scm();
 
-      Global_translator * tg=  report_to()->top_translator ();
+      Global_translator * tg=  get_outlet ()->top_translator ();
 
       tg->add_finalization (scm_list_n (once_finalization_proc,
                                        trans, music, SCM_UNDEFINED));
@@ -111,10 +111,9 @@ Push_property_iterator::process (Moment m)
       if (to_boolean (get_music ()->get_mus_property ("pop-first"))
          && !to_boolean (get_music ()->get_mus_property ("once"))
          )
-       Translator_def::apply_pushpop_property (report_to (),
-                                               sym, eprop, SCM_UNDEFINED);
+       get_outlet ()->execute_pushpop_property (sym, eprop, SCM_UNDEFINED);
 
-      Translator_def::apply_pushpop_property (report_to (), sym, eprop, val);
+      get_outlet ()->execute_pushpop_property (sym, eprop, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -124,15 +123,14 @@ SCM
 Push_property_iterator::once_finalization (SCM trans, SCM music)
 {
   Music * mus = unsmob_music (music);
-  Translator_group *tg
-    = dynamic_cast<Translator_group*> (unsmob_translator (trans));
-
+  Translator_group * tg = dynamic_cast<Translator_group*> (unsmob_translator (trans));
+    
   SCM sym = mus->get_mus_property ("symbol");
   if (check_grob (mus, sym))
     {
       SCM eprop = mus->get_mus_property ("grob-property");
   
-      Translator_def::apply_pushpop_property (tg, sym, eprop, SCM_UNDEFINED);
+      tg->execute_pushpop_property (sym, eprop, SCM_UNDEFINED);
     }
   return SCM_UNSPECIFIED;
 }
@@ -142,10 +140,10 @@ Push_property_iterator::do_quit ()
 {
   if (to_boolean (get_music ()->get_mus_property  ("once")))
     {
-      SCM trans = report_to()->self_scm();
+      SCM trans = get_outlet ()->self_scm();
       SCM music = get_music ()->self_scm();
 
-      Global_translator * tg=  report_to()->top_translator ();
+      Global_translator * tg=  get_outlet ()->top_translator ();
       tg->add_finalization (scm_list_n (once_finalization_proc,
                                        trans, music, SCM_UNDEFINED));
     }
@@ -155,11 +153,12 @@ void
 Pop_property_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_mus_property ("symbol");
+  
   if (check_grob (get_music (), sym))
     {
       SCM eprop = get_music ()->get_mus_property ("grob-property");
-      Translator_def::apply_pushpop_property (report_to (), sym, eprop, SCM_UNDEFINED);
-    }  
+      get_outlet ()->execute_pushpop_property (sym, eprop, SCM_UNDEFINED);
+    }
   Simple_music_iterator::process (m);
 }