release: 1.3.28

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

diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc
index 6fc99bde284f48bee45184eeb3a604d4ffaa5edf..69ff282b0a929ec1f3bb13a89795bc16e600e8c8 100644 (file)
--- a/lily/dimension-cache.cc
+++ b/lily/dimension-cache.cc
@@ -3,18 +3,23 @@
   
   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 "dimension-cache.hh"
 #include "parray.hh"
+#include "score-element.hh"
+
 
 Dimension_cache::Dimension_cache (Dimension_cache const &d)
 {
   init();
   callback_l_ = d.callback_l_;
-  empty_b_ = d.empty_b_;
-  offset_ = d.offset_; //let's hope others will copy  the refpoint appropriately. 
+  basic_offset_ = d.basic_offset_;
+  extra_offset_ = d.extra_offset_;
+  off_valid_b_ = d.off_valid_b_;
+  off_callbacks_ = d.off_callbacks_;
+  parent_l_ = d.parent_l_;  
 }
 
 Dimension_cache::Dimension_cache ()
@@ -26,47 +31,21 @@ void
 Dimension_cache::init()
 {
   callback_l_ =0;
-  offset_ =0.0;
+  basic_offset_ =0.0;
+  extra_offset_ =0.0;
+  
   elt_l_ = 0;
   dim_.set_empty ();
   parent_l_ =0;
   valid_b_ = false;
-  empty_b_ = false;
-}
-
-
-void
-Dimension_cache::invalidate ()
-{
-  valid_b_ = false;
-  invalidate_dependencies ();
-}
-
-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 ();
-       }
-    }
+  off_valid_b_ = false;
 }
 
-void
-Dimension_cache::set_offset (Real x)
-{
-  invalidate_dependencies ();
-  offset_ = x;
-}
 
 void
 Dimension_cache::translate (Real x)
 {
-  invalidate_dependencies ();
-  offset_ += x;
+  extra_offset_ += x;
 }
 
 Real
@@ -81,58 +60,70 @@ Dimension_cache::relative_coordinate (Dimension_cache *refp) const
     
    */
   if (refp == parent_l_)
-    return offset_;
+    return get_offset ();
   else
-    return offset_ + parent_l_->relative_coordinate (refp);
+    return get_offset () + parent_l_->relative_coordinate (refp);
 }
 
-Dimension_cache *
-Dimension_cache::common_refpoint (Dimension_cache const* s) const
+Axis
+Dimension_cache::axis () 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;
+  if (elt_l_-> dim_cache_[X_AXIS] == this)
+    return X_AXIS;
+  else
+    return Y_AXIS;
 }
 
-
-
-void
-Dimension_cache::set_empty (bool b)
+Real
+Dimension_cache::get_offset () const
 {
-  if (empty_b_ != b)
+  Dimension_cache *me = (Dimension_cache*) this;
+  while (off_callbacks_.size ())
     {
-      empty_b_ = b;
-      if (!empty_b_)
-       invalidate ();
+      Offset_cache_callback c = me->off_callbacks_[0];
+      me->off_callbacks_.del (0);
+      me->basic_offset_ += (*c) (me);
     }
-}  
+  return basic_offset_ + extra_offset_;
+}
+
+Dimension_cache *
+Dimension_cache::common_refpoint (Dimension_cache const* s) const
+{
+  /*
+    I don't like the quadratic aspect of this code. Maybe this should
+    be rewritten some time, but the largest chain of parents might be
+    10 high or so, so it shouldn't be a real issue. */
+  for (Dimension_cache const *c = this; c; c = c->parent_l_)
+    for (Dimension_cache const * d = s; d; d = d->parent_l_)
+      if (d == c)
+       return (Dimension_cache*)d;
+
+  return 0;
+}
+
+Interval
+Dimension_cache::point_dimension_callback (Dimension_cache const* )
+{
+  return Interval (0,0);
+}
 
 Interval
 Dimension_cache::get_dim () const
 {
   Interval r;
-  if (empty_b_)
+  Dimension_cache *nc = ((Dimension_cache*)this);
+  if (!callback_l_)
     {
-      r.set_empty ();
-      return r;
+      nc->dim_.set_empty ();
     }
-      
-  if (!valid_b_)
+  else if (!valid_b_)
     {
-      Dimension_cache *nc = ((Dimension_cache*)this);
       nc->dim_= (*callback_l_ ) (nc);
       nc->valid_b_ = true;
     }
 
   r=dim_;
-
   return r;
 }
 
@@ -142,3 +133,4 @@ Dimension_cache::set_callback (Dim_cache_callback c)
   callback_l_ =c;
 }
 
+