release: 1.3.142

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 8523cddd86e76a5e30271619b74e7b83513fc2c4..45a055f8a6bb4841b2028da33e4309683573dd7f 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,28 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
 #include "misc.hh"
 
+/*
+  Return the 2-log, rounded down 
+ */
 int
-intlog2(int d)
+intlog2 (int d)
 {
+  assert (d);
   int i=0;
-  while (!(d&1)) 
+  while ((d != 1)) 
     {
-       d/= 2;
-       i++;
+      d/= 2;
+      i++;
     }
-  assert (!(d/2));
+  
+  assert (! (d/2));
   return i;
 }
 
 double
-log_2(double x)
+log_2 (double x)
 {
   return log (x)  /log (2.0);
 }
@@ -43,7 +48,7 @@ quantise_iv (Array<Real> positions, Real x)
   Real period = positions.top () - positions[0];
   
   int n =  int ((x - positions[0]) / period);
-  Real frac = (x - positions[0] ) -  n * period;
+  Real frac = (x - positions[0]) -  n * period;
 
   while (frac < 0)
     {
@@ -52,7 +57,7 @@ quantise_iv (Array<Real> positions, Real x)
     }
   
   Real px = frac + positions[0];
-  assert ( positions[0] <= px && px <= positions.top ());
+  assert (positions[0] <= px && px <= positions.top ());
   int i=0;
   for (; i < positions.size () - 1; i++)
     {