X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;fp=lily%2Fchange-iterator.cc;h=0adac3b8b3808d424847b345cba9a706a1174ca1;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=04647c111c0aed8f783cf2519daf93be6aed7e1b;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc index 04647c111c..0adac3b8b3 100644 --- a/lily/change-iterator.cc +++ b/lily/change-iterator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,14 +32,14 @@ Change_iterator::error (string reason) string to_id = ly_scm2string (get_music ()->get_property ("change-to-id")); string warn1 = _f ("cannot change `%s' to `%s'", to_type, to_id) - + ": " + reason; + + ": " + reason; /* GUHG! */ - string warn2= "Change_iterator::process (): " - + get_outlet ()->context_name () + " = `" - + get_outlet ()->id_string () + "': "; + string warn2 = "Change_iterator::process (): " + + get_outlet ()->context_name () + " = `" + + get_outlet ()->id_string () + "': "; warning (warn2); get_music ()->origin ()->warning (warn1); } @@ -75,31 +75,31 @@ Change_iterator::process (Moment m) if (current) if (last) { - Context *dest = 0; - Context *where = get_outlet (); - while (!dest && where) - { - dest = find_context_below (where, to_type, to_id); - where = where->get_parent_context (); - } - - if (dest) - { - send_stream_event (last, "ChangeParent", get_music ()->origin (), - ly_symbol2scm ("context"), dest->self_scm ()); - } - else - /* FIXME: constant error message. */ - get_music ()->origin ()->warning (_ ("cannot find context to switch to")); + Context *dest = 0; + Context *where = get_outlet (); + while (!dest && where) + { + dest = find_context_below (where, to_type, to_id); + where = where->get_parent_context (); + } + + if (dest) + { + send_stream_event (last, "ChangeParent", get_music ()->origin (), + ly_symbol2scm ("context"), dest->self_scm ()); + } + else + /* FIXME: constant error message. */ + get_music ()->origin ()->warning (_ ("cannot find context to switch to")); } else { - /* We could change the current translator's id, but that would make - errors hard to catch. + /* 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", ly_symbol2string (to_type).c_str ())); + last->translator_id_string () = get_change + ()->change_to_id_string (); */ + error (_f ("not changing to same context type: %s", ly_symbol2string (to_type).c_str ())); } else /* FIXME: uncomprehensable message */