X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fdimension-cache.hh;h=24f2615b388a36de4fd2634d633b425a67b1fbfe;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=adbcc2aa049330c82296e39aecb17ba266cca108;hpb=e0833e924a7b626154c66170d98335c6c4985dfe;p=lilypond.git

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index adbcc2aa04..24f2615b38 100644
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -1,53 +1,45 @@
-/*   
-  dimension-cache.hh -- declare Dimension_cache
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2015 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 "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.
-
-  TODO: use SCM for callbacks, and let them be set as basic
-  properties.
+/*
+  XY offset/refpoint/extent structure.
 */
-struct Dimension_cache
+class Dimension_cache
 {
-  Interval dim_;
-  /**
-    The offset wrt. to the center of #parent_l_#
-   */
-
-  Real offset_;
-  SCM offset_callbacks_;
-  
-  bool valid_b_;
-  char offsets_left_;
-
-  /**
-     What to call to find extent.  Nil means empty. 
-   */
-  Dim_cache_callback extent_callback_l_;
-  Score_element * parent_l_;
-
-  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 & operator = (Dimension_cache const &d);
+  ~Dimension_cache ();
+  Dimension_cache ();
+};
 
 #endif /* DIMENSION_CACHE_HH */