Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index 00480e9fcb8b1a88cda016e05076e33a92cb57db..b1e9aba043cc298d3393e3a880c8accac4a75a9f 100644 (file)
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -3,41 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef DIMENSION_CACHE_HH
 #define DIMENSION_CACHE_HH
 
 #include "lily-proto.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "dimension-cache-callback.hh"
 #include "lily-guile.hh"
 
-/**
-   Adminstration of offset dimension info.
+/*
+  XY offset/refpoint/extent structure.
 */
 class Dimension_cache
 {
-  /**
-     The offset wrt. to the center of #parent_#
-  */
   Interval *extent_;
-  Real offset_;
-  SCM offset_callbacks_;
-
-  char offsets_left_;
-
-  /**
-     What to call to find extent.  Nil means empty.
-  */
+  Real *offset_;
   Grob *parent_;
+  void init ();
+  void clear ();
+  
   friend class Grob;
   
   Dimension_cache (Dimension_cache const &);
   ~Dimension_cache ();
   Dimension_cache ();
-  void init ();
 };
 
 #endif /* DIMENSION_CACHE_HH */