release: 1.3.140

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

diff --git a/lily/include/box.hh b/lily/include/box.hh
index b26c6e36955b0c85fab3f7f083414014dfd11916..3c0b533ffb19c7adf763b7f0efff868f8bbd218a 100644 (file)
--- a/lily/include/box.hh
+++ b/lily/include/box.hh
@@ -5,27 +5,30 @@
 #ifndef BOXES_HH
 #define BOXES_HH
 
-#include "fproto.hh"
+#include "flower-proto.hh"
 #include "real.hh"
 #include "interval.hh"
 #include "offset.hh"
 #include "axes.hh"
 
 
-struct Box {
+struct Box
+{
   Interval interval_a_[NO_AXES];
     
-  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 &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);
     
   void translate (Offset o);
   /// smallest box enclosing #b#
+  void set_empty ();
+  void scale (Real r);
   void unite (Box b);
-  Box();
+  Box ();
   Box (Interval ix, Interval iy);
 };