Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/include/bar.hh b/lily/include/bar.hh
index 6673cea6f95c96e1090b0eb1981056869872f1e3..8b8a54f11eaa244e4bb07ff0d3a4c480fef79117 100644 (file)
--- a/lily/include/bar.hh
+++ b/lily/include/bar.hh
@@ -1,30 +1,41 @@
 /*
-  bar.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2000 Han-Wen Nienhuys
+  Copyright (C) 1996--2009 Han-Wen Nienhuys
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef BAR_HH
 #define BAR_HH
-#include "item.hh"
+
+#include "lily-proto.hh"
+#include "grob-interface.hh"
 
 /**
-  A vertical bar.
- */
-class Bar:public Item {
+   A vertical bar.
+*/
+class Bar
+{
 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 scheme_molecule (SCM);
-  
-
-protected:
-  virtual void before_line_breaking ();
-  virtual Molecule  do_brew_molecule () const;
-  virtual Real get_bar_size () const;
+  DECLARE_GROB_INTERFACE();
+
+  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