Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 50a352bed115203f2d057bc407dacc8f2b7623a9..26dbe93a8dec76763045dbb5d5b6c7d5f622e2bd 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,16 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lily-guile.hh"
-
+#include "music-sequence.hh"
 #include "audio-item.hh"
 #include "performer.hh"
 #include "warn.hh"
 
-
 class Key_performer : public Performer
 {
 public:
@@ -20,18 +18,18 @@ public:
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req);
-  virtual void create_audio_elements ();
-  virtual void stop_translation_timestep ();
+  virtual bool try_music (Music *ev);
+  void process_music ();
+  void stop_translation_timestep ();
 
 private:
-  Key_change_ev* key_req_;
-  Audio_key* audio_;
+  Music *key_ev_;
+  Audio_key *audio_;
 };
 
 Key_performer::Key_performer ()
 {
-  key_req_ = 0;
+  key_ev_ = 0;
   audio_ = 0;
 }
 
@@ -40,36 +38,40 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
 {
-  if (key_req_) 
+  if (key_ev_)
     {
-      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);
-      
-      Pitch key_do (0, 
-                   gh_scm2int (ly_caar (pitchlist)),
-                   gh_scm2int (ly_cdar (pitchlist)));
+      SCM pitchlist = key_ev_->get_property ("pitch-alist");
+      SCM proc = ly_lily_module_constant ("alterations-in-key");
+
+      SCM acc = scm_call_1 (proc, pitchlist);
+
+      Pitch key_do (0,
+                   scm_to_int (scm_caar (pitchlist)),
+                   scm_to_int (scm_cdar (pitchlist)));
 
       Pitch c_do (0, 0, 0);
-                 
+
       SCM c_pitchlist
        = ly_transpose_key_alist (pitchlist,
-                                 interval (key_do, c_do).smobbed_copy ());
+                                 pitch_interval (key_do, c_do).smobbed_copy ());
 
       /* 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_element_info info (audio_, key_req_);
+      SCM third = scm_assoc (scm_from_int (2),
+                            c_pitchlist);
+      bool minor = (scm_is_pair (third)
+                   && scm_is_integer (scm_cdr (third))
+                   && scm_to_int (scm_cdr (third)) == FLAT);
+
+      audio_ = new Audio_key (scm_to_int (acc),
+                             !minor);
+
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_ = 0;
+      key_ev_ = 0;
     }
 }
 
@@ -84,21 +86,17 @@ Key_performer::stop_translation_timestep ()
 }
 
 bool
-Key_performer::try_music (Music* req)
+Key_performer::try_music (Music *ev)
 {
-  if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (req))
-    {
-      if (key_req_)
-       warning (_ ("FIXME: key change merge"));
+  if (!key_ev_)
+    key_ev_ = ev;
 
-      key_req_ = kc;
-      return true;
-    }
-
-  return false;
+  return true;
 }
 
-ENTER_DESCRIPTION (Key_performer,
-                 "","",
-                 "key-change-event",
-                 "","","");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Key_performer,
+               "", "",
+               "key-change-event",
+               "", "");