X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=f0b63cab21911436ad7969afed06632f3e0b7218;hb=9f3cd80128759b22321f41060eb5c53853ac0667;hp=cff86db881cabba6c3cd71223149186199ea8ea1;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index cff86db881..f0b63cab21 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,38 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   */
 
 
-#include "command-request.hh"
-#include "musical-request.hh"
+
+#include "event.hh"
 #include "item.hh"
 #include "bar-line.hh"
 #include "staff-symbol-referencer.hh"
-#include "translator-group.hh"
+#include "context.hh"
 #include "engraver.hh"
 #include "pitch.hh"
 #include "protected-scm.hh"
 #include "clef.hh"
 
+/*
+  TODO: The representation  of key sigs is all fucked.
+ */
+
 /**
   Make the key signature.
  */
 class Key_engraver : public Engraver
 {
   void create_key (bool);
-  void read_req (Key_change_req const * r);
-  Key_change_req * keyreq_;
+  void read_ev (Key_change_ev const * r);
+  Key_change_ev * key_ev_;
   Item * item_;
 
 public:
-  TRANSLATOR_DECLARATIONS(Key_engraver);
+  TRANSLATOR_DECLARATIONS (Key_engraver);
 
 protected:
   virtual void initialize ();
   virtual void finalize ();
-  virtual bool try_music (Music *req);
+  virtual bool try_music (Music *ev);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void process_music ();
@@ -50,7 +54,7 @@ Key_engraver::finalize ()
 
 Key_engraver::Key_engraver ()
 {
-  keyreq_ = 0;
+  key_ev_ = 0;
   item_ = 0;
 }
 
@@ -60,46 +64,40 @@ Key_engraver::create_key (bool def)
 {
   if (!item_) 
     {
-      item_ = new Item (get_property ("KeySignature"));
+      item_ = make_item ("KeySignature");
 
-      item_->set_grob_property ("c0-position",
-				get_property ("centralCPosition"));
+      item_->set_property ("c0-position",
+			   get_property ("middleCPosition"));
       
       // todo: put this in basic props.
-      item_->set_grob_property ("old-accidentals", get_property ("lastKeySignature"));
-      item_->set_grob_property ("new-accidentals", get_property ("keySignature"));
+      item_->set_property ("old-accidentals", get_property ("lastKeySignature"));
+      item_->set_property ("new-accidentals", get_property ("keySignature"));
 
-      announce_grob(item_, keyreq_ ? keyreq_->self_scm() : SCM_EOL);
+      announce_grob (item_, key_ev_ ? key_ev_->self_scm () : SCM_EOL);
     }
 
   if (!def)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
       if (gh_procedure_p (vis))
-	item_->set_grob_property ("break-visibility",vis);
+	item_->set_property ("break-visibility",vis);
     }
 }      
 
 
 bool
-Key_engraver::try_music (Music * req)
+Key_engraver::try_music (Music * ev)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
+  //  if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (ev))
+  if (ev->is_mus_type ("key-change-event"))
     {
-      if (keyreq_ && !keyreq_->equal_b (kc))
-	{
-	  kc->origin ()->warning (_ ("Conflicting key signatures found."));
-	  keyreq_->origin ()->warning (_ ("This was the other key definition."));	  
-	  return false;
-	}
-
-      if (!keyreq_)
+      if (!key_ev_)
 	{
 	  /*
 	    do this only once, just to be on the safe side.
 	    */	    
-	  keyreq_ = kc;
-	  read_req (keyreq_);
+	  key_ev_ = dynamic_cast<Key_change_ev*> (ev); // UGH.
+	  read_ev (key_ev_);
 	}
       
       return true;
@@ -130,7 +128,7 @@ Key_engraver::acknowledge_grob (Grob_info info)
 void
 Key_engraver::process_music ()
 {
-  if (keyreq_ ||
+  if (key_ev_ ||
       get_property ("lastKeySignature") != get_property ("keySignature"))
     create_key (false);
 }
@@ -148,9 +146,9 @@ Key_engraver::stop_translation_timestep ()
 
 
 void
-Key_engraver::read_req (Key_change_req const * r)
+Key_engraver::read_ev (Key_change_ev const * r)
 {
-  SCM p = r->get_mus_property ("pitch-alist");
+  SCM p = r->get_property ("pitch-alist");
   if (!gh_pair_p (p))
     return;
 
@@ -170,35 +168,36 @@ Key_engraver::read_req (Key_change_req const * r)
     if (gh_scm2int (ly_cdar (s)))
       accs = gh_cons (ly_car (s), accs);
 
-#if 0
-  daddy_trans_->set_property ("lastKeySignature",
-				get_property ("keySignature"));
-#endif
-  
-  daddy_trans_->set_property ("keySignature", accs);
+  daddy_context_->set_property ("keySignature", accs);
+  daddy_context_->set_property ("tonic" ,
+			      r->get_property ("tonic"));
 }
 
 
 void
 Key_engraver::start_translation_timestep ()
 {
-  keyreq_ = 0;
-  daddy_trans_->set_property ("lastKeySignature", get_property ("keySignature"));
+  key_ev_ = 0;
+  daddy_context_->set_property ("lastKeySignature", get_property ("keySignature"));
 }
 
 
 void
 Key_engraver::initialize ()
 {
-  daddy_trans_->set_property ("keySignature", SCM_EOL);
-  daddy_trans_->set_property ("lastKeySignature", SCM_EOL);
+  daddy_context_->set_property ("keySignature", SCM_EOL);
+  daddy_context_->set_property ("lastKeySignature", SCM_EOL);
+
+  Pitch p (0,0,0);
+  daddy_context_->set_property ("tonic", p.smobbed_copy ());
+
 }
 
 
-ENTER_DESCRIPTION(Key_engraver,
+ENTER_DESCRIPTION (Key_engraver,
 /* descr */       "",
 /* creats*/       "KeySignature",
-/* accepts */     "general-music",
+/* accepts */     "key-change-event",
 /* acks  */      "bar-line-interface clef-interface",
 /* reads */       "keySignature lastKeySignature explicitKeySignatureVisibility createKeyOnClefChange keyAccidentalOrder keySignature",
-/* write */       "lastKeySignature");
+/* write */       "lastKeySignature tonic keySignature");