X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fbar-line.hh;h=432cb0fd4a2be9e2e9c262bab9e6561834a57198;hb=3d8f4559228bd8a4a30bb024163b64d425b76f18;hp=aeea3565a0d7d4c76b60e450707a40dacd860265;hpb=190a067275167c6dc9dd0afef683d14d392b7033;p=lilypond.git

diff --git a/lily/include/bar-line.hh b/lily/include/bar-line.hh
index aeea3565a0..432cb0fd4a 100644
--- a/lily/include/bar-line.hh
+++ b/lily/include/bar-line.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2010 Han-Wen Nienhuys
+  Copyright (C) 1996--2012 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
@@ -26,17 +26,18 @@
 class Bar_line
 {
 public:
-  DECLARE_GROB_INTERFACE();
+  DECLARE_GROB_INTERFACE ();
 
-  static Stencil dashed_bar_line (Grob *me, Real h, Real thick);
+  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, Real height, bool rounded);
-  static Stencil simple_barline (Grob *, Real wid, Real height, 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 (calc_bar_size, (SCM));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_anchor, (SCM));
 };