Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / box.cc

diff --git a/lily/box.cc b/lily/box.cc
index bd15a691f9aeeda9a5483874d54e3d068dc05dbf..f35f935204dd68afbbaec80312c1f3ee4085f7fc 100644 (file)
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "box.hh"
-#include "array.hh"
 
 void
 Box::translate (Offset o)
@@ -23,9 +22,6 @@ Box::unite (Box b)
     interval_a_[i].unite (b[i]);
 }
 
-/**
-   Initialize to empty.
-*/
 Box::Box ()
 {
 }
@@ -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];
 }
@@ -82,3 +78,24 @@ 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;
+}