Merge branch 'issue4032'

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

diff --git a/lily/include/box.hh b/lily/include/box.hh
index fc8eda7bec01e5b3dd8bd98f2d71ade0397443c6..685fbcff75a61fe3912134c75dfeaf4e23581df9 100644 (file)
--- a/lily/include/box.hh
+++ b/lily/include/box.hh
@@ -7,29 +7,38 @@
 
 #include "interval.hh"
 #include "offset.hh"
+#include "smobs.hh"
 
-struct Box
+class Box
 {
   Interval interval_a_[NO_AXES];
-
+  DECLARE_SIMPLE_SMOBS (Box);
+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 &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);
 };
 
+
 #endif