/*
- key-engraver.cc -- implement Key_engraver
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2006 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "bar-line.hh"
}
-SCM
-make_qt_key (SCM rat_key)
-{
- SCM qt_key = SCM_EOL;
- SCM *tail = &qt_key;
-
- for (SCM s = rat_key; scm_is_pair (s); s = scm_cdr (s))
- {
- *tail = scm_cons (scm_cons (scm_caar (s),
- scm_from_int (Rational (4)* ly_scm2rational (scm_cdar (s)))),
- SCM_EOL);
- tail = SCM_CDRLOC (*tail);
- }
-
- return qt_key;
-}
-
void
Key_engraver::create_key (bool is_default)
{
SCM last = get_property ("lastKeySignature");
SCM key = get_property ("keySignature");
- bool extranatural = to_boolean(get_property("extraNatural"));
+ bool extranatural = to_boolean (get_property ("extraNatural"));
if ((to_boolean (get_property ("printKeyCancellation"))
|| key == SCM_EOL)
for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
{
SCM new_alter_pair = scm_assoc (scm_caar (s), key);
- Rational old_alter = ly_scm2rational (scm_cdar (s));
+ Rational old_alter = robust_scm2rational (scm_cdar (s), 0);
if (new_alter_pair == SCM_BOOL_F
- || extranatural
- && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter < Rational (0))
+ || (extranatural
+ && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter
+ < Rational (0)))
{
*tail = scm_cons (scm_car (s), *tail);
tail = SCM_CDRLOC (*tail);
key_event_
? key_event_->self_scm () : SCM_EOL);
- cancellation_->set_property ("alteration-alist", make_qt_key (restore));
+ cancellation_->set_property ("alteration-alist", scm_reverse (restore));
cancellation_->set_property ("c0-position",
get_property ("middleCPosition"));
}
}
-
- item_->set_property ("alteration-alist", make_qt_key (key));
+ item_->set_property ("alteration-alist", scm_reverse (key));
}
if (!is_default)
{
SCM visibility = get_property ("explicitKeySignatureVisibility");
item_->set_property ("break-visibility", visibility);
- if (cancellation_)
- cancellation_->set_property ("break-visibility", visibility);
}
}
}
void
-Key_engraver::acknowledge_clef (Grob_info info)
+Key_engraver::acknowledge_clef (Grob_info /* info */)
{
- (void)info;
SCM c = get_property ("createKeyOnClefChange");
if (to_boolean (c))
create_key (false);
}
void
-Key_engraver::acknowledge_bar_line (Grob_info info)
+Key_engraver::acknowledge_bar_line (Grob_info /* info */)
{
- (void)info;
if (scm_is_pair (get_property ("keySignature")))
create_key (true);
}
r->origin ()->warning ("No ordering for key signature alterations");
}
- context ()->set_property ("keySignature", accs);
+ context ()->set_property ("keySignature", scm_reverse (accs));
context ()->set_property ("tonic",
r->get_property ("tonic"));
}
ADD_ACKNOWLEDGER (Key_engraver, bar_line);
ADD_TRANSLATOR (Key_engraver,
- /* doc */ "",
- /* create */ "KeySignature",
+ /* doc */
+ "Engrave a key signature.",
+
+ /* create */
+ "KeyCancellation "
+ "KeySignature ",
/* read */
"createKeyOnClefChange "
"extraNatural "
"keyAlterationOrder "
"keySignature "
- "keySignature "
"lastKeySignature "
- "printKeyCancellation "
- ,
+ "printKeyCancellation ",
/* write */
"keySignature "
"lastKeySignature "
- "tonic ")
+ "tonic "
+ );