release: 1.3.98

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

diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh
index 0833aca9612cc90e0b9fc11f9e7cc341bb612fa9..0f2c4d14df36c0cb3a881179b95a809a9b93f25e 100644 (file)
--- a/lily/include/key-item.hh
+++ b/lily/include/key-item.hh
@@ -1,44 +1,22 @@
 /*
   key-item.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef KEYITEM_HH
 #define KEYITEM_HH
 
-#include "item.hh"
-#include "array.hh"
-#include "staff-symbol-referencer.hh"
+#include "lily-guile.hh"
+#include "lily-proto.hh"
 
-/// An item which places accidentals at the start of the line
-class Key_item :public  Item, public Staff_symbol_referencer {
-public:
-  
-  Array<int> pitch_arr_;
-  Array<int> acc_arr_;
-  Array<int> old_pitch_arr_;
-  Array<int> old_acc_arr_;
 
-  // ugh.  Naming 
-  int c_position;
-  // see above.
-  int c0_position;
-  bool default_b_;
-  bool multi_octave_b_;
-    
-  
-  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;
-
-protected:
-  virtual void do_pre_processing();
-  virtual Molecule* do_brew_molecule_p() const;
+struct Key_item
+{
+  static int calculate_position(Score_element*,SCM pair) ;
+  static void set_interface (Score_element*);
+  static bool has_interface (Score_element*);
+  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
 };
 
 #endif // KEYITEM_HH