release: 1.3.86

[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 01eba650076951905370ba8f72e436415f078b09..e1f45bd305cf56f67e64bc6db31e1d01a9eb82a7 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -8,49 +8,19 @@
 #define LOCALKEYITEM_HH
 
 
-#include "item.hh"
 #include "array.hh"
 #include "musical-pitch.hh"
 
-
-
-struct Local_key_cautionary_tuple
-{
-  Musical_pitch pitch_;
-  bool cautionary_b_;
-  bool natural_b_;
-
-  Local_key_cautionary_tuple ()
-  {
-    cautionary_b_ = false;
-    natural_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.
-
-  TODO: schemify me!
- */
-class Local_key_item : public Item
+class Local_key_item
 {
-  Array<Local_key_cautionary_tuple> accidental_arr_;
-
-  Molecule accidental (int,bool,bool) const;
+  static Molecule parenthesize (Score_element*me, Molecule) ;
 public:
-  Local_key_item (SCM );
-   static SCM brew_molecule (SCM);
-  
-  void add_pitch (Musical_pitch, bool cautionary, bool natural);
-
-  SCM member_before_line_breaking ();
-  static SCM before_line_breaking (SCM);
-  SCM member_brew_molecule() const;
+  static SCM brew_molecule (SCM);
+  static void add_pitch (Score_element*me, Musical_pitch, bool cautionary, bool natural);
+  static bool has_interface (Score_element*);
+  static void set_interface (Score_element*);  
 };
 
+
 #endif // LOCALKEYITEM_HH