release: 1.3.42

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index c315e2137aa143452c91beccb4c8520d1d5c4fc8..aa429c89bb0523cba6bd8dc82bbb6823f4750f55 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,32 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--2000 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_;
-  bool at_line_start_b_;
-
-  
   VIRTUAL_COPY_CONS(Score_element);
-  Bar ();
+  Bar();
 
-protected:
-  virtual void do_pre_processing ();
-  virtual Molecule* do_brew_molecule_p () const;
+  Molecule compound_barline (String, Real height) const;
+  Molecule simple_barline (Real wid, Real height) const;      
 
-private:
-  void do_print () const;
+protected:
+  virtual void before_line_breaking ();
+  virtual Molecule  do_brew_molecule () const;
+  virtual Real get_bar_size () const;
 };
 #endif // BAR_HH