X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=7997d11c33adb98e655d189691f211afd9714d0d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=89608562c600c7d175c5e8e45f990548dc1c5b91;hpb=f8f86f7e61fbea1b289f98f26e6253532dc4a356;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 89608562c6..7997d11c33 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,33 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 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"
 
-/*
-  TODO: The representation  of key sigs is all fucked.
-*/
-
-/**
-   Make the key signature.
-*/
 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 +32,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);
 };
@@ -58,6 +52,7 @@ Key_engraver::Key_engraver ()
   cancellation_ = 0;
 }
 
+
 void
 Key_engraver::create_key (bool is_default)
 {
@@ -71,6 +66,7 @@ Key_engraver::create_key (bool is_default)
 
       SCM last = get_property ("lastKeySignature");
       SCM key = get_property ("keySignature");
+      bool extranatural = to_boolean (get_property ("extraNatural"));
 
       if ((to_boolean (get_property ("printKeyCancellation"))
 	   || key == SCM_EOL)
@@ -80,10 +76,13 @@ Key_engraver::create_key (bool is_default)
 	  SCM *tail = &restore;
 	  for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
 	    {
-	      if (scm_assoc (scm_caar (s), key) == SCM_BOOL_F)
+	      SCM new_alter_pair = scm_assoc (scm_caar (s), key);
+	      Rational old_alter = robust_scm2rational (scm_cdar (s), 0);
+	      if (new_alter_pair == SCM_BOOL_F
+		  || extranatural
+		  && (ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter)*old_alter < Rational (0))
 		{
-		  *tail = scm_acons (scm_caar (s),
-				     scm_from_int (0), *tail);
+		  *tail = scm_cons (scm_car (s), *tail);
 		  tail = SCM_CDRLOC (*tail);
 		}
 	    }
@@ -93,12 +92,13 @@ Key_engraver::create_key (bool is_default)
 	      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);
     }
 
@@ -109,20 +109,13 @@ Key_engraver::create_key (bool is_default)
     }
 }
 
-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
@@ -160,28 +153,42 @@ 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))
     return;
 
-  SCM n = scm_list_copy (p);
   SCM accs = SCM_EOL;
-  for (SCM s = get_property ("keyAlterationOrder");
-       scm_is_pair (s); s = scm_cdr (s))
+
+  SCM alist = scm_list_copy (p);
+  SCM order = get_property ("keyAlterationOrder");
+  for (SCM s = order;
+       scm_is_pair (s) && scm_is_pair (alist); s = scm_cdr (s))
     {
-      if (scm_is_pair (scm_member (scm_car (s), n)))
+      SCM head = scm_member (scm_car (s), alist);
+      
+      if (scm_is_pair (head))
 	{
-	  accs = scm_cons (scm_car (s), accs);
-	  n = scm_delete_x (scm_car (s), n);
+	  accs = scm_cons (scm_car (head), accs);
+	  alist = scm_delete_x (scm_car (head), alist);
 	}
     }
 
-  for (SCM s = n; scm_is_pair (s); s = scm_cdr (s))
-    if (scm_to_int (scm_cdar (s)))
-      accs = scm_cons (scm_car (s), accs);
-
+  if (scm_is_pair (alist))
+    {
+      bool warn = false;
+      for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
+	if (ly_scm2rational (scm_cdar (s)))
+	  {
+	    warn = true;
+	    accs = scm_cons (scm_car (s), accs);
+	  }
+
+      if (warn)
+	r->origin ()->warning ("No ordering for key signature alterations");      
+    }
+  
   context ()->set_property ("keySignature", accs);
   context ()->set_property ("tonic",
 			    r->get_property ("tonic"));
@@ -201,10 +208,23 @@ ADD_ACKNOWLEDGER (Key_engraver, clef);
 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");
+		/* doc */
+		"Engrave a key signature.",
+
+		/* create */
+		"KeySignature ",
+		
+		/* read */
+		"createKeyOnClefChange "
+		"explicitKeySignatureVisibility "
+		"extraNatural "
+		"keyAlterationOrder "
+		"keySignature "
+		"lastKeySignature "
+		"printKeyCancellation ",
+		
+		/* write */
+		"keySignature "
+		"lastKeySignature "
+		"tonic "
+		);