X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbox.cc;h=648c7f7da216d0dc3c05d719e054373f38ac48a0;hb=990bb7331e98449aaeb5b922145b9f1f4f81944a;hp=5201ca125c922f72f9fea94f9cb712eba896f3db;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/box.cc b/lily/box.cc
index 5201ca125c..648c7f7da2 100644
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -1,15 +1,23 @@
 /*
-  box.cc -- implement Box
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-#include "ly-smobs.icc"
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "box.hh"
-#include "std-vector.hh"
 
 void
 Box::translate (Offset o)
@@ -25,9 +33,6 @@ Box::unite (Box b)
     interval_a_[i].unite (b[i]);
 }
 
-/**
-   Initialize to empty.
-*/
 Box::Box ()
 {
 }
@@ -75,7 +80,7 @@ Offset
 Box::center () const
 {
   return Offset (interval_a_[X_AXIS].center (),
-		 interval_a_[Y_AXIS].center ());
+                 interval_a_[Y_AXIS].center ());
 }
 
 void
@@ -85,21 +90,23 @@ Box::widen (Real x, Real y)
   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)
+Box::mark_smob (SCM /* x */)
 {
-  (void)x;
   return SCM_EOL;
 }
 
 int
-Box::print_smob (SCM x, SCM p, scm_print_state*)
+Box::print_smob (SCM /* x */, SCM p, scm_print_state *)
 {
-  (void)x;
   scm_puts ("#<Box>", p);
   return 1;
 }