patch::: 1.5.1.jcn2

[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 25a1a2d3dd4cc54a6f35511037df64348acc62fc..e1372cf175cf97c2c8e9df4dcc635bebcdbb7010 100644 (file)
--- a/lily/include/local-key-item.hh
+++ b/lily/include/local-key-item.hh
@@ -1,57 +1,27 @@
 /*
   local-key-item.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2001 Han-Wen Nienhuys
 */
 
 #ifndef LOCALKEYITEM_HH
 #define LOCALKEYITEM_HH
-#include "item.hh"
-#include "array.hh"
-#include "musical-pitch.hh"
-
-#include "note-head-side.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
-
-  Make an item for each accidental separately, and make a
-  Accidental_column to group them.
-  
- */
+#include "array.hh"
+#include "pitch.hh"
 
-class Local_key_item : public Note_head_side
+class Local_key_item
 {
-  Array<Local_key_cautionary_tuple> accidental_arr_;
-
-  Molecule accidental (int,bool,bool) const;
+  static Molecule parenthesize (Grob*me, Molecule) ;
 public:
-  int c0_position_i_;
-  Local_key_item ();
-  void add_pitch (Musical_pitch, bool cautionary, bool natural);
-protected:
-  virtual void do_pre_processing();
-  virtual Molecule* do_brew_molecule_p() const;
+  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*);  
 };
+
+
 #endif // LOCALKEYITEM_HH