X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frest.hh;h=053e3960c0d1dcb745ceb77bdc546dd8b5768fe3;hb=1dbfe58548c0dbea3a09c94eb03113aaaaa73c75;hp=85c72666772e62cd55c3a17414ca4ed16986add1;hpb=daee8243ff1c66bc714455a2d265ab02f03546ec;p=lilypond.git

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 85c7266677..053e3960c0 100644
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -1,25 +1,43 @@
 /*
-  rest.hh -- part of LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996,97 Han-Wen Nienhuys
-*/
-
-#ifndef REST_HH
-#define REST_HH
-#include "item.hh"
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-struct Rest : Item {
+  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.
 
-    int dots;
-    int balltype;
+  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
 
-    Rest(int dur,int dots);
-    void do_print()const;
-NAME_MEMBERS(Rest);
-    Molecule* brew_molecule_p()const;
+#include "grob-interface.hh"
+
+class Grob;
+
+class Rest
+{
+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 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 
-
+#endif // REST_HH