X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=644aa1450c7bf904d203f444424d82f3eef7b24f;hb=220f62ed61861265a5b734052806de2d1c656335;hp=462e68922d1d4d631a326aa780e91bf5d3fe2024;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 462e68922d..644aa1450c 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -1,24 +1,43 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.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
 #define REST_HH
 
-#include "lily-guile.hh"
+#include "grob-interface.hh"
+
+class Grob;
 
-class  Rest
+class Rest
 {
 public:
-  DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM ));
-  static bool has_interface (Grob*);
-  static SCM brew_internal_molecule (SCM);
-  DECLARE_SCHEME_CALLBACK(extent_callback, (SCM,SCM));
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_cross_staff, (SCM));
+  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 (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
+  DECLARE_SCHEME_CALLBACK (pure_height, (SCM, SCM, SCM));
 };
 #endif // REST_HH