X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar.hh;h=ee737a1beb3c97a05ad8a624729ea5686a783f10;hb=955f7d961f7cca354a4c5d0bc6f36d157149f7e9;hp=733cd26237feb443701e62e4c9068dae7b04ad25;hpb=7c9b553acad88d5cd62461989f0f20652dc04dda;p=lilypond.git

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 733cd26237..ee737a1beb 100644
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,24 +1,28 @@
 /*
-  bar.hh -- part of LilyPond
+  bar.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2006 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
+
+#include "lily-proto.hh"
+#include "grob-interface.hh"
+
 /**
-  TODO: connections with pre and postbreak
- */
-class Bar:public Item {
+   A vertical bar.
+*/
+class Bar
+{
 public:
-    String type;
-    
-    NAME_MEMBERS(Bar);
-    Bar(String type);
-private:
-    void do_print() const;
-    Molecule*brew_molecule_p()const;
+  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