/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "bar-line.hh"
#include "clef.hh"
#include "context.hh"
#include "engraver.hh"
+#include "international.hh"
#include "item.hh"
#include "pitch.hh"
#include "protected-scm.hh"
&& !scm_is_eq (last, key))
{
SCM restore = SCM_EOL;
- SCM *tail = &restore;
for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
{
SCM new_alter_pair = scm_assoc (scm_caar (s), key);
|| ((ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter) * old_alter
< Rational (0)))
{
- *tail = scm_cons (scm_car (s), *tail);
- tail = SCM_CDRLOC (*tail);
+ restore = scm_cons (scm_car (s), restore);
}
}
key_event_
? key_event_->self_scm () : SCM_EOL);
- cancellation_->set_property ("alteration-alist", scm_reverse (restore));
+ cancellation_->set_property ("alteration-alist", restore);
cancellation_->set_property ("c0-position",
get_property ("middleCPosition"));
}
}
if (warn)
- r->origin ()->warning ("Incomplete keyAlterationOrder for key signature");
+ r->origin ()->warning (_ ("Incomplete keyAlterationOrder for key signature"));
}
- context ()->set_property ("keySignature", scm_reverse (accs));
+ context ()->set_property ("keySignature", scm_reverse_x (accs, SCM_EOL));
context ()->set_property ("tonic",
r->get_property ("tonic"));
}