Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/custos.hh b/lily/include/custos.hh
index 1698839b769e3f88ccc3dc32b9526dfbbb078f87..c6295f6ff1fa6e41830a0d955304e7e2840d275e 100644 (file)
--- a/lily/include/custos.hh
+++ b/lily/include/custos.hh
@@ -3,23 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2004 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2009 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 #ifndef CUSTOS_HH
 #define CUSTOS_HH
 
-#include "lily-guile.hh"
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
 struct Custos
 {
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
-  static bool has_interface (Grob*);
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_GROB_INTERFACE();
 
 private:
-  static void add_streepjes (Grob* me, int pos, int interspaces, Molecule* custos_);
-  static Molecule create_ledger_line (Interval x_extent, Grob *me) ;
-
+  static void add_streepjes (Grob *me, int pos, int interspaces, Stencil *custos_);
+  static Stencil create_ledger_line (Interval x_extent, Grob *me);
 };
 
 #endif // CUSTOS_HH