From: fred Date: Sun, 24 Mar 2002 19:56:31 +0000 (+0000) Subject: lilypond-0.1.18 X-Git-Tag: release/1.5.59~3958 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=02c33129da0401a2a0db38b5e7f9a43c9471de14;p=lilypond.git lilypond-0.1.18 --- diff --git a/lily/include/boxes.hh b/lily/include/boxes.hh index 45490033bd..0e5addc8af 100644 --- a/lily/include/boxes.hh +++ b/lily/include/boxes.hh @@ -12,28 +12,20 @@ #include "axes.hh" struct Box { - Interval interval_a_[NO_AXES]; + 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) { - return interval_a_[a]; - } + 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) { - x().translate (o.x ()); - y().translate (o.y ()); - } - - /// smallest box enclosing #b# - void unite (Box b) { - x().unite (b.x ()); - y().unite (b.y ()); - } - Box(); - Box (Interval ix, Interval iy); + void translate (Offset o); + /// smallest box enclosing #b# + void unite (Box b); + Box(); + Box (Interval ix, Interval iy); };