X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar.hh;h=85d6d016e52e5e53f78e612652ef89a80a305fb2;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=641ae51d1b7c0f75c80da529079df33eb2421d75;hpb=05fabaaf86fd44f9bd903f282bb98d343a991e40;p=lilypond.git

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 641ae51d1b..85d6d016e5 100644
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,28 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2004 Han-Wen Nienhuys
+  (c) 1996--2008 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 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 (print, (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