X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=26b3985e4e31fcb760a08701ec92f4f72cc2ac74;hb=3b2883eac4e40ebab564cb47fd446c3d31063bff;hp=b0d2557da82346e0e53898d1b3414fd6f7f24502;hpb=108cf0e8c08c8e15e2a800feb161cfad9057daa8;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index b0d2557da8..26b3985e4e 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,17 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "item.hh"
 #include "bar-line.hh"
-#include "staff-symbol-referencer.hh"
+#include "clef.hh"
 #include "context.hh"
 #include "engraver.hh"
-#include "protected-scm.hh"
-#include "clef.hh"
+#include "item.hh"
 #include "pitch.hh"
+#include "protected-scm.hh"
+#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
 
 #include "translator.icc"
 
@@ -27,9 +28,9 @@
 class Key_engraver : public Engraver
 {
   void create_key (bool);
-  void read_event (Music const *r);
+  void read_event (Stream_event const *r);
 
-  Music *key_event_;
+  Stream_event *key_event_;
   Item *item_;
   Item *cancellation_;
 public:
@@ -38,10 +39,10 @@ public:
 protected:
   virtual void initialize ();
   virtual void finalize ();
-  virtual bool try_music (Music *event);
   void stop_translation_timestep ();
   void process_music ();
 
+  DECLARE_TRANSLATOR_LISTENER (key_change);
   DECLARE_ACKNOWLEDGER (clef);
   DECLARE_ACKNOWLEDGER (bar_line);
 };
@@ -76,10 +77,6 @@ Key_engraver::create_key (bool is_default)
 	   || key == SCM_EOL)
 	  && !scm_is_eq (last, key))
 	{
-	  cancellation_ = make_item ("KeyCancellation",
-				     key_event_
-				     ? key_event_->self_scm () : SCM_EOL);
-
 	  SCM restore = SCM_EOL;
 	  SCM *tail = &restore;
 	  for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
@@ -92,9 +89,16 @@ Key_engraver::create_key (bool is_default)
 		}
 	    }
 
-	  cancellation_->set_property ("alteration-alist", restore);
-	  cancellation_->set_property ("c0-position",
-				       get_property ("middleCPosition"));
+	  if (scm_is_pair (restore))
+	    {
+	      cancellation_ = make_item ("KeyCancellation",
+					 key_event_
+					 ? key_event_->self_scm () : SCM_EOL);
+	  
+	      cancellation_->set_property ("alteration-alist", restore);
+	      cancellation_->set_property ("c0-position",
+					   get_property ("middleCPosition"));
+	    }
 	}
       item_->set_property ("alteration-alist", key);
     }
@@ -103,23 +107,18 @@ Key_engraver::create_key (bool is_default)
     {
       SCM visibility = get_property ("explicitKeySignatureVisibility");
       item_->set_property ("break-visibility", visibility);
+      if (cancellation_)
+	cancellation_->set_property ("break-visibility", visibility);
     }
 }
 
-bool
-Key_engraver::try_music (Music *event)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_engraver, key_change);
+void
+Key_engraver::listen_key_change (Stream_event *ev)
 {
-  if (event->is_mus_type ("key-change-event"))
-    {
-      /* do this only once, just to be on the safe side.  */
-      if (!key_event_)
-	{
-	  key_event_ = event;
-	  read_event (key_event_);
-	}
-      return true;
-    }
-  return false;
+  /* do this only once, just to be on the safe side.  */
+  if (ASSIGN_EVENT_ONCE (key_event_, ev))
+    read_event (key_event_);
 }
 
 void
@@ -157,7 +156,7 @@ Key_engraver::stop_translation_timestep ()
 }
 
 void
-Key_engraver::read_event (Music const *r)
+Key_engraver::read_event (Stream_event const *r)
 {
   SCM p = r->get_property ("pitch-alist");
   if (!scm_is_pair (p))
@@ -200,8 +199,18 @@ ADD_ACKNOWLEDGER (Key_engraver, bar_line);
 ADD_TRANSLATOR (Key_engraver,
 		/* doc */ "",
 		/* create */ "KeySignature",
-		/* accept */ "key-change-event",
-		/* read */ "keySignature printKeyCancellation lastKeySignature "
-		"explicitKeySignatureVisibility createKeyOnClefChange "
-		"keyAlterationOrder keySignature",
-		/* write */ "lastKeySignature tonic keySignature");
+		
+		/* read */
+		"createKeyOnClefChange "
+		"explicitKeySignatureVisibility "
+		"keyAlterationOrder "
+		"keySignature "
+		"keySignature "
+		"lastKeySignature "
+		"printKeyCancellation "
+		,
+		
+		/* write */
+		"keySignature "
+		"lastKeySignature "
+		"tonic ")