release: 1.1.51

[lilypond.git] / lily / include / key.hh

diff --git a/lily/include/key.hh b/lily/include/key.hh
index 3d58629d5d49dd5b9c48e11ac4f16ea2530d3e2d..140db77927ed3a39b361b3edb138569d300d0783 100644 (file)
--- a/lily/include/key.hh
+++ b/lily/include/key.hh
@@ -1,37 +1,47 @@
 /*
-  key.hh -- declare Key
+  key.hh -- declare Key, Octave_key
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef KEY_HH
 #define KEY_HH
 
-#include "varray.hh"
+#include "array.hh"
 #include "scalar.hh"
+#include "lily-proto.hh"
 
-/// administration of current key
-class Key {
-    Array<int> accidental_i_arr_;
-
-    /* *************** */
+/// administration of current key in one octave.
+class Octave_key {
 
 public:
- 
-    Key();
-    void set(int i, int acc);
-    int acc(int i)const { return accidental_i_arr_[i]; }
+  Array<int> accidental_i_arr_;
+  void clear ();
+  Octave_key();
+  void set (int i, int acc);
+  int acc (int i) const { return accidental_i_arr_[i]; }
+  void print () const;
 };
 
 /// administration of accidentals
-struct Local_key
+class Key
 {
-    void reset(Key);    
-    Key& oct(int);
-    Local_key();
-
-private:
-    Array<Key> octaves;
+  /** for each octave a key. Has to be private since octave 0 isn't member 0.
+   */
+  Array<Octave_key> octaves_;
+  int octave_to_index (int) const;
+public:
+  bool multi_octave_b_;
+  
+  void clear ();
+  Octave_key const& oct (int) const;
+  void set (int name, int acc);
+  void set (Musical_pitch);
+
+  bool different_acc (Musical_pitch) const;
+  
+  Key();
+  void print () const;  
 };
 
 #endif // KEY_HH