2003 -> 2004

[lilypond.git] / lily / include / dimension-cache.hh

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index fc23932284e3b78a5d001024c8eb2ecb3c84231a..4576c99ef283f05064bba64868622f540b2218b5 100644 (file)
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -14,75 +14,41 @@
 #include "real.hh"
 #include "lily-proto.hh"
 #include "parray.hh"
+#include "dimension-cache-callback.hh"
+#include "lily-guile.hh"
 
-class Dimension_cache;
-typedef Interval (*Dim_cache_callback)(Dimension_cache const *);
-typedef Real (*Offset_cache_callback)(Dimension_cache const *);
 
 /**
-  Adminstration of offset dimension info. 
- */
-class Dimension_cache
+  Adminstration of offset dimension info.
+*/
+struct Dimension_cache
 {
-  bool valid_b_;
-  /** Is this element dimensionless?.
-    This is private to guarantee correctness of the cache
+  /*
+    Multi typed:
+
+     - cons: interval
+     - procedure: callback
+     - else: empty
    */
-  bool empty_b_;
-  Interval dim_;
+  SCM dimension_;
+
   /**
-    The offset wrt. to the center of #parent_l_#
+    The offset wrt. to the center of #parent_#
    */
 
-  Real extra_offset_;
-  Real basic_offset_;
-  
-  bool off_valid_b_;
-
+  Real offset_;
+  SCM offset_callbacks_;
   
-  Graphical_element *elt_l_;
-  Dim_cache_callback callback_l_;
-  friend class Graphical_element;
-
-  void init ();
-public:
-  Array<Offset_cache_callback> off_callbacks_;
-  
-  Axis axis () const;
-  Real get_offset () const;
-  void set_callback (Dim_cache_callback);
-  /** The #offset_# is defined with regard to this graphical_element/
-    dimension_cache.  */
-  void set_offset_callback (Offset_cache_callback);
-  Dimension_cache * parent_l_;
-
-  Graphical_element *element_l () const { return elt_l_; }
-
-  void invalidate ();
-  void invalidate_dependencies ();
-  
-  Dimension_cache(Dimension_cache const&);
-  Dimension_cache ();
-
+  char offsets_left_;
 
   /**
-     Find the offset relative to D.  If   D equals THIS, then it is 0.
-     Otherwise, it recursively defd as
-
-     OFFSET_ + PARENT_L_->relative_coordinate (D)
+     What to call to find extent.  Nil means empty. 
    */
-  Real relative_coordinate (Dimension_cache *d) const;
-  Dimension_cache*common_refpoint (Dimension_cache const* s) const;
-  Dimension_cache*common_refpoint (Link_array<Dimension_cache> caches) const;
-  void set_empty (bool);
-  void translate (Real);
-
-  // junkme.
-  void set_offset (Real);
+  Grob * parent_;
 
-  bool valid_b () const { return valid_b_; }
-  bool empty_b() const { return empty_b_; }
-  Interval get_dim () const;
+  Dimension_cache (Dimension_cache const&);
+  Dimension_cache ();
+  void init ();
 };