X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar-line.hh;h=51e6f9c005c6ca5a5256e1308d9fc346af61bfae;hb=789d65a45b89c1fe7ec8ee4e80cca8a687274ea7;hp=945109c4d95503f81cf2fc93b41a7e8e376fde8b;hpb=402045837e7134cdf90d1fcf31768c62227a4936;p=lilypond.git

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index 945109c4d9..51e6f9c005 100644
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,28 +1,29 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2004 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.
- */
 class Bar_line
 {
 public:
-  static bool has_interface (Grob*);
-  
-  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 ));
+  DECLARE_GROB_INTERFACE();
+
+  static Stencil dashed_bar_line (Grob *me, Real h, Real thick);
+  static Stencil tick_bar_line (Grob *me, Real h, bool rounded);
+  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