* Documentation/topdocs/NEWS.tely (Top): Mention markup text feature.

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

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index ca4fad3c16c370485ce2a3c6b5b51d0e6f819a39..0abb7f6c37ef5f8f546b37deedde6e9ce5242f5a 100644 (file)
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -3,44 +3,48 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.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. 
- */
+  Adminstration of offset dimension info.
+*/
 struct Dimension_cache
 {
-  bool valid_b_;
-  Interval dim_;
+  /*
+    Multi typed:
+
+     - cons: interval
+     - procedure: callback     
+     - else: empty
+   */
+  SCM dimension_;
+  SCM dimension_callback_;
+
   /**
-    The offset wrt. to the center of #parent_l_#
+    The offset wrt. to the center of #parent_#
    */
 
   Real offset_;
-
-
+  SCM offset_callbacks_;
   
-  Array<Offset_callback> off_callbacks_;
+  char offsets_left_;
 
   /**
      What to call to find extent.  Nil means empty. 
    */
-  Dim_cache_callback extent_callback_l_;
-  Score_element * parent_l_;
+  Grob * parent_;
 
-  Dimension_cache(Dimension_cache const&);
+  Dimension_cache (Dimension_cache const&);
   Dimension_cache ();
   void init ();
 };