Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / translator.cc

diff --git a/lily/translator.cc b/lily/translator.cc
index 743db9d7aa1d565bee8c64b8fb240233b17c0eaf..391af52b4b70534ad8e49716e37d1fbf496edd4f 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -3,7 +3,7 @@
 
   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 "translator.hh"
@@ -159,27 +159,27 @@ Translator::print_smob (SCM s, SCM port, scm_print_state *)
 void
 add_acknowledger (Engraver_void_function_engraver_grob_info ptr,
                  char const *func_name,
-                 Array<Acknowledge_information> *ack_array)
+                 vector<Acknowledge_information> *ack_array)
 {
   Acknowledge_information inf;
   inf.function_ = ptr;
 
-  String interface_name (func_name);
+  string interface_name (func_name);
 
-  interface_name = interface_name.substitute ('_', '-');
+  interface_name = replace_all (interface_name, '_', '-');
   interface_name += "-interface";
 
-  inf.symbol_ = scm_gc_protect_object (ly_symbol2scm (interface_name.to_str0 ()));
-  ack_array->push (inf);
+  inf.symbol_ = scm_gc_protect_object (ly_symbol2scm (interface_name.c_str ()));
+  ack_array->push_back (inf);
 }
 
 Engraver_void_function_engraver_grob_info
-generic_get_acknowledger (SCM sym, Array<Acknowledge_information> const *ack_array)
+generic_get_acknowledger (SCM sym, vector<Acknowledge_information> const *ack_array)
 {
-  for (int i = 0; i < ack_array->size (); i++)
+  for (vsize i = 0; i < ack_array->size (); i++)
     {
-      if (ack_array->elem (i).symbol_ == sym)
-       return ack_array->elem (i).function_;
+      if (ack_array->at (i).symbol_ == sym)
+       return ack_array->at (i).function_;
     }
   return 0;
 }