Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / rest.hh

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 85c72666772e62cd55c3a17414ca4ed16986add1..20107120b7c411bef2f4fa8bbbb4441cf04140db 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -1,25 +1,29 @@
 /*
-  rest.hh -- part of LilyPond
+  rest.hh -- declare Rest
 
-  (c) 1996,97 Han-Wen Nienhuys
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef REST_HH
 #define REST_HH
-#include "item.hh"
-
-struct Rest : Item {
-
-    int dots;
-    int balltype;
 
-    /* *************** */
-
-
-    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_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 (polyphonic_offset_callback, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (width, (SCM));
+  DECLARE_SCHEME_CALLBACK (height, (SCM));
 };
-#endif 
-
+#endif // REST_HH