* The grand 2005-2006 replace.

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 1e6bf095f8e6cd9dbcb0f0a439475094fe2352a4..0977b15af760308a2e4f6450fa5871c97a9e1719 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,32 +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(SCM);
-
-  Molecule compound_barline (String, Real height) const;
-  Molecule simple_barline (Real wid, Real height) const;      
-  static SCM brew_molecule (SCM);
-  
-
-public:
-  SCM member_before_line_breaking ();
-  static SCM before_line_breaking (SCM);
+  static bool has_interface (Grob *);
 
-  virtual Real get_bar_size () 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