X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar.hh;h=fc62f6525e750866517e0ed3c2e806111af6cd9e;hb=36b9825a04fd050c1de107b5d68db3c13916fe33;hp=b83bc935e3b7e4317d6868d516c7b4b08a1d01fb;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index b83bc935e3..fc62f6525e 100644
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,28 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2001 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
 
-#include "lily-guile.hh"
 #include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
-  A vertical bar.
- */
+   A vertical bar.
+*/
 class Bar
 {
 public:
-  static bool has_interface (Grob*);
-  static void set_interface (Grob*);
-  static Molecule compound_barline (Grob*, String, Real height) ;
-  static Molecule simple_barline (Grob*, Real wid, Real height) ;      
-  DECLARE_SCHEME_CALLBACK (get_staff_bar_size, (SCM ));
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM ));
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
+  DECLARE_GROB_INTERFACE();
+
+  static Stencil compound_barline (Grob *, string, Real height);
+  static Stencil simple_barline (Grob *, Real wid, Real height);
+  DECLARE_SCHEME_CALLBACK (get_staff_bar_size, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
 };
 #endif // BAR_HH