X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbox.cc;h=e44f166dbce2800bd31ce04aa21b3fb079c6894c;hb=69ff5bb805573839c689ad9d97ef79456dc66ed5;hp=f82325d20bc8b7650db5ca14f69426dbc2dc8ef1;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/box.cc b/lily/box.cc
index f82325d20b..e44f166dbc 100644
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -3,54 +3,50 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2007 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()
-{        
+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)
 {
-  x() = ix;
-  y() = iy;
+  x () = ix;
+  y () = 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,47 @@ 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)
+{
+  (void)x;
+  return SCM_EOL;
+}
+
+int
+Box::print_smob (SCM x, SCM p, scm_print_state*)
+{
+  (void)x;
+  scm_puts ("#<Box>", p);
+  return 1;
+}