release: 1.5.29

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

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index cb62ce38833653216825e53cf00b248e9a31378f..648542b26d436e8e8ffdd02aa30a27768a2cd10a 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,28 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef REST_HH
 #define REST_HH
 
-#include "rhythmic-head.hh"
+#include "lily-guile.hh"
 
-/**
-   A pause.
-   
-   Properties
-
-   style -- string specifying glyph style
- */
-class  Rest : public Rhythmic_head
+class  Rest
 {
-protected:
-  virtual void after_line_breaking ();
-  virtual Molecule do_brew_molecule () const;
 public:
-  Rest (SCM s);
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM ));
+  static bool has_interface (Grob*);
+  static String glyph_name (Grob*, int, String); 
+  static SCM brew_internal_molecule (SCM);
+  DECLARE_SCHEME_CALLBACK (extent_callback, (SCM,SCM));
+  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
 };
 #endif // REST_HH