patch::: 1.3.62.hwn1

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index ce886830b0e69e08aacd8b449e0ce5b0563b1878..92c03f20d87315213a08479af22c0ae6ddb230d5 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,30 +1,31 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996,97 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_;
-  int spanned_i_;
-    
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEM_CLONE(Bar);
-  Bar();
-private:
-  void do_print() const;
-protected:
-  virtual void do_pre_processing();
-  Molecule*brew_molecule_p() const;
+  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);
+
+  virtual Real get_bar_size () const;
 };
 #endif // BAR_HH