X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar-line.hh;h=442fe27770759131ac37c392b769dde4607537d3;hb=94cce45d444cd6700d3f4df84cda68fb7de96cd7;hp=d85905d72e79d6cad32a30db89ae7c55eb2c33f6;hpb=bdab6ef772dc1cda56a36146158116f95a90fb51;p=lilypond.git

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index d85905d72e..442fe27770 100644
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,11 +1,24 @@
 /*
-  bar.hh -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2007 Han-Wen Nienhuys
+  Copyright (C) 1996--2011 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
+#ifndef BAR_LINE_HH
+#define BAR_LINE_HH
 
 #include "lily-proto.hh"
 #include "grob-interface.hh"
@@ -15,12 +28,17 @@ class Bar_line
 public:
   DECLARE_GROB_INTERFACE();
 
-  static Stencil dashed_bar_line (Grob *me, Real h, Real thick);
-  static Stencil compound_barline (Grob *, string, Real height, bool rounded);
-  static Stencil simple_barline (Grob *, Real wid, Real height, bool rounded);
-  DECLARE_SCHEME_CALLBACK (calc_bar_size, (SCM));
+  static Stencil dashed_bar_line (Grob *me, Interval const &extent, Real thick);
+  static Stencil tick_bar_line (Grob *me, Real h, bool rounded);
+  static Stencil compound_barline (Grob *, string, Interval const &extent,
+				   bool rounded);
+  static Stencil simple_barline (Grob *, Real wid, Interval const &extent,
+				 bool rounded);
+  static Interval bar_y_extent (Grob *, Grob *);
+  static bool non_empty_barline (Grob *me);
+
+  DECLARE_SCHEME_CALLBACK (calc_bar_extent, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_anchor, (SCM));
 };
-#endif // BAR_HH
-
+#endif // BAR_LINE_HH