X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=ed67c6310704bf855a68a0ac9d0a2aa26c02b7c9;hb=d8456f50ea795e28a0bcc32015c623514f737b09;hp=357b76bcb22c84a6903a323790d16d9417b29c77;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 357b76bcb2..ed67c63107 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -3,13 +3,13 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #ifndef REST_HH #define REST_HH -#include "lily-guile.hh" +#include "grob-interface.hh" class Grob; @@ -17,7 +17,7 @@ class Rest { public: DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM)); - static bool has_interface (Grob *); + DECLARE_GROB_INTERFACE(); static string glyph_name (Grob *, int, string, bool); static SCM brew_internal_stencil (Grob*, bool); static SCM generic_extent_callback (Grob*, Axis); @@ -25,5 +25,6 @@ public: DECLARE_SCHEME_CALLBACK (print, (SCM)); DECLARE_SCHEME_CALLBACK (width, (SCM)); DECLARE_SCHEME_CALLBACK (height, (SCM)); + DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM)); }; #endif // REST_HH