Run `make grand-replace'.

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 3727358d96f3c2659e537a467dcfba1a65f0c23f..85d6d016e52e5e53f78e612652ef89a80a305fb2 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,20 +1,28 @@
 /*
-  bar.hh -- part of LilyPond
+  bar.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2008 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
 
-struct Bar: Item {
-    String type;
-    
-    Bar(String type);
-NAME_MEMBERS(Bar);
-    void do_print() const;
-    Molecule*brew_molecule_p()const;
+#include "lily-proto.hh"
+#include "grob-interface.hh"
+
+/**
+   A vertical bar.
+*/
+class Bar
+{
+public:
+  DECLARE_GROB_INTERFACE();
+
+  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));
 };
 #endif // BAR_HH