source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#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);
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.
if (current && current->id_string () == to_id)
{
- String msg;
+ string msg;
msg += _f ("can't change, already in translator: %s", to_id);
}
{
/* We could change the current translator's id, but that would make
errors hard to catch.
-
+
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 */