X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbox.cc;h=5c2af4d317b41f871b215450cd1925e8ce7a064f;hb=97047e999fd00f4981bad49eb4a45f6952bfd1e3;hp=03be5e9a0ab69f830553eeedb91f5d89a88ea01e;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/box.cc b/lily/box.cc
index 03be5e9a0a..5c2af4d317 100644
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -3,38 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "box.hh"
-#include "array.hh"
 
 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.
- */
 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 +40,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];
 }
@@ -61,3 +57,45 @@ Box::scale (Real s)
   interval_a_[X_AXIS] *= s;
   interval_a_[Y_AXIS] *= s;
 }
+
+void
+Box::add_point (Offset o)
+{
+  interval_a_[X_AXIS].add_point (o[X_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 ());
+}
+
+void
+Box::widen (Real x, Real y)
+{
+  interval_a_[X_AXIS].widen (x);
+  interval_a_[Y_AXIS].widen (y);
+}
+
+/****************************************************************/
+
+#include "ly-smobs.icc"
+
+IMPLEMENT_SIMPLE_SMOBS (Box);
+IMPLEMENT_TYPE_P (Box, "ly:box?");
+IMPLEMENT_DEFAULT_EQUAL_P (Box);
+
+SCM
+Box::mark_smob (SCM /* x */)
+{
+  return SCM_EOL;
+}
+
+int
+Box::print_smob (SCM /* x */, SCM p, scm_print_state*)
+{
+  scm_puts ("#<Box>", p);
+  return 1;
+}