Run `make grand-replace'.

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 92c03f20d87315213a08479af22c0ae6ddb230d5..85d6d016e52e5e53f78e612652ef89a80a305fb2 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,31 +1,28 @@
 /*
   bar.hh -- part of GNU LilyPond
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  (c) 1996--2008 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
 
-/**
-  A vertical bar.
- */
-class Bar:public Item {
-public:
-  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);
-  
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
+/**
+   A vertical bar.
+*/
+class Bar
+{
 public:
-  SCM member_before_line_breaking ();
-  static SCM before_line_breaking (SCM);
+  DECLARE_GROB_INTERFACE();
 
-  virtual Real get_bar_size () const;
+  static Stencil compound_barline (Grob *, string, Real height);
+  static Stencil simple_barline (Grob *, Real wid, Real height);
+  DECLARE_SCHEME_CALLBACK (get_staff_bar_size, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
+  DECLARE_SCHEME_CALLBACK (before_line_breaking, (SCM));
 };
 #endif // BAR_HH