Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

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

diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh
index adc2c0c0b4607913ea7c546c22e4ee4bb03f7d93..388dc01388f9a0ce60f5640861b3aba276f9d68b 100644 (file)
--- a/lily/include/stem-tremolo.hh
+++ b/lily/include/stem-tremolo.hh
@@ -27,16 +27,18 @@ class Stem_tremolo
 {
 public:
 
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
   DECLARE_SCHEME_CALLBACK (calc_slope, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_width, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_y_offset, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_calc_y_offset, (SCM, SCM, SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (width, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_style, (SCM));
   DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, 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 y_offset (Grob *, bool pure);
+  static Stencil untranslated_stencil (Grob *, Real slope);
   static Real get_beam_translation (Grob *me);
   static Real vertical_length (Grob *me);
 };