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 2e85d6dc56e9e64980ca576a88c60ff4b6e714e7..e4007af3162be6623a3dde0e7a48f237f8e5b331 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -9,6 +9,23 @@
 #include "item.hh"
 #include "array.hh"
 #include "musical-pitch.hh"
+#include "staff-symbol-referencer.hh"
+#include "note-head-side.hh"
+
+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_);
+    }
+};
 
 /**
   Accidentals which can be different for each octave.
@@ -21,19 +38,17 @@
   figure out private/public
   
  */
-class Local_key_item : public Item {
+class Local_key_item : public Note_head_side, public Staff_symbol_referencer {
+  Array<Local_key_cautionary_tuple> accidental_arr_;
+
 public:
-    
-    Array<Musical_pitch> accidental_pitch_arr_;
-    Link_array<Item> support_items_;
-    int c0_position_i_;
-    Local_key_item ();
-    void add_support (Item*);
-    void add (Musical_pitch);
+  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;
+  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