''

[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 edba5ec7ca2c37ae79e7e5f67b72352ac7239173..8a2dd3199c1c982ddbd016c68fbc6bfc77b954f6 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -1,54 +1,27 @@
 /*
   local-key-item.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2002 Han-Wen Nienhuys
 */
 
 #ifndef LOCALKEYITEM_HH
 #define LOCALKEYITEM_HH
-#include "item.hh"
+
+
 #include "array.hh"
-#include "musical-pitch.hh"
-#include "staff-symbol-referencer.hh"
+#include "pitch.hh"
 
-struct Local_key_cautionary_tuple
+class Local_key_item
 {
-  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_);
-    }
+  static Molecule parenthesize (Grob*me, Molecule) ;
+public:
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+  static void add_pitch (Grob*me, Pitch, bool cautionary, bool natural, Grob *tie_break_cautionary);
+  static bool has_interface (Grob*);
+  static void set_interface (Grob*);  
 };
 
-/**
-  Accidentals which can be different for each octave.
 
-  TODO:
-  update item if Items are removed
-
-  TODO
-  
-  figure out private/public
-  
- */
-class Local_key_item : public Item, public Staff_symbol_referencer {
-  Array<Local_key_cautionary_tuple> accidental_arr_;
-  Link_array<Item> support_items_;
-public:
-  int c0_position_i_;
-  Local_key_item ();
-  void add_support (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