* Another grand 2003 update.

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 08e48d2f6e31a48340d4bc767bbdeb08fa931868..ae60e9d8e66ac70e0eebb7a35d9c339ef196734b 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,31 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c)  1996--2003 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 {
+class Bar
+{
 public:
-  String type_str_;
-  bool at_line_start_b_;
-
+  static bool has_interface (Grob*);
   
-  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;
-private:
-  void do_print () const;
+  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