X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmisc.cc;h=e7c3063df234c6ce79bca6185bf9358e837e401b;hb=1c43641c240c896489997913515211668cde7e2c;hp=093af7f0d4b89b80264671dd2eaab4c85961be2c;hpb=daee8243ff1c66bc714455a2d265ab02f03546ec;p=lilypond.git

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