release: 1.1.51

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

diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh
index a80e44196e602fcecf3316554a1cfde471f0c611..e4007af3162be6623a3dde0e7a48f237f8e5b331 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -1,19 +1,30 @@
 /*
   local-key-item.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef LOCALKEYITEM_HH
 #define LOCALKEYITEM_HH
 #include "item.hh"
-#include "varray.hh"
+#include "array.hh"
+#include "musical-pitch.hh"
+#include "staff-symbol-referencer.hh"
+#include "note-head-side.hh"
 
-struct Local_acc {
-    int name_i_;
-    int accidental_i_;
-    int octave_i_;
-    static int compare(Local_acc&, Local_acc&);
+struct Local_key_cautionary_tuple
+{
+  Musical_pitch pitch_;
+  bool cautionary_b_;
+
+  Local_key_cautionary_tuple ()
+    {
+      cautionary_b_ = false;
+    }
+  static int compare (Local_key_cautionary_tuple const&s1, Local_key_cautionary_tuple const&s2)
+    {
+      return Musical_pitch::compare (s1.pitch_, s2.pitch_);
+    }
 };
 
 /**
@@ -21,23 +32,23 @@ struct Local_acc {
 
   TODO:
   update item if Items are removed
+
+  TODO
+  
+  figure out private/public
+  
  */
-struct Local_key_item : Item {
-    NAME_MEMBERS();
-    Array<Local_acc> accs;
-    Link_array<Item> support_items_;
-    int c0_position;
-
-    /* *************** */
-    
-    Local_key_item(int c0position);
-    void add_support(Item*);
-    void add(int oct, int pitch, int acc);
-    void add(Melodic_req*);
+class Local_key_item : public Note_head_side, public Staff_symbol_referencer {
+  Array<Local_key_cautionary_tuple> accidental_arr_;
+
 public:
-    virtual void do_pre_processing();    
-    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
-    virtual Molecule* brew_molecule_p()const;
+  int c0_position_i_;
+  Local_key_item ();
+  void add_pitch (Musical_pitch, bool cautionary);
+protected:
+  virtual void do_pre_processing();
+  virtual void do_substitute_element_pointer (Score_element*,Score_element*);
+  virtual Molecule* do_brew_molecule_p() const;
 };
 #endif // LOCALKEYITEM_HH