X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-engraver.cc;h=804467fcf6aefc21026bac39c794289f02268b5d;hb=a066a93ee74edebb9d238a1bac93c3bc7e8e6e4a;hp=dd70ff368a1e2e912c172e0400673f72ec1658c7;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index dd70ff368a..804467fcf6 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -63,53 +63,52 @@ Key_engraver::Key_engraver ()
   cancellation_ = 0;
 }
 
-
 void
 Key_engraver::create_key (bool is_default)
 {
   if (!item_)
     {
       item_ = make_item ("KeySignature",
-			 key_event_ ? key_event_->self_scm () : SCM_EOL);
+                         key_event_ ? key_event_->self_scm () : SCM_EOL);
 
+      /* Use middleCClefPosition rather than middleCPosition, because cue
+       * notes with a different clef will modify middleCPosition. The
+       * Key signature, however, should still be printed at the original
+       * position. */
       item_->set_property ("c0-position",
-			   get_property ("middleCPosition"));
+                           get_property ("middleCClefPosition"));
 
       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)
-	  && !scm_is_eq (last, key))
-	{
-	  SCM restore = SCM_EOL;
-	  SCM *tail = &restore;
-	  for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
-	    {
-	      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_cons (scm_car (s), *tail);
-		  tail = SCM_CDRLOC (*tail);
-		}
-	    }
-
-	  if (scm_is_pair (restore))
-	    {
-	      cancellation_ = make_item ("KeyCancellation",
-					 key_event_
-					 ? key_event_->self_scm () : SCM_EOL);
-	      
-	      cancellation_->set_property ("alteration-alist", scm_reverse (restore));
-	      cancellation_->set_property ("c0-position",
-					   get_property ("middleCPosition"));
-	    }
-	}
+           || key == SCM_EOL)
+          && !scm_is_eq (last, key))
+        {
+          SCM restore = SCM_EOL;
+          for (SCM s = last; scm_is_pair (s); s = scm_cdr (s))
+            {
+              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
+                  || ((ly_scm2rational (scm_cdr (new_alter_pair)) - old_alter) * old_alter
+                      < Rational (0)))
+                {
+                  restore = scm_cons (scm_car (s), restore);
+                }
+            }
+
+          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", scm_reverse (key));
     }
@@ -177,31 +176,31 @@ Key_engraver::read_event (Stream_event const *r)
        scm_is_pair (s) && scm_is_pair (alist); s = scm_cdr (s))
     {
       SCM head = scm_member (scm_car (s), alist);
-      
+
       if (scm_is_pair (head))
-	{
-	  accs = scm_cons (scm_car (head), accs);
-	  alist = scm_delete_x (scm_car (head), alist);
-	}
+        {
+          accs = scm_cons (scm_car (head), accs);
+          alist = scm_delete_x (scm_car (head), alist);
+        }
     }
 
   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 (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");      
+        r->origin ()->warning ("Incomplete keyAlterationOrder for key signature");
     }
-  
+
   context ()->set_property ("keySignature", scm_reverse (accs));
   context ()->set_property ("tonic",
-			    r->get_property ("tonic"));
+                            r->get_property ("tonic"));
 }
 
 void
@@ -218,24 +217,25 @@ ADD_ACKNOWLEDGER (Key_engraver, clef);
 ADD_ACKNOWLEDGER (Key_engraver, bar_line);
 
 ADD_TRANSLATOR (Key_engraver,
-		/* doc */
-		"Engrave a key signature.",
-
-		/* create */
-		"KeyCancellation "
-		"KeySignature ",
-		
-		/* read */
-		"createKeyOnClefChange "
-		"explicitKeySignatureVisibility "
-		"extraNatural "
-		"keyAlterationOrder "
-		"keySignature "
-		"lastKeySignature "
-		"printKeyCancellation ",
-		
-		/* write */
-		"keySignature "
-		"lastKeySignature "
-		"tonic "
-		);
+                /* doc */
+                "Engrave a key signature.",
+
+                /* create */
+                "KeyCancellation "
+                "KeySignature ",
+
+                /* read */
+                "createKeyOnClefChange "
+                "explicitKeySignatureVisibility "
+                "extraNatural "
+                "keyAlterationOrder "
+                "keySignature "
+                "lastKeySignature "
+                "printKeyCancellation "
+                "middleCClefPosition ",
+
+                /* write */
+                "keySignature "
+                "lastKeySignature "
+                "tonic "
+               );