X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar.hh;h=fc62f6525e750866517e0ed3c2e806111af6cd9e;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=9a7a8b92b60d9e0e8fa4d2c17416560e37f1dfc0;hpb=6dc4e4d14a67f65f337ec1a06466e748c68dcad5;p=lilypond.git

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 9a7a8b92b6..fc62f6525e 100644
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,28 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2009 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_str_;
-    int spanned_i_;
-    
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    SCORE_ELEM_CLONE(Bar);
-    Bar();
-private:
-    void do_print() const;
-protected:
-    virtual void do_pre_processing();
-    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