Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index ea23bd07bccfdf5bbc74f537c699f901113e4d3b..fc62f6525e750866517e0ed3c2e806111af6cd9e 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,24 +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;
-    
-    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