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 18dbfeba72e60180b142be7e18b274316bf574f7..a4c993b75644a943fa5ce77255385bf71793c367 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 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);
 
@@ -21,10 +23,10 @@ void
 Property_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_property ("symbol");
-  if (ly_symbol_p (sym))
+  if (scm_is_symbol (sym))
     {
       SCM val = get_music ()->get_property ("value");
-      bool ok= true;
+      bool ok = true;
       if (val != SCM_EOL)
        ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
       if (ok)
@@ -37,18 +39,18 @@ void
 Property_unset_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_property ("symbol");
-  type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));  
+  type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));
   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);
-  Context * tg
+  Music *m = unsmob_music (music);
+  Context *tg
     = dynamic_cast<Context *> (unsmob_context (translator));
   SCM sym = m->get_property ("symbol");
 
@@ -59,41 +61,41 @@ Property_iterator::once_finalization (SCM translator, SCM music )
 void
 Property_iterator::do_quit ()
 {
-  if (to_boolean (get_music ()->get_property  ("once")))
+  if (to_boolean (get_music ()->get_property ("once")))
     {
       SCM trans = get_outlet ()->self_scm ();
       SCM music = get_music ()->self_scm ();
 
-      Global_context * tg = get_outlet ()->get_global_context ();
+      Global_context *tg = get_outlet ()->get_global_context ();
       tg->add_finalization (scm_list_n (once_finalization_proc,
                                        trans, music, SCM_UNDEFINED));
     }
 }
 
-
-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)
 {
-  if (!list_p)
-    {
-      list_p = scm_c_eval_string ("list?");
-    }
-  
-  
-  SCM type = scm_object_property (sym, ly_symbol2scm ("translation-type?"));
-  bool ok = type == list_p;
+  bool g = to_boolean (scm_object_property (sym, ly_symbol2scm ("is-grob?")));
+
+  if (!g)
+    mus->origin ()->warning (_f ("not a grob name, `%s'",
+                                ly_symbol2string (sym)));
+
+  return g;
+}
 
-  if (!ok)
+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))
     {
-      mus->origin ()->warning (_f ("Not a grob name, `%s'." , ly_symbol2string (sym)));
+      grob_property_path = scm_list_1 (eprop);
     }
-  return  ok;
+
+  return grob_property_path;
 }
 
 void
@@ -102,31 +104,32 @@ 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);
 }
 
-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);
-  Context * tg = dynamic_cast<Context *> (unsmob_context (trans));
-    
+  Music *mus = unsmob_music (music);
+  Context *tg = dynamic_cast<Context *> (unsmob_context (trans));
+
   SCM sym = mus->get_property ("symbol");
   if (check_grob (mus, sym))
     {
-      SCM eprop = mus->get_property ("grob-property");
-  
-      execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED);
+      SCM grob_property_path = get_property_path (mus);
+
+      execute_general_pushpop_property (tg, sym, grob_property_path, SCM_UNDEFINED);
     }
   return SCM_UNSPECIFIED;
 }
@@ -134,12 +137,12 @@ Push_property_iterator::once_finalization (SCM trans, SCM music)
 void
 Push_property_iterator::do_quit ()
 {
-  if (to_boolean (get_music ()->get_property  ("once")))
+  if (to_boolean (get_music ()->get_property ("once")))
     {
       SCM trans = get_outlet ()->self_scm ();
       SCM music = get_music ()->self_scm ();
 
-      Global_context * tg=  get_outlet ()->get_global_context ();
+      Global_context *tg = get_outlet ()->get_global_context ();
       tg->add_finalization (scm_list_n (once_finalization_proc,
                                        trans, music, SCM_UNDEFINED));
     }
@@ -149,17 +152,15 @@ void
 Pop_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");
-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);
 }
 
-
-
 IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Property_iterator);