* lily/beam.cc (shift_region_to_valid): fix stupido bug.

[lilypond.git] / lily / key-performer.cc

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 65bcfba7b26692f3873150d10f6d4009e97bac7c..77fe3a9b62fbb5c88b0a4f9ced582d9037de96fa 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,21 +3,21 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lily-guile.hh"
 #include "command-request.hh"
 #include "audio-item.hh"
 #include "performer.hh"
+#include "warn.hh"
+
 
 class Key_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Key_performer();
-  ~Key_performer();
+  TRANSLATOR_DECLARATIONS(Key_performer);
+  ~Key_performer ();
 
 protected:
   virtual bool try_music (Music* req_l);
@@ -29,8 +29,6 @@ private:
   Audio_key* audio_p_;
 };
 
-ADD_THIS_TRANSLATOR (Key_performer);
-
 Key_performer::Key_performer ()
 {
   key_req_l_ = 0;
@@ -47,11 +45,28 @@ Key_performer::create_audio_elements ()
   if (key_req_l_) 
     {
       SCM pitchlist = key_req_l_->get_mus_property ("pitch-alist");
-      SCM proc = scm_eval2 (ly_symbol2scm ("accidentals-in-key"), SCM_EOL); 
+      SCM proc = scm_primitive_eval (ly_symbol2scm ("accidentals-in-key")); 
       SCM acc = gh_call1 (proc, pitchlist);
-      proc = scm_eval2 (ly_symbol2scm ("major-key"), SCM_EOL);
-      SCM major = gh_call1 (proc, pitchlist);
-      audio_p_ = new Audio_key (gh_scm2int(acc), major == SCM_BOOL_T); 
+      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)));
+
+      my_do.transpose (to_c);
+      to_c.alteration_i_ -= my_do.alteration_i_;
+
+      Key_change_req *key = new Key_change_req;
+      key->set_mus_property ("pitch-alist", scm_list_copy (pitchlist));
+      ((Music*)key)->transpose (to_c);
+      SCM c_pitchlist = key->get_mus_property ("pitch-alist");
+      SCM major = gh_call1 (proc, c_pitchlist);
+
+      audio_p_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T); 
       Audio_element_info info (audio_p_, key_req_l_);
       announce_element (info);
       key_req_l_ = 0;
@@ -83,3 +98,4 @@ Key_performer::try_music (Music* req_l)
   return false;
 }
 
+ENTER_DESCRIPTION(Key_performer,"","","","","");