From: fred <fred>
Date: Thu, 12 Dec 1996 10:40:10 +0000 (+0000)
Subject: lilypond-0.0.16
X-Git-Tag: release/1.5.59~6605
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5d1701f2041b7019bbaf40f7cba1ae3059fccb1f;p=lilypond.git

lilypond-0.0.16
---

diff --git a/src/key.cc b/src/key.cc
index 55c79c0e1f..0a5af6ffd7 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -1,5 +1,4 @@
 #include "key.hh"
-#include "notename.hh"
 
 const int OCTAVES=14;
 const int ZEROOCTAVE=7;
@@ -44,9 +43,9 @@ Key::read(svec<Scalar> s)
     for (int j = 0; j < 7; j++)
 	accidentals[j] = 0;
    
-    for (int i=0; i < s.sz(); i++) {
-	int large, small;
-	lookup_notename(large, small, s[i]);
+    for (int i=0; i < s.sz(); ) {
+	int large = s[i++];
+	int small = s[i++];
 	accidentals[large]=small;
 
 	newkey.add(large);
@@ -65,8 +64,8 @@ Key::oldkey_undo(svec<Scalar>s)
 	newkey[i] = 0;
 	
     for (int i=0; i < s.sz(); i++) {
-	int large, small;
-	lookup_notename(large, small, s[i]);
+	int large = s[i++];
+	int small = s[i++];
 	newkey[large] = small;
     }
     for (int i=0; i < newkey.sz(); i++)