* configure.in: Test for and accept lmodern if EC fonts not found.

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

diff --git a/lily/include/rest.hh b/lily/include/rest.hh
index 462e68922d1d4d631a326aa780e91bf5d3fe2024..e71d12657df9485425097904833b459786bbc366 100644 (file)
--- a/lily/include/rest.hh
+++ b/lily/include/rest.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -12,13 +12,17 @@
 
 #include "lily-guile.hh"
 
+class Grob;
+
 class  Rest
 {
 public:
-  DECLARE_SCHEME_CALLBACK(after_line_breaking, (SCM ));
+  DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM ));
   static bool has_interface (Grob*);
-  static SCM brew_internal_molecule (SCM);
-  DECLARE_SCHEME_CALLBACK(extent_callback, (SCM,SCM));
-  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
+  static String glyph_name (Grob*, int, String, bool); 
+  static SCM brew_internal_stencil (SCM, bool);
+  DECLARE_SCHEME_CALLBACK (extent_callback, (SCM,SCM));
+  DECLARE_SCHEME_CALLBACK (polyphonic_offset_callback, (SCM,SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM ));
 };
 #endif // REST_HH