X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=801266d79b07ff6a8114c572b00f29f51a186259;hb=2628c3c9950b6abbb7bd74747726f8c01340e032;hp=d9c56c4a8da2abd3a2fe5c7b7b4bc13456f2db8e;hpb=fd7e615444cf58b38283a59b56d3457c07778397;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index d9c56c4a8d..801266d79b 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,64 +1,96 @@
 /*
-  misc.cc -- implement various stuff
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-    Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <math.h>
 #include "misc.hh"
+#include "warn.hh"
 
+/*
+  Return the 2-log, rounded down
+*/
 int
-intlog2(int d)
+intlog2 (int d)
 {
-  int i=0;
-  while (!(d&1)) 
+  assert (d);
+  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);
+}
+
+Real
+directed_round (Real f, Direction d)
 {
-  return log (x)  /log (2.0);
+  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);
+}
 
-static int
-comp (Real const &a, Real const &b)
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter.
+ */
+Real
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-  return sign (a-b);
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.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];
-  
-  int n =  int ((x - positions[0]) / period);
-  Real frac = (x - positions[0] ) -  n * period;
+  vector<char> out;
 
-  while (frac < 0)
-    {
-      frac += period;
-      n --;
-    }
-  
-  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])));
     }
 
-  return Interval (positions[i] , positions[i+1]) + period * n;
+  string result (&out[0], out.size ());
+  replace_all (&result, '_', '-');
+
+  return result;
 }