Uniformize, internalize.

[lilypond.git] / lily / include / dimension-cache-callback.hh

diff --git a/lily/include/dimension-cache-callback.hh b/lily/include/dimension-cache-callback.hh
index b12dc1078dae8cc3b13cba4a4f0651c665b9230b..ff9ea00c6088580fcc0eaee4b5980959211cbe01 100644 (file)
--- a/lily/include/dimension-cache-callback.hh
+++ b/lily/include/dimension-cache-callback.hh
@@ -3,16 +3,17 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #ifndef DIMENSION_CACHE_CALLBACK_HH
 #define DIMENSION_CACHE_CALLBACK_HH
 
-class Dimension_cache;
-typedef Interval (*Dim_cache_callback)(Dimension_cache const *);
-typedef Real (*Offset_cache_callback)(Dimension_cache const *);
+#include "axes.hh"
+
+typedef Interval (*Dim_cache_callback) (Grob *, Axis);
+typedef Real (*Offset_callback) (Grob *, Axis);
 
 #endif /* DIMENSION_CACHE_CALLBACK_HH */