Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 45a055f8a6bb4841b2028da33e4309683573dd7f..aa49a697a6e990bac32fc78e76cd3ace09dd66ef 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,67 +3,78 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-    Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <math.h>
+
 #include "misc.hh"
 
 /*
-  Return the 2-log, rounded down 
- */
+  Return the 2-log, rounded down
+*/
 int
 intlog2 (int d)
 {
   assert (d);
-  int i=0;
-  while ((d != 1)) 
+  int i = 0;
+  while ((d != 1))
     {
-      d/= 2;
+      d /= 2;
       i++;
     }
-  
-  assert (! (d/2));
+
+  assert (! (d / 2));
   return i;
 }
 
 double
 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)
+
+string
+camel_case_to_lisp_identifier (string in)
 {
-  positions.sort (comp);
-  Real period = positions.top () - positions[0];
+  vector<char> out;
   
-  int n =  int ((x - positions[0]) / period);
-  Real frac = (x - positions[0]) -  n * period;
-
-  while (frac < 0)
+  /* don't add '-' before first character */
+  out.push_back (tolower (in[0]));
+    
+  for (size_t inpos = 1; inpos < in.size (); inpos++)
     {
-      frac += period;
-      n --;
+      if (isupper (in[inpos]))
+       out.push_back ('-');
+      out.push_back (tolower (in[inpos]));
     }
   
-  Real px = frac + positions[0];
-  assert (positions[0] <= px && px <= positions.top ());
-  int i=0;
-  for (; i < positions.size () - 1; i++)
-    {
-      if (positions[i] <= px && px <= positions[i+1])
-       break; 
-    }
+  string result (&out[0], out.size ());
+  replace_all (result, '_', '-');
 
-  return Interval (positions[i] , positions[i+1]) + period * n;
+  return result;
 }
+