X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=d8ddde60f36337aac0de6bc244b7a8e6181a7762;hb=7ec5ca8b1f63d416a357be079355b6d2824a5758;hp=ba1ab3e90a98e4b1eb5857e771266c31e502efcf;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git diff --git a/lily/include/rest.hh b/lily/include/rest.hh index ba1ab3e90a..d8ddde60f3 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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);