Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / script-engraver.cc

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 6baa67bfc05d8d20536fc4b18d88afe63499780d..9a06474c6b21731f51ab5337e778e7da325f1029 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -3,18 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#include "engraver.hh"
+
 #include "context.hh"
 #include "directional-element-interface.hh"
-#include "engraver.hh"
-#include "slur.hh"
+#include "international.hh"
 #include "note-column.hh"
 #include "paper-column.hh"
 #include "rhythmic-head.hh"
 #include "script-interface.hh"
 #include "side-position-interface.hh"
+#include "slur.hh"
 #include "staff-symbol-referencer.hh"
 #include "stem.hh"
 #include "warn.hh"
@@ -32,7 +34,7 @@ struct Script_tuple
 
 class Script_engraver : public Engraver
 {
-  Array<Script_tuple> scripts_;
+  vector<Script_tuple> scripts_;
   Spanner *slur_;
 
 protected:
@@ -70,7 +72,7 @@ Script_engraver::try_music (Music *m)
 
       Script_tuple t;
       t.event_ = m;
-      scripts_.push (t);
+      scripts_.push_back (t);
       return true;
     }
   return false;
@@ -132,7 +134,8 @@ void make_script_from_event (Grob *p,  Context *tg,
        }
 
       SCM preset = p->get_property_data (sym);
-      if (scm_call_1 (type, preset) == SCM_BOOL_F)
+      if (val == SCM_EOL
+         || scm_call_1 (type, preset) == SCM_BOOL_F)
        p->internal_set_property (sym, val);
     }
 
@@ -148,7 +151,7 @@ void make_script_from_event (Grob *p,  Context *tg,
 void
 Script_engraver::process_music ()
 {
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
       Music *music = scripts_[i].event_;
 
@@ -198,7 +201,7 @@ Script_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
   if (info.music_cause ())
     {
-      for (int i = 0; i < scripts_.size (); i++)
+      for (vsize i = 0; i < scripts_.size (); i++)
        {
          Grob *e = scripts_[i].script_;
 
@@ -221,7 +224,7 @@ Script_engraver::acknowledge_note_column (Grob_info info)
 
      As the note head to put it on is not known now, postpone this
      decision to Script_interface::calc_direction ().  */
-  for (int i = 0; i < scripts_.size (); i++)
+  for (vsize i = 0; i < scripts_.size (); i++)
     {
       Grob *e = scripts_[i].script_;