* lily/include/lily-guile.hh: rename ly_c_X_p -> ly_is_X

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

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 8a1140c290b14431c365e518d840cd05af61fd2b..e4dd194632bbdb1d8fff1ec741fd3ad1077cb301 100644 (file)
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -1,15 +1,14 @@
-/*   
-  dimension-cache.cc --  implement Dimension_cache
-  
+/*
+  dimension-cache.cc -- implement Dimension_cache
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
 
-#include "dimension-cache.hh"
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
-#include <cmath>
+#include <math.h>
 
+#include "dimension-cache.hh"
 #include "warn.hh"
 #include "grob.hh"
 
@@ -17,11 +16,11 @@ 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_;  
+  parent_ = d.parent_;
 }
 
 Dimension_cache::Dimension_cache ()
@@ -33,17 +32,12 @@ void
 Dimension_cache::init ()
 {
   dimension_ = SCM_EOL;
+  dimension_callback_ = SCM_EOL;
 
   offsets_left_ = 0;
   offset_callbacks_ = SCM_EOL;
-  offset_ =0.0;
-  
-  parent_ =0;
-}
-
-
-
-
-
+  offset_ = 0.0;
 
+  parent_ = 0;
+}