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

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index b317764fec..7997d11c33 100644
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "bar-line.hh"
@@ -53,23 +53,6 @@ Key_engraver::Key_engraver ()
 }
 
 
-SCM
-make_qt_key (SCM rat_key)
-{
-  SCM qt_key = SCM_EOL;
-  SCM *tail = &qt_key;
-      
-  for (SCM s = rat_key; scm_is_pair (s); s = scm_cdr (s))
-    {
-      *tail = scm_cons (scm_cons (scm_caar (s),
-				  scm_from_int (Rational (4)* ly_scm2rational (scm_cdar (s)))),
-			SCM_EOL);
-      tail =  SCM_CDRLOC (*tail);
-    }
-
-  return qt_key;
-}
-
 void
 Key_engraver::create_key (bool is_default)
 {
@@ -83,7 +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"));
+      bool extranatural = to_boolean (get_property ("extraNatural"));
 
       if ((to_boolean (get_property ("printKeyCancellation"))
 	   || key == SCM_EOL)
@@ -94,7 +77,7 @@ Key_engraver::create_key (bool is_default)
 	  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 = ly_scm2rational (scm_cdar (s));
+	      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))
@@ -110,22 +93,19 @@ Key_engraver::create_key (bool is_default)
 					 key_event_
 					 ? key_event_->self_scm () : SCM_EOL);
 	      
-	      cancellation_->set_property ("alteration-alist", make_qt_key (restore));
+	      cancellation_->set_property ("alteration-alist", restore);
 	      cancellation_->set_property ("c0-position",
 					   get_property ("middleCPosition"));
 	    }
 	}
 
-
-      item_->set_property ("alteration-alist", make_qt_key (key));
+      item_->set_property ("alteration-alist", key);
     }
 
   if (!is_default)
     {
       SCM visibility = get_property ("explicitKeySignatureVisibility");
       item_->set_property ("break-visibility", visibility);
-      if (cancellation_)
-	cancellation_->set_property ("break-visibility", visibility);
     }
 }
 
@@ -197,10 +177,16 @@ Key_engraver::read_event (Stream_event const *r)
 
   if (scm_is_pair (alist))
     {
-      r->origin ()->warning ("No ordering for key signature alterations");
+      bool warn = false;
       for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
 	if (ly_scm2rational (scm_cdar (s)))
-	  accs = scm_cons (scm_car (s), accs);
+	  {
+	    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);
@@ -222,8 +208,11 @@ ADD_ACKNOWLEDGER (Key_engraver, clef);
 ADD_ACKNOWLEDGER (Key_engraver, bar_line);
 
 ADD_TRANSLATOR (Key_engraver,
-		/* doc */ "",
-		/* create */ "KeySignature",
+		/* doc */
+		"Engrave a key signature.",
+
+		/* create */
+		"KeySignature ",
 		
 		/* read */
 		"createKeyOnClefChange "
@@ -231,12 +220,11 @@ ADD_TRANSLATOR (Key_engraver,
 		"extraNatural "
 		"keyAlterationOrder "
 		"keySignature "
-		"keySignature "
 		"lastKeySignature "
-		"printKeyCancellation "
-		,
+		"printKeyCancellation ",
 		
 		/* write */
 		"keySignature "
 		"lastKeySignature "
-		"tonic ")
+		"tonic "
+		);