Run grand replace for 2015.

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

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index 86c3a663d0f1af096ac1836818917f6d9aaeeb58..24f2615b388a36de4fd2634d633b425a67b1fbfe 100644 (file)
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -1,51 +1,44 @@
 /*
-  dimension-cache.hh -- declare Dimension_cache
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.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.
-  */
+  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 ();
-  void init ();
 };
 
 #endif /* DIMENSION_CACHE_HH */