X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=1d2c8f9aae7e779a8366d4d88e6884f6f9df1772;hb=43516525d4320a6d1af0c659c8e9036f6283faf7;hp=86147896843ee851a365049624fc350783e02933;hpb=01d84d552854fb399bd0e819502c6c2db2a1b214;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 8614789684..1d2c8f9aae 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--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--1999 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 "rhythmic-head.hh"
+#include "grob-interface.hh"
 
-class  Rest : public Rhythmic_head
+class Grob;
+
+class Rest
 {
 public:
-
-protected:
-  virtual void do_add_processing ();
-  virtual void do_post_processing ();
-  virtual Molecule * do_brew_molecule_p () const;
+  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 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