* lily/spacing-spanner.cc (calc_common_shortest_duration): use

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

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index db36065f0ce919bbaca019f445d17540b321f2de..357b76bcb22c84a6903a323790d16d9417b29c77 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,31 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef REST_HH
 #define REST_HH
 
-#include "rhythmic-head.hh"
+#include "lily-guile.hh"
 
-/**
-   A pause.
-   
-   Properties
+class Grob;
 
-   style -- string specifying glyph style
- */
-class  Rest : public Rhythmic_head
+class Rest
 {
 public:
-  SCM member_after_line_breaking ();
-  static SCM after_line_breaking (SCM);
-  SCM member_brew_molecule () const;
-
-   static SCM brew_molecule (SCM);
-  
-Rest (SCM s);
+  DECLARE_SCHEME_CALLBACK (y_offset_callback, (SCM));
+  static bool has_interface (Grob *);
+  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 // REST_HH