Merge with master

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

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index fdd7c17e0db7bc484308647b5ba0db6c3e5aa6fa..d1b2625ae680df35e9cefe1291b7d82908aed0a2 100644 (file)
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,24 +1,22 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2005 Han-Wen Nienhuys
+  (c) 1996--2007 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 compound_barline (Grob *, string, Real height, bool rounded);
   static Stencil simple_barline (Grob *, Real wid, Real height, bool rounded);
   DECLARE_SCHEME_CALLBACK (calc_bar_size, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));