Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 5735d4915d39539963362bda8ef621e72a2d384e..aef7567be0f74e1390b96c55e3b0438b6525b3ba 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -9,23 +9,24 @@
 #include "change-iterator.hh"
 
 #include "context.hh"
+#include "input.hh"
+#include "international.hh"
 #include "music.hh"
 #include "warn.hh"
-#include "input.hh"
 
 void
-Change_iterator::error (String reason)
+Change_iterator::error (string reason)
 {
-  String to_type = ly_symbol2string (get_music ()->get_property ("change-to-type"));
-  String to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
+  string to_type = ly_symbol2string (get_music ()->get_property ("change-to-type"));
+  string to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
 
-  String warn1 = _f ("can't change `%s' to `%s'", to_type, to_id)
+  string warn1 = _f ("can't change `%s' to `%s'", to_type, to_id)
     + ": " + reason;
 
   /*
     GUHG!
   */
-  String warn2= "Change_iterator::process (): "
+  string warn2= "Change_iterator::process (): "
     + get_outlet ()->context_name () + " = `"
     + get_outlet ()->id_string () + "': ";
   warning (warn2);
@@ -42,7 +43,7 @@ Change_iterator::process (Moment m)
   Context *last = 0;
 
   SCM to_type = get_music ()->get_property ("change-to-type");
-  String to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
+  string to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
 
   /* find the type  of translator that we're changing.
 
@@ -56,7 +57,7 @@ Change_iterator::process (Moment m)
 
   if (current && current->id_string () == to_id)
     {
-      String msg;
+      string msg;
       msg += _f ("can't change, already in translator: %s", to_id);
     }
 
@@ -87,7 +88,7 @@ Change_iterator::process (Moment m)
 
           last->translator_id_string () = get_change
           ()->change_to_id_string (); */
-       error (_f ("not changing to same context type: %s", to_type));
+       error (_f ("not changing to same context type: %s", ly_symbol2string (to_type).c_str ()));
       }
   else
     /* FIXME: uncomprehensable message */