Imported Upstream version 2.18.0

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

diff --git a/lily/include/box.hh b/lily/include/box.hh
index af5695b3bce8f64978a623c4d16b56dea054b7a4..b0f899431188bf4d653ac448afbb6e074efdd6fa 100644 (file)
--- a/lily/include/box.hh
+++ b/lily/include/box.hh
@@ -20,6 +20,9 @@ public:
   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;
 
@@ -31,9 +34,12 @@ public:
   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);
 };
 
+DECLARE_UNSMOB (Box, box);
+
 #endif