Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 21ee05890c46ef9e8e052204d4b74b130513f9fc..b7ebca69a50b5583c51179d6db7fa1cbba45a060 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,24 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2006 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
+
+#include "lily-guile.hh"
+#include "lily-proto.hh"
 
 /**
-  A vertical bar.
- */
-class Bar:public Item {
+   A vertical bar.
+*/
+class Bar
+{
 public:
-  VIRTUAL_COPY_CONS(Score_element);
-  Bar();
-protected:
-  virtual void do_pre_processing ();
-  virtual Molecule* do_brew_molecule_p () const;
-  virtual Real get_bar_size () const;
+  static bool has_interface (Grob *);
+
+  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