* SConstruct: Further development.

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index d150d557926ecc4ecd7293a03659cd7c9666d81f..bd7cce55c7e4fc887e3985d18c5ba20ec107d225 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,45 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+    Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
-
-#include "item.hh"
 #include "misc.hh"
-#include "moment.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) {
-  return log (x)  /log (2.0);
-}
-
-#if 1
-Interval
-itemlist_width (const Array<Item*> &its)
+log_2 (double x)
 {
-  Interval iv ;
-  iv.set_empty();
-   
-  for (int j =0; j < its.size(); j++)
-    {
-       iv.unite (its[j]->width());
-
-    }
-  return iv;
+  return log (x)  /log (2.0);
 }
 
-#endif