X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar.hh;h=72b2f1957fb65eecf677434f5e27fdfd98b273f1;hb=61140f6153dce4ba6e3dca3a88a33c435c6bc26b;hp=7579c1dbdfbb5a5c9f47e5528eb9b7754ae1817e;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 7579c1dbdf..72b2f1957f 100644
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,32 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2007 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
-/**
-  A vertical bar.
-  
-  TODO: connections with pre and postbreak
- */
-class Bar:public Item {
-public:
-  String type_str_;
-  bool at_line_start_b_;
 
-  
-  VIRTUAL_COPY_CONS(Score_element);
-  Bar ();
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
-protected:
-  virtual void do_pre_processing ();
-  virtual Molecule* do_brew_molecule_p () const;
+/**
+   A vertical bar.
+*/
+class Bar
+{
+public:
+  DECLARE_GROB_INTERFACE();
 
-private:
-  void do_print () const;
+  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