lilypond-manuals.css: edit color scheme and some spacing

[lilypond.git] / lily / box.cc

diff --git a/lily/box.cc b/lily/box.cc
index f91069b7663d56feb9c51603ed0199c16e6f9216..6569493419da6a66c44077feab15ea5297c46ee9 100644 (file)
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--2015 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
@@ -23,7 +23,8 @@ void
 Box::translate (Offset o)
 {
   for (Axis i = X_AXIS; i < NO_AXES; incr (i))
-    interval_a_[i] += o[i];
+    if (!is_empty (i))
+      interval_a_[i] += o[i];
 }
 
 void
@@ -131,21 +132,5 @@ Box::print ()
 
 /****************************************************************/
 
-#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;
-}
+const char * const Box::type_p_name_ = "ly:box?";