Run `make grand-replace'.

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

diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh
index e63ffc9ee2561f0e567cd3ea928a96ec7fc33b78..f3b7b88eaab8aac406b851e1457818c11604e3ab 100644 (file)
--- a/lily/include/dimension-cache.hh
+++ b/lily/include/dimension-cache.hh
@@ -1,90 +1,33 @@
-/*   
+/*
   dimension-cache.hh -- declare Dimension_cache
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef DIMENSION_CACHE_HH
 #define DIMENSION_CACHE_HH
 
-#include "interval.hh"
-#include "real.hh"
 #include "lily-proto.hh"
-#include "parray.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. 
- */
+/*
+  XY offset/refpoint/extent structure.
+*/
 class Dimension_cache
 {
-  bool valid_b_;
-  /** Is this element dimensionless?.
-    This is private to guarantee correctness of the cache
-   */
-  bool empty_b_;
-  Interval dim_;
-  /**
-    The offset wrt. to the center of #parent_l_#
-   */
-
-  Real extra_offset_;
-  Real basic_offset_;
-  
-  bool off_valid_b_;
-
-  
-  Graphical_element *elt_l_;
-  Dim_cache_callback callback_l_;
-  friend class Graphical_element;
-
+  Interval *extent_;
+  Real *offset_;
+  Grob *parent_;
   void init ();
-public:
-  Offset_cache_callback off_callback_l_;
+  void clear ();
   
-  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 ();
+  friend class Grob;
   
-  Dimension_cache(Dimension_cache const&);
+  Dimension_cache (Dimension_cache const &);
+  ~Dimension_cache ();
   Dimension_cache ();
-
-
-  /**
-     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)
-   */
-  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);
-
-  bool valid_b () const { return valid_b_; }
-  bool empty_b() const { return empty_b_; }
-  Interval get_dim () const;
 };
 
-
 #endif /* DIMENSION_CACHE_HH */