Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 9cd2af1fff21a903316b123aa713993047c2100f..a4c993b75644a943fa5ce77255385bf71793c367 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,14 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "property-iterator.hh"
 
-#include "music.hh"
 #include "context-def.hh"
 #include "global-context.hh"
+#include "international.hh"
+#include "music.hh"
 
 bool check_grob (Music *mus, SCM sym);
 
@@ -83,20 +84,35 @@ check_grob (Music *mus, SCM sym)
   return g;
 }
 
+SCM
+get_property_path (Music *m)
+{
+  SCM grob_property_path = m->get_property ("grob-property-path");
+
+  SCM eprop = m->get_property ("grob-property");
+  if (scm_is_symbol (eprop))
+    {
+      grob_property_path = scm_list_1 (eprop);
+    }
+
+  return grob_property_path;
+}
+
 void
 Push_property_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_property ("symbol");
   if (check_grob (get_music (), sym))
     {
-      SCM eprop = get_music ()->get_property ("grob-property");
+      SCM grob_property_path = get_property_path (get_music ());
       SCM val = get_music ()->get_property ("grob-value");
 
       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);
+       
+       execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED);
 
-      execute_pushpop_property (get_outlet (), sym, eprop, val);
+      execute_general_pushpop_property (get_outlet (), sym, grob_property_path, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -111,9 +127,9 @@ Push_property_iterator::once_finalization (SCM trans, SCM music)
   SCM sym = mus->get_property ("symbol");
   if (check_grob (mus, sym))
     {
-      SCM eprop = mus->get_property ("grob-property");
+      SCM grob_property_path = get_property_path (mus);
 
-      execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED);
+      execute_general_pushpop_property (tg, sym, grob_property_path, SCM_UNDEFINED);
     }
   return SCM_UNSPECIFIED;
 }
@@ -139,8 +155,8 @@ Pop_property_iterator::process (Moment m)
 
   if (check_grob (get_music (), sym))
     {
-      SCM eprop = get_music ()->get_property ("grob-property");
-      execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED);
+      SCM grob_property_path = get_property_path (get_music ());
+      execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED);
     }
   Simple_music_iterator::process (m);
 }