Run `make grand-replace'.

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index c00677cc0fdb5d25d27c54633759d3012d20668e..85d6d016e52e5e53f78e612652ef89a80a305fb2 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,31 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--2008 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_;
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEMENT_CLONE (Bar);
-  Bar ();
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
-protected:
-  virtual void do_pre_processing ();
-  Molecule* 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