X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=56ec9998874ec397427f0236719b7eb6516dda0b;hb=c1dcc83ffe9c356e9ab3df20c4fde22f9c1aab8d;hp=808747fc946abf665aa90654d29ec424b01c2fdf;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 808747fc94..56ec999887 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,17 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
-#include "music.hh"
-#include "translator-def.hh"
-#include "translator-group.hh"
-#include "global-translator.hh"
 
+#include "music.hh"
+#include "context-def.hh"
+#include "global-context.hh"
 
-bool check_grob(Music *mus, SCM sym);
+bool check_grob (Music *mus, SCM sym);
 
 /**
    There is no real processing to a property: just lookup the
@@ -22,15 +21,15 @@ bool check_grob(Music *mus, SCM sym);
 void
 Property_iterator::process (Moment m)
 {
-  SCM sym = get_music ()->get_mus_property ("symbol");
-  if (gh_symbol_p (sym))
+  SCM sym = get_music ()->get_property ("symbol");
+  if (scm_is_symbol (sym))
     {
-      SCM val = get_music ()->get_mus_property ("value");
-      bool ok= true;
+      SCM val = get_music ()->get_property ("value");
+      bool ok = true;
       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);
 }
@@ -38,21 +37,21 @@ Property_iterator::process (Moment m)
 void
 Property_unset_iterator::process (Moment m)
 {
-  SCM sym = get_music ()->get_mus_property ("symbol");
+  SCM sym = get_music ()->get_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);
 }
 
-MAKE_SCHEME_CALLBACK(Property_iterator,once_finalization, 2);
+MAKE_SCHEME_CALLBACK (Property_iterator, once_finalization, 2);
 SCM
-Property_iterator::once_finalization(SCM translator, SCM music )
+Property_iterator::once_finalization (SCM translator, SCM music )
 {
   Music * m = unsmob_music (music);
-  Translator_group * tg
-    = dynamic_cast<Translator_group*> (unsmob_translator (translator));
-  SCM sym = m->get_mus_property ("symbol");
+  Context * tg
+    = dynamic_cast<Context *> (unsmob_context (translator));
+  SCM sym = m->get_property ("symbol");
 
   tg->unset_property (sym);
   return SCM_UNSPECIFIED;
@@ -61,13 +60,12 @@ Property_iterator::once_finalization(SCM translator, SCM music )
 void
 Property_iterator::do_quit ()
 {
-  if (to_boolean (get_music ()->get_mus_property  ("once")))
+  if (to_boolean (get_music ()->get_property  ("once")))
     {
-      SCM trans = report_to()->self_scm();
-      SCM music = get_music()->self_scm();
-
-      Global_translator * tg=  report_to()->top_translator ();
+      SCM trans = get_outlet ()->self_scm ();
+      SCM music = get_music ()->self_scm ();
 
+      Global_context * tg = get_outlet ()->get_global_context ();
       tg->add_finalization (scm_list_n (once_finalization_proc,
 					trans, music, SCM_UNDEFINED));
     }
@@ -76,12 +74,16 @@ Property_iterator::do_quit ()
 
 SCM list_p = 0;
 
+/*
+  This is a rather crude check: we merely check if the translator
+  property is a list.
+ */
 bool
-check_grob(Music *mus, SCM sym)
+check_grob (Music *mus, SCM sym)
 {
   if (!list_p)
     {
-      list_p = gh_eval_str ("list?");
+      list_p = scm_c_eval_string ("list?");
     }
   
   
@@ -90,7 +92,7 @@ check_grob(Music *mus, SCM sym)
 
   if (!ok)
     {
-      mus->origin()->warning (_f("Not a grob name, `%s'." , ly_symbol2string (sym)));
+      mus->origin ()->warning (_f ("Not a grob name, `%s'." , ly_symbol2string (sym)));
     }
   return  ok;
 }
@@ -98,37 +100,34 @@ check_grob(Music *mus, SCM sym)
 void
 Push_property_iterator::process (Moment m)
 {
-  SCM sym = get_music ()->get_mus_property ("symbol");
+  SCM sym = get_music ()->get_property ("symbol");
   if (check_grob (get_music (), sym))
     {
-      SCM eprop = get_music ()->get_mus_property ("grob-property");
-      SCM val = get_music ()->get_mus_property ("grob-value");
+      SCM eprop = get_music ()->get_property ("grob-property");
+      SCM val = get_music ()->get_property ("grob-value");
 
-      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);
+      if (to_boolean (get_music ()->get_property ("pop-first"))
+	  && !to_boolean (get_music ()->get_property ("once")))
+	execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED);
 
-      Translator_def::apply_pushpop_property (report_to (), sym, eprop, val);
+      execute_pushpop_property (get_outlet (), sym, eprop, val);
     }
   Simple_music_iterator::process (m);
 }
 
-MAKE_SCHEME_CALLBACK(Push_property_iterator,once_finalization, 2);
+MAKE_SCHEME_CALLBACK (Push_property_iterator, once_finalization, 2);
 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));
-
-  SCM sym = mus->get_mus_property ("symbol");
+  Context * tg = dynamic_cast<Context *> (unsmob_context (trans));
+    
+  SCM sym = mus->get_property ("symbol");
   if (check_grob (mus, sym))
     {
-      SCM eprop = mus->get_mus_property ("grob-property");
+      SCM eprop = mus->get_property ("grob-property");
   
-      Translator_def::apply_pushpop_property (tg, sym, eprop, SCM_UNDEFINED);
+      execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED);
     }
   return SCM_UNSPECIFIED;
 }
@@ -136,12 +135,12 @@ Push_property_iterator::once_finalization (SCM trans, SCM music)
 void
 Push_property_iterator::do_quit ()
 {
-  if (to_boolean (get_music ()->get_mus_property  ("once")))
+  if (to_boolean (get_music ()->get_property  ("once")))
     {
-      SCM trans = report_to()->self_scm();
-      SCM music = get_music ()->self_scm();
+      SCM trans = get_outlet ()->self_scm ();
+      SCM music = get_music ()->self_scm ();
 
-      Global_translator * tg=  report_to()->top_translator ();
+      Global_context * tg =  get_outlet ()->get_global_context ();
       tg->add_finalization (scm_list_n (once_finalization_proc,
 					trans, music, SCM_UNDEFINED));
     }
@@ -150,12 +149,13 @@ Push_property_iterator::do_quit ()
 void
 Pop_property_iterator::process (Moment m)
 {
-  SCM sym = get_music ()->get_mus_property ("symbol");
+  SCM sym = get_music ()->get_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);
-    }  
+      SCM eprop = get_music ()->get_property ("grob-property");
+execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED);
+    }
   Simple_music_iterator::process (m);
 }