X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fbar-line.hh;h=51e6f9c005c6ca5a5256e1308d9fc346af61bfae;hb=e92bccb2eb19c59dcaa33be925203ddee5e78091;hp=fc613da48b1584a3a0a51ee9edd73652ef8e453e;hpb=87d48c0b8a5c75a1476bbb88ca853de838f3c7ac;p=lilypond.git

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index fc613da48b..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--2005 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 *);
+  DECLARE_GROB_INTERFACE();
 
-  static Stencil compound_barline (Grob *, String, Real height, bool rounded);
+  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);
-  DECLARE_SCHEME_CALLBACK (get_staff_bar_size, (SCM));
+  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 (before_line_breaking, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_anchor, (SCM));
 };
 #endif // BAR_HH