2003 -> 2004

[lilypond.git] / lily / include / note-head.hh

diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh
index 1cc0bad9b891ffe129e7fd75d68cec4e745d53c0..aa55ca4967557c94c6b5cbd5cf53e4d444e238bb 100644 (file)
--- a/lily/include/note-head.hh
+++ b/lily/include/note-head.hh
@@ -1,43 +1,34 @@
 /*
   note-head.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef NOTEHEAD_HH
 #define NOTEHEAD_HH
 
-#include "rhythmic-head.hh"
+#include "lily-guile.hh"
+#include "molecule.hh"
 
-/** ball at the end of the stem. Takes care of:
+/** ball at the end of the stem. Also takes care of ledger lines.
 
-  * help lines  
+    NoteHead is a kind of RhythmicHead, see there.
 
-  */
+  Read-only:
+*/
 
-class Note_head : public Rhythmic_head {
+class Note_head 
+{
 public:
-  
-  /// position of top line (5 linestaff: 8)
-  int position_i_;
-
-  /// pitch in steps
-  int steps_i_;
-    
-  /// -1 = lowest, 0 = inside, 1 = top
-  int extremal_i_;
-    
-  /// needed for the help-lines
-  int staff_size_i_;
-  Direction x_dir_;
-    
-  Note_head ();
-  static int compare (Note_head * const &a, Note_head *const &b) ;
-
-protected:
-  virtual Interval do_width () const;
-  virtual void do_pre_processing();
-  virtual Molecule* do_brew_molecule_p() const;
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
+  static Interval head_extent (Grob*, Axis);
+  static Molecule brew_ledger_lines (Grob *me, int pos, int interspaces,
+                                    Interval x_extent, Real, bool);
+  DECLARE_SCHEME_CALLBACK (brew_ez_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (extent, (SCM,SCM));
+  static bool has_interface (Grob*);
+  static Real stem_attachment_coordinate (Grob *, Axis a);
+  static int get_balltype (Grob*) ;  
 };
 #endif // NOTEHEAD_HH