X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdimension-cache.cc;h=c98b949fd31a81bc3a79571f55999d6e45471c25;hb=d7dc509525cc1f5b8b670e5d38db44a546674b86;hp=8746337cca4b96bac67fd08dfcb7cd38726fed47;hpb=afa5829cd270e1b0c616b7ba5c5e6cdc0e920e5f;p=lilypond.git

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 8746337cca..c98b949fd3 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,149 +3,46 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
-
+#include <math.h>
+#include "warn.hh"
 #include "dimension-cache.hh"
 #include "parray.hh"
+#include "grob.hh"
 
-Dimension_cache::Dimension_cache (Dimension_cache const &d)
-{
-  init();
-  empty_b_ = d.empty_b_;
-}
-
-Dimension_cache::Dimension_cache ()
-{
-  init();
-}
 
-void
-Dimension_cache::init()
-{
-  offset_ =0.0;
-  elt_l_ = 0;
-  dim_.set_empty ();
-  parent_l_ =0;
-  valid_b_ = false;
-  empty_b_ = false;
-}
-
-
-void
-Dimension_cache::invalidate ()
+Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
-  valid_b_ = false;
-  invalidate_dependencies ();
-}
+  init ();
+  dimension_ = d.dimension_;
 
-void
-Dimension_cache::invalidate_dependencies ()
-{
-  for (int i=0; i < dependencies_l_arr_.size (); i++)
-    {
-      Dimension_cache * g = dependencies_l_arr_[i];
-      if (g->valid_b_)
-	{
-	  g->invalidate ();
-	}
-    }
+  offset_ = d.offset_;
+  offset_callbacks_ = d.offset_callbacks_;
+  offsets_left_ = d.offsets_left_;
+  parent_ = d.parent_;  
 }
 
-void
-Dimension_cache::set_offset (Real x)
+Dimension_cache::Dimension_cache ()
 {
-  invalidate_dependencies ();
-  offset_ = x;
+  init ();
 }
 
 void
-Dimension_cache::translate (Real x)
+Dimension_cache::init ()
 {
-  invalidate_dependencies ();
-  offset_ += x;
-}
-
+  dimension_ = SCM_EOL;
 
-Real
-Dimension_cache::absolute_coordinate () const
-{
-  Real r = offset_;
-  for (Dimension_cache * c = parent_l_;
-       c; c = c->parent_l_)
-    r += c->offset_;
-  return r;
-}
-
-Real
-Dimension_cache::relative_coordinate (Dimension_cache *d) const
-{
-  Real r =0.0;
-
-  for (Dimension_cache* c = parent_l_;
-       c != d;
-       c = c->parent_l_)
-    r +=  c->offset_;
-  return r;
-}
-
-Dimension_cache *
-Dimension_cache::common_group (Dimension_cache const* s) const
-{
-  Link_array<Dimension_cache const> my_groups;
-  for (Dimension_cache const *c = this;
-       c ; c = c->parent_l_)
-    my_groups.push (c);
-  
-  
-  Dimension_cache const *common=0;
+  offsets_left_ = 0;
+  offset_callbacks_ = SCM_EOL;
+  offset_ =0.0;
   
-  for (Dimension_cache const * d = s;
-       !common && d;
-       d = d->parent_l_)
-    common = my_groups.find_l (d);
-
-  return (Dimension_cache*)common;
+  parent_ =0;
 }
 
 
 
-void
-Dimension_cache::set_empty (bool b)
-{
-  if (empty_b_ != b)
-    {
-      empty_b_ = b;
-      if (!empty_b_)
-	invalidate ();
-    }
-}  
 
-void
-Dimension_cache::set_dim (Interval v)
-{
-  dim_ = v;
-  valid_b_ = true;
-}
-  
-
-Interval
-Dimension_cache::get_dim () const
-{
-  Interval r;
-  if (empty_b_)
-    {
-      r.set_empty ();
-      return r;
-    }
-      
-  assert (valid_b_);
 
-  r=dim_;
-  if (!r.empty_b()) // float exception on DEC Alpha
-    r += offset_;
-
-  return r;
-}