From: fred <fred>
Date: Sun, 24 Mar 2002 19:31:08 +0000 (+0000)
Subject: lilypond-0.0.30
X-Git-Tag: release/1.5.59~5426
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e90bfeb2fc68f5731a4987adce9c90579226a0e1;p=lilypond.git

lilypond-0.0.30
---

diff --git a/src/keyitem.cc b/src/keyitem.cc
index 017570d749..85bf74c620 100644
--- a/src/keyitem.cc
+++ b/src/keyitem.cc
@@ -8,7 +8,9 @@
 
 const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */
 const int SHARP_TOP_PITCH=4; /*  ais and bis typeset in lower octave */
+
 NAME_METHOD(Keyitem);
+
 Keyitem::Keyitem(int c)
 {
     c_position = c;
@@ -28,7 +30,8 @@ Keyitem::read(Array<int> s)
 void 
 Keyitem::read(const Clef& c)
 {
-    c_position=(c.c0_pos+70)%7;
+    int octaves =(abs(c.c0_position_i_) / 7) +1 ;
+    c_position=(c.c0_position_i_ + 7*octaves)%7;
 }
 
 
@@ -48,7 +51,7 @@ Molecule*
 Keyitem::brew_molecule_p()const
 {
     Molecule*output = new Molecule;
-    Real inter = paper()->interline()/2;
+    Real inter = paper()->internote();
     
     for (int i =0; i < pitch.size(); i++) {
 	Symbol s= paper()->lookup_p_->accidental(acc[i]);