X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=6cafa2b50b3669fac258e5d2b1d3e51cdb737db1;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=649f72c900d98904cbc94b1b4c80a49e21273472;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 649f72c900..6cafa2b50b 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,38 +1,79 @@
 /*
-  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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2004 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 "misc.hh"
+#include "offset.hh"
+#include "warn.hh"
+
+double
+log_2 (double x)
+{
+  return log (x) / log (2.0);
+}
 
-#include <math.h>
+Real
+directed_round (Real f, Direction d)
+{
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
+}
 
 /*
-  Return the 2-log, rounded down 
+   0 at threshold,  1 at 0, with 1/x falloff.
  */
-int
-intlog2 (int d)
+Real
+peak_around (Real epsilon, Real threshold, Real x)
 {
-  assert (d);
-  int i = 0;
-  while ((d != 1)) 
-    {
-      d /= 2;
-      i++;
-    }
-  
-  assert (! (d/2));
-  return i;
+  if (x < 0)
+    return 1.0;
+  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
-double
-log_2 (double x)
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter.
+ */
+Real
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-  return log (x)  /log (2.0);
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0);
 }
 
- 
+string
+camel_case_to_lisp_identifier (const string &in)
+{
+  vector<char> out;
+
+  /* don't add '-' before first character */
+  out.push_back (char (tolower (in[0])));
+
+  for (size_t inpos = 1; inpos < in.size (); inpos++)
+    {
+      if (isupper (in[inpos]))
+        out.push_back ('-');
+      out.push_back ( char (tolower (in[inpos])));
+    }
+
+  string result (&out[0], out.size ());
+  replace_all (&result, '_', '-');
+
+  return result;
+}