/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 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"
item_->set_property ("c0-position",
get_property ("middleCClefPosition"));
- SCM last = get_property ("lastKeySignature");
- SCM key = get_property ("keySignature");
+ SCM last = get_property ("lastKeyAlterations");
+ SCM key = get_property ("keyAlterations");
if ((to_boolean (get_property ("printKeyCancellation"))
|| key == SCM_EOL)
cancellation_->set_property ("alteration-alist", restore);
cancellation_->set_property ("c0-position",
- get_property ("middleCPosition"));
+ get_property ("middleCClefPosition"));
}
}
void
Key_engraver::acknowledge_bar_line (Grob_info /* info */)
{
- if (scm_is_pair (get_property ("keySignature")))
+ if (scm_is_pair (get_property ("keyAlterations")))
create_key (true);
}
Key_engraver::process_music ()
{
if (key_event_
- || get_property ("lastKeySignature") != get_property ("keySignature"))
+ || get_property ("lastKeyAlterations") != get_property ("keyAlterations"))
create_key (false);
}
Key_engraver::stop_translation_timestep ()
{
item_ = 0;
- context ()->set_property ("lastKeySignature", get_property ("keySignature"));
+ context ()->set_property ("lastKeyAlterations", get_property ("keyAlterations"));
cancellation_ = 0;
key_event_ = 0;
}
}
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 ("keyAlterations", scm_reverse_x (accs, SCM_EOL));
context ()->set_property ("tonic",
r->get_property ("tonic"));
}
void
Key_engraver::initialize ()
{
- context ()->set_property ("keySignature", SCM_EOL);
- context ()->set_property ("lastKeySignature", SCM_EOL);
+ context ()->set_property ("keyAlterations", SCM_EOL);
+ context ()->set_property ("lastKeyAlterations", SCM_EOL);
- Pitch p (0, 0, 0);
+ Pitch p;
context ()->set_property ("tonic", p.smobbed_copy ());
}
"explicitKeySignatureVisibility "
"extraNatural "
"keyAlterationOrder "
- "keySignature "
- "lastKeySignature "
+ "keyAlterations "
+ "lastKeyAlterations "
"printKeyCancellation "
"middleCClefPosition ",
/* write */
- "keySignature "
- "lastKeySignature "
+ "keyAlterations "
+ "lastKeyAlterations "
"tonic "
);