X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fdimension-cache.hh;h=b1e9aba043cc298d3393e3a880c8accac4a75a9f;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=0abb7f6c37ef5f8f546b37deedde6e9ce5242f5a;hpb=93b5b6bf5495d930fccd442dc402897f7f07b2de;p=lilypond.git

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index 0abb7f6c37..b1e9aba043 100644
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -1,54 +1,36 @@
-/*   
+/*
   dimension-cache.hh -- declare Dimension_cache
-  
+
   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.
 */
-struct Dimension_cache
+class Dimension_cache
 {
-  /*
-    Multi typed:
-
-     - cons: interval
-     - procedure: callback     
-     - else: empty
-   */
-  SCM dimension_;
-  SCM dimension_callback_;
-
-  /**
-    The offset wrt. to the center of #parent_#
-   */
-
-  Real offset_;
-  SCM offset_callbacks_;
+  Interval *extent_;
+  Real *offset_;
+  Grob *parent_;
+  void init ();
+  void clear ();
   
-  char offsets_left_;
-
-  /**
-     What to call to find extent.  Nil means empty. 
-   */
-  Grob * parent_;
-
-  Dimension_cache (Dimension_cache const&);
+  friend class Grob;
+  
+  Dimension_cache (Dimension_cache const &);
+  ~Dimension_cache ();
   Dimension_cache ();
-  void init ();
 };
 
-
 #endif /* DIMENSION_CACHE_HH */