X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbox.cc;h=c933c1bc05fdde4c99e0a19ae435b45e90573f18;hb=5e24aa455cac67a7e7b42a0539fcbd8c235417bf;hp=5ec4a9f03949234f7ce87d003b2f6f157b8a0eb9;hpb=10c51c532f5fbe5ca438e311bc10f03d2e750325;p=lilypond.git diff --git a/lily/box.cc b/lily/box.cc index 5ec4a9f039..c933c1bc05 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2004 Han-Wen Nienhuys + (c) 1996--2005 Han-Wen Nienhuys */ #include "box.hh" @@ -12,29 +12,29 @@ void Box::translate (Offset o) { - for (Axis i=X_AXIS; i < NO_AXES; incr (i)) + for (Axis i = X_AXIS; i < NO_AXES; incr (i)) interval_a_[i] += o[i]; } void Box::unite (Box b) { - for (Axis i=X_AXIS; i < NO_AXES; incr (i)) + for (Axis i = X_AXIS; i < NO_AXES; incr (i)) interval_a_[i].unite (b[i]); } /** - Initialize to empty. - */ + Initialize to empty. +*/ Box::Box () -{ +{ } void Box::set_empty () { interval_a_[X_AXIS].set_empty (); - interval_a_[Y_AXIS].set_empty (); + interval_a_[Y_AXIS].set_empty (); } Box::Box (Interval ix, Interval iy) @@ -44,13 +44,13 @@ Box::Box (Interval ix, Interval iy) } Interval & -Box::operator[] (Axis a) +Box::operator [] (Axis a) { return interval_a_[a]; } Interval -Box::operator[] (Axis a)const +Box::operator [] (Axis a) const { return interval_a_[a]; } @@ -66,15 +66,16 @@ void Box::add_point (Offset o) { interval_a_[X_AXIS].add_point (o[X_AXIS]); - interval_a_[Y_AXIS].add_point (o[Y_AXIS]); + interval_a_[Y_AXIS].add_point (o[Y_AXIS]); } Offset Box::center () const { return Offset (interval_a_[X_AXIS].center (), - interval_a_[Y_AXIS].center ()); + interval_a_[Y_AXIS].center ()); } + void Box::widen (Real x, Real y) {