patch::: 1.3.48.jcn1

[lilypond.git] / lily / key-item.cc

diff --git a/lily/key-item.cc b/lily/key-item.cc
index bd12e97bee401c59444e44a9f9d69c89ce5c4b85..e6b8df7b4493e1f14fea0f5f2df3e7c5d41775f3 100644 (file)
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -23,27 +23,9 @@ const int SHARP_TOP_PITCH=4; /*  ais and bis typeset in lower octave */
 Key_item::Key_item ()
 {
   set_elt_property ("breakable", SCM_BOOL_T);
-  set_c_position (0);
+  set_elt_property ("c0-position", gh_int2scm (0));
 }
 
-int
-Key_item::get_c_position () const
-{
-  // Find the c in the range -4 through 2
-  int from_bottom_pos = c0_position_ + 4;      
-  from_bottom_pos = from_bottom_pos%7;
-  from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
-  return from_bottom_pos - 4;
-}
-
-
-void 
-Key_item::set_c_position (int c0)
-{
-  c0_position_ = c0;
-}
-
-
 void
 Key_item::add (int p, int a)
 {
@@ -64,27 +46,35 @@ Key_item::calculate_position(int p, int a) const
 {
   if (to_boolean (get_elt_property ("multi-octave")))
     {
-      return p + c0_position_;
+      return p + gh_scm2int (get_elt_property ("c0-position"));
     }
   else {
-    if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+get_c_position ()>4)) && (p+get_c_position ()>1)) 
+    // Find the c in the range -4 through 2
+    int from_bottom_pos = gh_scm2int (get_elt_property ("c0-position")) + 4;
+    from_bottom_pos = from_bottom_pos%7;
+    from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
+    int c0 = from_bottom_pos - 4;
+
+    
+    if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c0>4)) && (p+c0>1)) 
        ||
-       (a>0 && ((p>SHARP_TOP_PITCH) || (p+get_c_position ()>5)) && (p+get_c_position ()>2))) 
+       (a>0 && ((p>SHARP_TOP_PITCH) || (p+c0>5)) && (p+c0>2))) 
       {
        p -= 7; /* Typeset below c_position */
       }
     /* Provide for the four cases in which there's a glitch */
     /* it's a hack, but probably not worth */
     /* the effort of finding a nicer solution. dl. */
-    if (get_c_position ()==2 && a>0 && p==3)
+    if (c0==2 && a>0 && p==3)
       p -= 7;
-    if (get_c_position ()==-3 && a>0 && p==-1)
+    if (c0==-3 && a>0 && p==-1)
       p += 7;
-    if (get_c_position ()==-4 && a<0 && p==-1)
+    if (c0==-4 && a<0 && p==-1)
       p += 7;
-    if (get_c_position ()==-2 && a<0 && p==-3)
+    if (c0==-2 && a<0 && p==-3)
       p += 7;
-    return p + get_c_position ();
+    
+    return p + c0;
   }
 }