Imported Upstream version 2.18.0

[lilypond.git] / lily / include / rest.hh

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 208da0499ae195377b055afda7f154756ef471c7..d5dbae9e25791f385858ded77d6a146558ae98cc 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -30,7 +30,9 @@ public:
   DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
   DECLARE_GROB_INTERFACE ();
-  static string glyph_name (Grob *, int, string, bool);
+  static string glyph_name (Grob *, int durlog, const string &style, bool, Real);
+  static Real staff_position_internal (Grob *, int /* duration_log */,
+                                       int /* dir */);
   static SCM brew_internal_stencil (Grob *, bool);
   static SCM generic_extent_callback (Grob *, Axis);
   static void translate (Grob *me, int dy);