patch::: 1.3.59.uu2.jcn1

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 08e48d2f6e31a48340d4bc767bbdeb08fa931868..bfb2ce7379f0bb3e3d061d38b64eaa15d9ff6c28 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,7 +1,7 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--1999 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
@@ -13,19 +13,18 @@
  */
 class Bar:public Item {
 public:
-  String type_str_;
-  bool at_line_start_b_;
+  VIRTUAL_COPY_CONS(Score_element);
+  Bar(SCM);
 
+  Molecule compound_barline (String, Real height) const;
+  Molecule simple_barline (Real wid, Real height) const;      
+  static SCM scheme_molecule (SCM);
   
-  VIRTUAL_COPY_CONS(Score_element);
-  Bar ();
 
 protected:
-  virtual void do_pre_processing ();
-  virtual Molecule* do_brew_molecule_p () const;
+  virtual void before_line_breaking ();
+  Molecule  do_brew_molecule () const;
   virtual Real get_bar_size () const;
-private:
-  void do_print () const;
 };
 #endif // BAR_HH