release: 1.3.109

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index f770c3aac29ff38d034a40861c462d405d7ad891..ffc4e4ad4561a4884b23d103be93120a90ab8a59 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -6,23 +6,23 @@
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
+
+#include "lily-guile.hh"
+#include "lily-proto.hh"
 
 /**
   A vertical bar.
  */
-class Bar:public Item {
+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;      
-
-protected:
-  virtual void before_line_breaking ();
-  virtual Molecule  do_brew_molecule () const;
-  virtual Real get_bar_size () const;
+  static bool has_interface (Grob*);
+  static void set_interface (Grob*);
+  static Molecule compound_barline (Grob*, String, Real height) ;
+  static Molecule simple_barline (Grob*, Real wid, Real height) ;      
+  DECLARE_SCHEME_CALLBACK(get_staff_bar_size, (SCM ));
+  DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM ));
+  DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM ));
 };
 #endif // BAR_HH