X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=ee55a00c7ecb2478a04fabdb77682b6ce8689dde;hb=8574d4349026c4ac5a15a27c50e264bf548e29fb;hp=8597a8ce14636f2d0f4b3a70c8430975e384ba99;hpb=720c52ff5a022a6e28189d8d1126d22443c313b2;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 8597a8ce14..ee55a00c7e 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,63 +3,86 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-    Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.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)) 
+  int i = 0;
+  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);
+  return log (x) / log (2.0);
+}
+
+Real
+directed_round (Real f, Direction d)
+{
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
 }
 
 
-static int
-comp (Real const &a, Real const &b)
+
+/*
+   0 at threshold,  1 at 0, with 1/x falloff.
+ */
+Real
+peak_around (Real epsilon,  Real threshold, Real x)
 {
-  return sign (a-b);
+  if (x < 0)
+    return 1.0;
+  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
-Interval
-quantise_iv (Array<Real> positions, Real x)
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter. 
+ */
+Real
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-  positions.sort (comp);
-  Real period = positions.top () - positions[0];
-  
-  int n =  int ((x - positions[0]) / period);
-  Real frac = (x - positions[0] ) -  n * period;
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0); 
+}
 
-  while (frac < 0)
-    {
-      frac += period;
-      n --;
-    }
+string
+camel_case_to_lisp_identifier (string in)
+{
+  vector<char> out;
   
-  Real px = frac + positions[0];
-  assert ( positions[0] <= px && px <= positions.top ());
-  int i=0;
-  for (; i < positions.size () - 1; i++)
+  /* don't add '-' before first character */
+  out.push_back (char (tolower (in[0])));
+    
+  for (size_t inpos = 1; inpos < in.size (); inpos++)
     {
-      if (positions[i] <= px && px <= positions[i+1])
-	break; 
+      if (isupper (in[inpos]))
+	out.push_back ('-');
+      out.push_back ( char(tolower (in[inpos])));
     }
+  
+  string result (&out[0], out.size ());
+  replace_all (&result, '_', '-');
 
-  return Interval (positions[i] , positions[i+1]) + period * n;
+  return result;
 }
+