source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "lily-guile.hh"
class Key_performer : public Performer
{
public:
- TRANSLATOR_DECLARATIONS(Key_performer);
+ TRANSLATOR_DECLARATIONS (Key_performer);
~Key_performer ();
protected:
virtual void stop_translation_timestep ();
private:
- Key_change_req* key_req_;
+ Key_change_ev* key_req_;
Audio_key* audio_;
};
{
if (key_req_)
{
-
- /*
- UGH. primitive-eval.
- */
- SCM pitchlist = key_req_->get_mus_property ("pitch-alist");
- SCM proc = scm_primitive_eval (ly_symbol2scm ("accidentals-in-key"));
+ SCM pitchlist = key_req_->get_property ("pitch-alist");
+ static SCM proc;
+ if (!proc)
+ proc = scm_primitive_eval (ly_symbol2scm ("alterations-in-key"));
+
SCM acc = gh_call1 (proc, pitchlist);
- proc = scm_primitive_eval (ly_symbol2scm ("major-key"));
-
- Pitch my_do (0,
- gh_scm2int (ly_caar (pitchlist)),
- gh_scm2int (ly_cdar (pitchlist)));
-
- Pitch to_c (-1,
- (7 - gh_scm2int (ly_caar (pitchlist))) % 7,
- -gh_scm2int (ly_cdar (pitchlist)));
+
+ Pitch key_do (0,
+ gh_scm2int (ly_caar (pitchlist)),
+ gh_scm2int (ly_cdar (pitchlist)));
- my_do.transpose (to_c);
- to_c.alteration_ -= my_do.alteration_;
+ Pitch c_do (0, 0, 0);
+
+ SCM c_pitchlist
+ = ly_transpose_key_alist (pitchlist,
+ interval (key_do, c_do).smobbed_copy ());
- SCM c_pitchlist = transpose_key_alist (pitchlist, to_c.smobbed_copy());
- SCM major = gh_call1 (proc, c_pitchlist);
+ /* MIDI keys are too limited for lilypond scales.
+ We check for minor scale and assume major otherwise. */
+ SCM minor = scm_primitive_eval (ly_symbol2scm ("minor"));
+ audio_ = new Audio_key (gh_scm2int (acc),
+ SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
- audio_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T);
Audio_element_info info (audio_, key_req_);
announce_element (info);
key_req_ = 0;
bool
Key_performer::try_music (Music* req)
{
- if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
+ if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (req))
{
if (key_req_)
warning (_ ("FIXME: key change merge"));
return false;
}
-ENTER_DESCRIPTION(Key_performer,
+ENTER_DESCRIPTION (Key_performer,
"","",
"key-change-event",
"","","");