X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdimension-cache.cc;h=90acd455ea989831c7610fe05ba634936e7d90cd;hb=98797fc60f299f8e84d9719cef45c2db4131532b;hp=eeb363c34df86f02ff0972960fab47edc02c0e89;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index eeb363c34d..90acd455ea 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -1,27 +1,23 @@
-/*   
+/*
   dimension-cache.cc -- implement Dimension_cache
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
 
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#include <math.h>
 
 #include "dimension-cache.hh"
+
 #include "warn.hh"
 #include "grob.hh"
 
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
   init ();
-  dimension_ = d.dimension_;
-  dimension_callback_ = d.dimension_callback_;
-  offset_ = d.offset_;
-  offset_callbacks_ = d.offset_callbacks_;
-  offsets_left_ = d.offsets_left_;
-  parent_ = d.parent_;  
+  offset_ = d.offset_ ? new Real (*d.offset_) : 0;
+  parent_ = d.parent_;
+  extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
 }
 
 Dimension_cache::Dimension_cache ()
@@ -32,19 +28,21 @@ Dimension_cache::Dimension_cache ()
 void
 Dimension_cache::init ()
 {
-  dimension_ = SCM_EOL;
-  dimension_callback_ = SCM_EOL; 
-
-  offsets_left_ = 0;
-  offset_callbacks_ = SCM_EOL;
-  offset_ = 0.0;
-  
+  offset_ = 0;
+  extent_ = 0;
   parent_ = 0;
 }
 
+Dimension_cache::~Dimension_cache ()
+{
+  clear ();
+}
 
-
-
-
-
-
+void
+Dimension_cache::clear ()
+{
+  delete extent_;
+  delete offset_;
+  extent_ = 0;
+  offset_ = 0;
+}