Mutopia tagline.

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

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 96a51cde5a8ca395b4a4cfeac0dbeab46dad02f9..08074b2dab105761f17c03942ac232f0a2103277 100644 (file)
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,39 +3,41 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 #include <math.h>
 #include "warn.hh"
 #include "dimension-cache.hh"
 #include "parray.hh"
-#include "score-element.hh"
+#include "grob.hh"
 
 
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
-  init();
-  extent_callback_l_ = d.extent_callback_l_;
+  init ();
+  dimension_ = d.dimension_;
+
   offset_ = d.offset_;
-  off_callbacks_ = d.off_callbacks_;
-  parent_l_ = d.parent_l_;  
+  offset_callbacks_ = d.offset_callbacks_;
+  offsets_left_ = d.offsets_left_;
+  parent_ = d.parent_;  
 }
 
 Dimension_cache::Dimension_cache ()
 {
-  init();
+  init ();
 }
 
 void
-Dimension_cache::init()
+Dimension_cache::init ()
 {
-  extent_callback_l_ =0;
-  offset_ =0.0;
+  dimension_ = SCM_EOL;
+
+  offsets_left_ = 0;
+  offset_callbacks_ = SCM_EOL;
   offset_ =0.0;
   
-  dim_.set_empty ();
-  parent_l_ =0;
-  valid_b_ = false;
+  parent_ =0;
 }