X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdimension-cache.cc;h=d1290939365541a09e922d2f90fc3d4cba49721a;hb=92b2baf698f1b2b4ec7cc88c68e2a03a03e1d324;hp=da14511f52d1f30f694f06f51362d128975595c6;hpb=9b40d66187029df3dca86fc5ecc65f64db315a48;p=lilypond.git

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index da14511f52..d129093936 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -1,48 +1,48 @@
-/*   
-  dimension-cache.cc --  implement Dimension_cache
-  
+/*
+  dimension-cache.cc -- implement Dimension_cache
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
-#include <math.h>
-#include "warn.hh"
+
+  (c) 1998--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+
 #include "dimension-cache.hh"
-#include "parray.hh"
-#include "score-element.hh"
 
+#include "warn.hh"
+#include "grob.hh"
 
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
-  init();
-  dimension_ = d.dimension_;
-
-  offset_ = d.offset_;
-  offset_callbacks_ = d.offset_callbacks_;
-  offsets_left_ = d.offsets_left_;
-  parent_l_ = d.parent_l_;  
+  init ();
+  offset_ = d.offset_ ? new Real (*d.offset_) : 0;
+  parent_ = d.parent_;
+  extent_ = d.extent_ ? new Interval (*d.extent_) : 0;
 }
 
 Dimension_cache::Dimension_cache ()
 {
-  init();
+  init ();
 }
 
 void
-Dimension_cache::init()
+Dimension_cache::init ()
 {
-  dimension_ = SCM_EOL;
-
-  offsets_left_ = 0;
-  offset_callbacks_ = SCM_EOL;
-  offset_ =0.0;
-  
-  parent_l_ =0;
+  offset_ = 0;
+  extent_ = 0;
+  parent_ = 0;
 }
 
+Dimension_cache::~Dimension_cache ()
+{
+  clear ();
+}
 
-
-
-
-
-
+void
+Dimension_cache::clear ()
+{
+  delete extent_;
+  delete offset_;
+  extent_ = 0;
+  offset_ = 0;
+}