X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdimension-cache.cc;h=da14511f52d1f30f694f06f51362d128975595c6;hb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;hp=5899d4474a6afb7ee89c80023f5272b75dfbf7ad;hpb=876ccb4004d92f3b7bd539753f8f9339b7d48490;p=lilypond.git

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 5899d4474a..da14511f52 100644
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,22 +3,24 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
-
+#include <math.h>
+#include "warn.hh"
 #include "dimension-cache.hh"
 #include "parray.hh"
-#include "graphical-element.hh"
+#include "score-element.hh"
+
 
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
   init();
-  callback_l_ = d.callback_l_;
-  empty_b_ = d.empty_b_;
-  basic_offset_ = d.basic_offset_;
-  extra_offset_ = d.extra_offset_;
-  off_valid_b_ = d.off_valid_b_;
-  off_callback_l_ = d.off_callback_l_;
+  dimension_ = d.dimension_;
+
+  offset_ = d.offset_;
+  offset_callbacks_ = d.offset_callbacks_;
+  offsets_left_ = d.offsets_left_;
+  parent_l_ = d.parent_l_;  
 }
 
 Dimension_cache::Dimension_cache ()
@@ -29,145 +31,18 @@ Dimension_cache::Dimension_cache ()
 void
 Dimension_cache::init()
 {
-  callback_l_ =0;
+  dimension_ = SCM_EOL;
 
-  basic_offset_ =0.0;
-  extra_offset_ =0.0;
+  offsets_left_ = 0;
+  offset_callbacks_ = SCM_EOL;
+  offset_ =0.0;
   
-  elt_l_ = 0;
-  dim_.set_empty ();
   parent_l_ =0;
-  valid_b_ = false;
-  empty_b_ = false;
-  off_valid_b_ = false;
-  off_callback_l_ =0;
-}
-
-
-void
-Dimension_cache::invalidate ()
-{
-  off_valid_b_ =false;
-  valid_b_ = false;
-}
-
-
-void
-Dimension_cache::set_offset (Real x)
-{
-  // ugh!
-  /*
-
-    UGH ! UGH !
-    
-   */
-  
-  basic_offset_ = x;
 }
 
-void
-Dimension_cache::translate (Real x)
-{
-  basic_offset_ += x;
-}
 
-Real
-Dimension_cache::relative_coordinate (Dimension_cache *refp) const
-{
-  if (refp == this)
-    return 0.0;
 
-  /*
-    We catch PARENT_L_ == nil case with this, but we crash if we did
-    not ask for the absolute coordinate (ie. REFP == nil.)
-    
-   */
-  if (refp == parent_l_)
-    return get_offset ();
-  else
-    return get_offset () + parent_l_->relative_coordinate (refp);
-}
 
-Axis
-Dimension_cache::axis () const
-{
-  if (elt_l_-> dim_cache_[X_AXIS] == this)
-    return X_AXIS;
-  else
-    return Y_AXIS;
-}
 
-Real
-Dimension_cache::get_offset () const
-{
-  if (!off_valid_b_ && off_callback_l_ )
-    {
-      Dimension_cache *d = (Dimension_cache*) this;
-      d->off_valid_b_ = true;
-      d->basic_offset_ = (*off_callback_l_) (d);
-    }
 
-  return basic_offset_ + extra_offset_;
-}
 
-Dimension_cache *
-Dimension_cache::common_refpoint (Dimension_cache const* s) const
-{
-  Link_array<Dimension_cache> my_groups;
-  for (Dimension_cache const *c = this; c ; c = c->parent_l_)
-    my_groups.push ((Dimension_cache*)c);
-  
-  Dimension_cache const *common=0;
-  
-  for (Dimension_cache const * d = s; !common && d; d = d->parent_l_)
-    common = (Dimension_cache const*)my_groups.find_l (d);
-
-  return (Dimension_cache*) common;
-}
-
-
-
-void
-Dimension_cache::set_empty (bool b)
-{
-  if (empty_b_ != b)
-    {
-      empty_b_ = b;
-      if (!empty_b_)
-	invalidate ();
-    }
-}  
-
-Interval
-Dimension_cache::get_dim () const
-{
-  Interval r;
-  if (empty_b_)
-    {
-      r.set_empty ();
-      return r;
-    }
-      
-  if (!valid_b_)
-    {
-      Dimension_cache *nc = ((Dimension_cache*)this);
-      nc->dim_= (*callback_l_ ) (nc);
-      nc->valid_b_ = true;
-    }
-
-  r=dim_;
-
-  return r;
-}
-
-void
-Dimension_cache::set_callback (Dim_cache_callback c)
-{
-  callback_l_ =c;
-}
-
-void
-Dimension_cache::set_offset_callback (Offset_cache_callback c)
-{
-  off_callback_l_ =c;
-}