* lily/score.cc (default_rendering): clean protection.

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 093af7f0d4b89b80264671dd2eaab4c85961be2c..bd7cce55c7e4fc887e3985d18c5ba20ec107d225 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,53 +1,36 @@
-#include <math.h>
-
-#include "item.hh"
-#include "misc.hh"
-#include "glob.hh"
-#include "moment.hh"
+/*
+  misc.cc -- implement various stuff
 
+  source file of the GNU LilyPond music typesetter
 
-// depreciated, see struct Duration*
-Moment
-wholes(int dur, int dots)
-{
-    if (!dur)
-       return 0;
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+    Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-    Moment f = Rational(1)/Moment(dur);
-    Moment delta = f;
+#include <math.h>
+#include "misc.hh"
 
-    while (dots--) {
-       delta /= 2.0;
-       f += delta;
-    }
-    return f;    
-}
+/*
+  Return the 2-log, rounded down 
+ */
 int
-intlog2(int d) {
-    int i=0;
-    while (!(d&1)) {
-       d/= 2;
-       i++;
+intlog2 (int d)
+{
+  assert (d);
+  int i=0;
+  while ((d != 1)) 
+    {
+      d /= 2;
+      i++;
     }
-    assert(!(d/2));
-    return i;
+  
+  assert (! (d/2));
+  return i;
 }
 
 double
-log_2(double x) {
-    return log(x)  /log(2.0);
-}
-
-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);
 }