* python/convertrules.py (conv): warning on \tempo{}

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 5ee56d8045d50d573af86298729445659663e40d..e7c3063df234c6ce79bca6185bf9358e837e401b 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,43 +3,55 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.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) {
-    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);
+log_2 (double x)
+{
+  return log (x) / log (2.0);
 }
 
-#if 1
-Interval
-itemlist_width(const Array<Item*> &its)
+Real
+directed_round (Real f, Direction d)
 {
-    Interval iv ;
-    iv.set_empty();
-     
-    for (int j =0; j < its.size(); j++){
-       iv.unite (its[j]->width());
-
-    }
-    return iv;
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
 }
 
-#endif
+
+
+/*
+   0 at threshold,  1 at 0, with 1/x falloff.
+ */
+Real
+peak_around (Real epsilon,  Real threshold, Real x)
+{
+  if (x < 0)
+    return 1.0;
+  return max (- epsilon * (x - threshold) / ((x + epsilon)  * threshold), 0.0);
+}