Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / include / stem-tremolo.hh

diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh
index 5099ea7914e355066629f26bd5726ac259a4b1e1..9782c753f2803253d4ffdc5c754a431a3a50da06 100644 (file)
--- a/lily/include/stem-tremolo.hh
+++ b/lily/include/stem-tremolo.hh
@@ -3,24 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef ABBREV_HH
 #define ABBREV_HH
 
 #include "lily-proto.hh"
-#include "lily-guile.hh"
+#include "grob-interface.hh"
 
 class Stem_tremolo
 {
 public:
 
-  static bool has_interface (Grob *);
-  DECLARE_SCHEME_CALLBACK (dim_callback, (SCM smob));
+  DECLARE_GROB_INTERFACE();
+  DECLARE_SCHEME_CALLBACK (calc_slope, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_width, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));
-  static Stencil raw_stencil (Grob *);
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_style, (SCM));
+  static Stencil raw_stencil (Grob *, Real slope, Direction stemdir);
+  static Stencil translated_stencil (Grob*, Real slope);
+  static Stencil untranslated_stencil (Grob*, Real slope);
+  static Real get_beam_translation (Grob *me);
+  static Real vertical_length (Grob *me);
 };
 
 #endif /* ABBREV_HH */