X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fdimension-cache.hh;h=320d1fdca2fdcd13b2c37619f8010e932df02379;hb=05f05a51ca0078ce9a8c87cbf30ac7fbd4def706;hp=ca4fad3c16c370485ce2a3c6b5b51d0e6f819a39;hpb=736088f09a0b77acc84f6e1a54cddb8bad3d94c1;p=lilypond.git

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index ca4fad3c16..320d1fdca2 100644
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -1,50 +1,44 @@
-/*   
-  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.
 
-#ifndef DIMENSION_CACHE_HH
-#define DIMENSION_CACHE_HH
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-#include "interval.hh"
-#include "real.hh"
-#include "lily-proto.hh"
-#include "parray.hh"
-#include "dimension-cache-callback.hh"
+  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.
 
-/**
-  Adminstration of offset dimension info. 
- */
-struct Dimension_cache
-{
-  bool valid_b_;
-  Interval dim_;
-  /**
-    The offset wrt. to the center of #parent_l_#
-   */
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-  Real offset_;
+#ifndef DIMENSION_CACHE_HH
+#define DIMENSION_CACHE_HH
 
+#include "lily-proto.hh"
 
-  
-  Array<Offset_callback> off_callbacks_;
+/*
+  XY offset/refpoint/extent structure.
+*/
+class Dimension_cache
+{
+  Interval *extent_;
+  Real *offset_;
+  Grob *parent_;
+  void init ();
+  void clear ();
 
-  /**
-     What to call to find extent.  Nil means empty. 
-   */
-  Dim_cache_callback extent_callback_l_;
-  Score_element * parent_l_;
+  friend class Grob;
 
-  Dimension_cache(Dimension_cache const&);
+  Dimension_cache (Dimension_cache const &);
+  ~Dimension_cache ();
   Dimension_cache ();
-  void init ();
 };
 
-
 #endif /* DIMENSION_CACHE_HH */