X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=900b3aefbca15638aad12da1f18286da3b548619;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=20107120b7c411bef2f4fa8bbbb4441cf04140db;hpb=d8082113a0df616e7beabc0417c3590a3fac7320;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 20107120b7..900b3aefbc 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -1,9 +1,20 @@
 /*
-  rest.hh -- declare Rest
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef REST_HH
@@ -17,13 +28,18 @@ class Rest
 {
 public:
   DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
-  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);
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  DECLARE_GROB_INTERFACE ();
+  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);
   DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM));
   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