release: 1.1.37

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

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index b980e3ff0fce06473f685434c1c0bc63f36c9608..82f72cb871c8d5795c4b7c98798b5599265e42c2 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -1,34 +1,41 @@
 /*
   key-item.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef KEYITEM_HH
 #define KEYITEM_HH
 
 #include "item.hh"
-#include "varray.hh"
-
+#include "array.hh"
+#include "staff-symbol-referencer.hh"
 
 /// An item which places accidentals at the start of the line
-struct Key_item : Item {
-    Array<int> pitch;
-    Array<int> acc;
-    int c_position;
-    bool default_b_;
+class Key_item :public  Item, public Staff_symbol_referencer {
+  Array<int> pitch_arr_;
+  Array<int> acc_arr_;
+  Array<int> old_pitch_arr_;
+  Array<int> old_acc_arr_;
+  int c0_position_;
+
 
+public:
+  bool multi_octave_b_;  
+
+  int get_c_position () const;
     
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    SCORE_ELEM_CLONE(Key_item);
+  
+  VIRTUAL_COPY_CONS(Score_element);
+
+  Key_item ();
+  void add (int pitch, int acc);
+  void add_old (int pitch, int acc);
+  void set_c_position (int);
+  int calculate_position(int p, int a) const;
 
-    Key_item(int cposition);
-    void add(int pitch, int acc);
-    void read(const Key_engraver&);
-    void set_c_position(int);
 protected:
-    virtual void do_pre_processing();
-    Molecule* brew_molecule_p()const;
+  virtual Molecule* do_brew_molecule_p() const;
 };
 
 #endif // KEYITEM_HH