release: 1.1.37

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index ce886830b0e69e08aacd8b449e0ce5b0563b1878..3c43bc0dcd92139465b020c96fc12e564a00b18c 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,30 +1,29 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
 #include "item.hh"
+
 /**
   A vertical bar.
-  
-  TODO: connections with pre and postbreak
  */
 class Bar:public Item {
 public:
   String type_str_;
-  int spanned_i_;
-    
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEM_CLONE(Bar);
-  Bar();
-private:
-  void do_print() const;
+  VIRTUAL_COPY_CONS(Score_element);
+  Bar ();
+
 protected:
-  virtual void do_pre_processing();
-  Molecule*brew_molecule_p() const;
+  virtual void do_pre_processing ();
+  virtual Molecule* do_brew_molecule_p () const;
+  virtual Real get_bar_size () const;
+
+private:
+  void do_print () const;
 };
 #endif // BAR_HH