``slikken kreng''

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 7b2dddb1da8d22da6d2946910fee11a6c37b84b2..480b506858d7fe62b885c1cf14861351a42ec91c 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -21,15 +21,15 @@ bool check_grob(Music *mus, SCM sym);
 void
 Property_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
+  SCM sym = get_music ()->get_mus_property ("symbol");
   if (gh_symbol_p (sym))
     {
-      SCM val = music_l ()->get_mus_property ("value");
+      SCM val = get_music ()->get_mus_property ("value");
       bool ok= true;
       if (val != SCM_EOL)
        ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
       if (ok)
-       report_to_l ()->internal_set_property (sym, val);
+       report_to ()->internal_set_property (sym, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -37,9 +37,9 @@ Property_iterator::process (Moment m)
 void
 Property_unset_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
+  SCM sym = get_music ()->get_mus_property ("symbol");
   type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));  
-  report_to_l ()->unset_property (sym);
+  report_to ()->unset_property (sym);
 
   Simple_music_iterator::process (m);
 }
@@ -56,8 +56,8 @@ check_grob(Music *mus, SCM sym)
     }
   
   
-  SCM type_p = scm_object_property (sym, ly_symbol2scm ("translation-type?"));
-  bool ok = type_p == list_p;
+  SCM type = scm_object_property (sym, ly_symbol2scm ("translation-type?"));
+  bool ok = type == list_p;
 
   if (!ok)
     {
@@ -69,17 +69,17 @@ check_grob(Music *mus, SCM sym)
 void
 Push_property_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
-  if (check_grob (music_l (), sym))
+  SCM sym = get_music ()->get_mus_property ("symbol");
+  if (check_grob (get_music (), sym))
     {
-      SCM eprop = music_l ()->get_mus_property ("grob-property");
-      SCM val = music_l ()->get_mus_property ("grob-value");
+      SCM eprop = get_music ()->get_mus_property ("grob-property");
+      SCM val = get_music ()->get_mus_property ("grob-value");
 
-      if (to_boolean (music_l ()->get_mus_property ("pop-first")))
-       Translator_def::apply_pushpop_property (report_to_l (),
+      if (to_boolean (get_music ()->get_mus_property ("pop-first")))
+       Translator_def::apply_pushpop_property (report_to (),
                                                sym, eprop, SCM_UNDEFINED);
 
-      Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, val);
+      Translator_def::apply_pushpop_property (report_to (), sym, eprop, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -87,11 +87,11 @@ Push_property_iterator::process (Moment m)
 void
 Pop_property_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
-  if (check_grob (music_l (), sym))
+  SCM sym = get_music ()->get_mus_property ("symbol");
+  if (check_grob (get_music (), sym))
     {
-      SCM eprop = music_l ()->get_mus_property ("grob-property");
-      Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, SCM_UNDEFINED);
+      SCM eprop = get_music ()->get_mus_property ("grob-property");
+      Translator_def::apply_pushpop_property (report_to (), sym, eprop, SCM_UNDEFINED);
     }  
   Simple_music_iterator::process (m);
 }