(LY_DEFINE): remove Protected_scm global variable.

[lilypond.git] / lily / simple-spacer.cc

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index 10758ff5bb0a09084a0d0b3922a080ca7a148b28..f31e6df4a3781c70d70affe2ae995bbaf6a211d8 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   TODO:
   - add support for different stretch/shrink constants?
 */
 
 #include <cstdio>
-#include <math.h>
 
 #include "libc-extension.hh"   // isinf
 #include "simple-spacer.hh"
@@ -134,9 +133,7 @@ Simple_spacer::active_blocking_force () const
   Real bf = -infinity_f;
   for (int i = 0; i < springs_.size (); i++)
     if (springs_[i].is_active_)
-      {
-       bf = max (bf, springs_[i].block_force_);
-      }
+      bf = max (bf, springs_[i].block_force_);
   return bf;
 }
 
@@ -356,9 +353,7 @@ Simple_spacer::add_spring (Real ideal, Real inverse_hooke)
     }
 
   if (!inverse_hooke)
-    {
-      desc.is_active_ = false;
-    }
+    desc.is_active_ = false;
   else
     {
       /*
@@ -387,13 +382,9 @@ Simple_spacer_wrapper::add_columns (Link_array<Grob> const &icols)
 
   for (int i = 0; i < icols.size (); i++)
     if (scm_is_pair (icols[i]->get_object ("between-cols")))
-      {
-       loose_cols_.push (icols[i]);
-      }
+      loose_cols_.push (icols[i]);
     else
-      {
-       cols.push (icols[i]);
-      }
+      cols.push (icols[i]);
 
   spaced_cols_ = cols;
   for (int i = 0; i < cols.size () - 1; i++)