Run `make grand-replace'.

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

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index 227482b799438eaab15cbcdb7bfbaffcf7f3611a..f3b7b88eaab8aac406b851e1457818c11604e3ab 100644 (file)
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -1,56 +1,33 @@
-/*   
+/*
   dimension-cache.hh -- declare Dimension_cache
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c)  1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef DIMENSION_CACHE_HH
 #define DIMENSION_CACHE_HH
 
-#include "interval.hh"
-#include "real.hh"
 #include "lily-proto.hh"
-#include "parray.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_;
-
-  /**
-    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 */