Run `make grand-replace'.

[lilypond.git] / lily / include / bar-line.hh

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index 39253a7b8d39c020063ddd3c3af2f768b4a64dab..a6585084b6ed566c6c1b2211c8b007b3997d2630 100644 (file)
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,28 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2006 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 *);
+  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