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

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index 0abb7f6c37..320d1fdca2 100644
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -1,54 +1,44 @@
-/*   
-  dimension-cache.hh -- declare Dimension_cache
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef DIMENSION_CACHE_HH
 #define DIMENSION_CACHE_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_;
-  SCM dimension_callback_;
-
-  /**
-    The offset wrt. to the center of #parent_#
-   */
-
-  Real offset_;
-  SCM offset_callbacks_;
-  
-  char offsets_left_;
-
-  /**
-     What to call to find extent.  Nil means empty. 
-   */
-  Grob * parent_;
-
-  Dimension_cache (Dimension_cache const&);
-  Dimension_cache ();
+  Interval *extent_;
+  Real *offset_;
+  Grob *parent_;
   void init ();
-};
+  void clear ();
+
+  friend class Grob;
 
+  Dimension_cache (Dimension_cache const &);
+  ~Dimension_cache ();
+  Dimension_cache ();
+};
 
 #endif /* DIMENSION_CACHE_HH */