Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / include / box.hh

diff --git a/lily/include/box.hh b/lily/include/box.hh
index 39aa77eeb3b88824b10d4f35a1316794258df8e6..d4a8655a429b0cf965364132871cf2b7f9c3b054 100644 (file)
--- a/lily/include/box.hh
+++ b/lily/include/box.hh
@@ -1,32 +1,43 @@
 /*
-    some 2D geometrical concepts
+  some 2D geometrical concepts
 */
 
 #ifndef BOXES_HH
 #define BOXES_HH
 
-#include "flower-proto.hh"
-#include "real.hh"
 #include "interval.hh"
 #include "offset.hh"
-#include "axes.hh"
+#include "smobs.hh"
 
-
-struct Box {
+class Box : public Simple_smob<Box>
+{
+public:
+  static const char * const type_p_name_;
+private:
   Interval interval_a_[NO_AXES];
-    
+public:
   Interval &x () {return interval_a_[X_AXIS]; }
-  Interval &y (){ return interval_a_[Y_AXIS]; }
-  Interval x () const{ return interval_a_[X_AXIS]; }
-  Interval y () const{return interval_a_[Y_AXIS]; }
-  Interval operator[] (Axis a) const;
-  Interval &operator[] (Axis a);
-    
+  Interval &y () { return interval_a_[Y_AXIS]; }
+  Interval x () const { return interval_a_[X_AXIS]; }
+  Interval y () const {return interval_a_[Y_AXIS]; }
+  Interval operator [] (Axis a) const;
+  Interval &operator [] (Axis a);
+  Real area () const;
+  bool is_empty () const;
+  bool is_empty (Axis a) const;
+
+  Offset center () const;
+
   void translate (Offset o);
+
   /// smallest box enclosing #b#
   void set_empty ();
+  void add_point (Offset);
+  void widen (Real x, Real y);
   void scale (Real r);
   void unite (Box b);
+  void intersect (Box b);
+  void print ();
   Box ();
   Box (Interval ix, Interval iy);
 };