Uniformize, internalize.

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

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index a671878f438a51c1eb783921b34760582e6053ce..0abb7f6c37ef5f8f546b37deedde6e9ce5242f5a 100644 (file)
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -3,21 +3,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2001 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.
 */
@@ -27,13 +24,14 @@ struct Dimension_cache
     Multi typed:
 
      - cons: interval
-     - procedure: callback
+     - 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_;
@@ -44,7 +42,7 @@ struct Dimension_cache
   /**
      What to call to find extent.  Nil means empty. 
    */
-  Grob * parent_l_;
+  Grob * parent_;
 
   Dimension_cache (Dimension_cache const&);
   Dimension_cache ();