* The grand 2005-2006 replace.

[lilypond.git] / lily / dimension-cache.cc

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 749b8aca13fe355e76307dfc7a96f7c072ea751c..ebf4ad93e2f3a2ba04a78f61f2a262e3b182e93c 100644 (file)
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
@@ -14,9 +14,7 @@
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
   init ();
-  offset_ = d.offset_;
-  offset_callbacks_ = d.offset_callbacks_;
-  offsets_left_ = d.offsets_left_;
+  offset_ = d.offset_ ? new Real (*d.offset_) : 0;
   parent_ = d.parent_;
   extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
 }
@@ -29,14 +27,21 @@ Dimension_cache::Dimension_cache ()
 void
 Dimension_cache::init ()
 {
-  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;
 }