release: 1.5.34

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 1967bea297313fa766efd8e06f650b80e377b2a5..ad4452a3eee76d903d6d59456b746bd3f4fcf411 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
@@ -18,15 +18,15 @@
 void
 Property_iterator::process (Moment m)
 {
-  SCM sym = music_l_->get_mus_property ("symbol");
+  SCM sym = music_l ()->get_mus_property ("symbol");
   if (gh_symbol_p (sym))
     {
-      SCM val = music_l_->get_mus_property ("value");
+      SCM val = music_l ()->get_mus_property ("value");
       bool ok= true;
       if (val != SCM_EOL)
-       ok = type_check_assignment (val, sym, ly_symbol2scm ("translation-type?"));
+       ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
       if (ok)
-       report_to_l ()->set_property (sym, val);
+       report_to_l ()->internal_set_property (sym, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -34,7 +34,7 @@ Property_iterator::process (Moment m)
 void
 Property_unset_iterator::process (Moment m)
 {
-  SCM sym = music_l_->get_mus_property ("symbol");
+  SCM sym = music_l ()->get_mus_property ("symbol");
   if (gh_symbol_p (sym))
     {
       report_to_l ()->unset_property (sym);
@@ -46,15 +46,15 @@ Property_unset_iterator::process (Moment m)
 void
 Push_property_iterator::process (Moment m)
 {
-  SCM syms = music_l_->get_mus_property ("symbols");
-  SCM eprop = music_l_->get_mus_property ("grob-property");
-  SCM val = music_l_->get_mus_property ("grob-value");
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  SCM eprop = music_l ()->get_mus_property ("grob-property");
+  SCM val = music_l ()->get_mus_property ("grob-value");
 
-  if (to_boolean (music_l_->get_mus_property ("pop-first")))
+  if (to_boolean (music_l ()->get_mus_property ("pop-first")))
     Translator_def::apply_pushpop_property (report_to_l (),
-                                           syms, eprop, SCM_UNDEFINED);
+                                           sym, eprop, SCM_UNDEFINED);
 
-  Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, val);
+  Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, val);
   
   Simple_music_iterator::process (m);
 }
@@ -62,9 +62,9 @@ Push_property_iterator::process (Moment m)
 void
 Pop_property_iterator::process (Moment m)
 {
-  SCM syms = music_l_->get_mus_property ("symbols");
-  SCM eprop = music_l_->get_mus_property ("grob-property");
-  Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, SCM_UNDEFINED);
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  SCM eprop = music_l ()->get_mus_property ("grob-property");
+  Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, SCM_UNDEFINED);
   
   Simple_music_iterator::process (m);
 }
@@ -73,4 +73,4 @@ Pop_property_iterator::process (Moment m)
 IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Property_iterator);
-IMPLEMENT_CTOR_CALLBACK(Property_unset_iterator);
+IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);