* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 3727358d96f3c2659e537a467dcfba1a65f0c23f..e87836a75c69ff20803c27a6bbd53fcbe51ba7e7 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,20 +1,28 @@
 /*
-  bar.hh -- part of LilyPond
+  bar.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2004 Han-Wen Nienhuys
 */
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
 
-struct Bar: Item {
-    String type;
-    
-    Bar(String type);
-NAME_MEMBERS(Bar);
-    void do_print() const;
-    Molecule*brew_molecule_p()const;
+#include "lily-guile.hh"
+#include "lily-proto.hh"
+
+/**
+  A vertical bar.
+ */
+class Bar
+{
+public:
+  static bool has_interface (Grob*);
+  
+  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