X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar-line.hh;h=a6585084b6ed566c6c1b2211c8b007b3997d2630;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4b747f95f17726c06b0e568e494143b2f8e34f60;hpb=b1a2da9808d72008166aec4c7af9f923ca38064b;p=lilypond.git

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index 4b747f95f1..a6585084b6 100644
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,28 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2002 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.
- */
 class Bar_line
 {
 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 (brew_molecule, (SCM ));
-  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM ));
+  DECLARE_GROB_INTERFACE();
+
+  static Stencil dashed_bar_line (Grob *me, Real h, Real thick);
+  static Stencil compound_barline (Grob *, string, Real height, bool rounded);
+  static Stencil simple_barline (Grob *, Real wid, Real height, bool rounded);
+  static Interval bar_y_extent (Grob *, Grob *);
+  DECLARE_SCHEME_CALLBACK (calc_bar_extent, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_bar_size, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_anchor, (SCM));
 };
 #endif // BAR_HH