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 21ee05890c46ef9e8e052204d4b74b130513f9fc..bfb2ce7379f0bb3e3d061d38b64eaa15d9ff6c28 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -14,10 +14,16 @@
 class Bar:public Item {
 public:
   VIRTUAL_COPY_CONS(Score_element);
-  Bar();
+  Bar(SCM);
+
+  Molecule compound_barline (String, Real height) const;
+  Molecule simple_barline (Real wid, Real height) const;      
+  static SCM scheme_molecule (SCM);
+  
+
 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;
 };
 #endif // BAR_HH