Merge with master

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

diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh
index 1c7e12dd843d8bf1f4442791eb6eed7c7d121796..0891b7da2b343037412b8f642ddb02a8c152deab 100644 (file)
--- a/lily/include/note-head.hh
+++ b/lily/include/note-head.hh
@@ -1,13 +1,14 @@
 /*
   note-head.hh -- part of GNU LilyPond
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
 #ifndef NOTEHEAD_HH
 #define NOTEHEAD_HH
 
 #include "stencil.hh"
+#include "grob-interface.hh"
 
 /** ball at the end of the stem. Also takes care of ledger lines.
 
@@ -21,10 +22,13 @@ class Note_head
 public:
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (brew_ez_stencil, (SCM));
-  DECLARE_SCHEME_CALLBACK (extent, (SCM, SCM));
-  static bool has_interface (Grob *);
+  DECLARE_SCHEME_CALLBACK (stem_x_shift, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_stem_attachment, (SCM));
+  DECLARE_GROB_INTERFACE();
   static Real stem_attachment_coordinate (Grob *, Axis a);
   static int get_balltype (Grob *);
+
+  static Offset get_stem_attachment (Font_metric *, string);
 };
 #endif // NOTEHEAD_HH