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

diff --git a/lily/misc.cc b/lily/misc.cc
index 5c3293073c..6cafa2b50b 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,33 +1,26 @@
 /*
-  misc.cc -- implement various stuff
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.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.
 
-#include "misc.hh"
-#include "std-string.hh"
+  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.
 
-/*
-  Return the 2-log, rounded down
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
-int
-intlog2 (int d)
-{
-  assert (d);
-  int i = 0;
-  while ((d != 1))
-    {
-      d /= 2;
-      i++;
-    }
 
-  assert (! (d / 2));
-  return i;
-}
+#include "misc.hh"
+#include "offset.hh"
+#include "warn.hh"
 
 double
 log_2 (double x)
@@ -35,58 +28,52 @@ log_2 (double x)
   return log (x) / log (2.0);
 }
 
-vector<string>
-split_string (string str, char c)
+Real
+directed_round (Real f, Direction d)
 {
-  vector<string> a;
-  ssize i = str.find (c);
-  while (i != NPOS)
-    {
-      string s = str.substr (0, i);
-      a.push_back (s);
-      while (str[++i] == c)
-	;
-      str = str.substr (i);
-      i = str.find (c);
-    }
-  if (str.length ())
-    a.push_back (str);
-  return a;
+  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);
 }
 
-#if 0
-vector<string>
-split_string (string s, char c)
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter.
+ */
+Real
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-  vector<string> rv;
-  while (s.length ())
-    {
-      ssize i = s.find (c);
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0);
+}
 
-      if (i == 0)
-	{
-	  s = s.substr (1, s.length () -1);
-	  continue;
-	}
+string
+camel_case_to_lisp_identifier (const string &in)
+{
+  vector<char> out;
 
-      if (i == NPOS)
-	i = s.length ();
+  /* don't add '-' before first character */
+  out.push_back (char (tolower (in[0])));
 
-      rv.push_back (s.substr (0, i));
-      s = s.substr (i, s.length () - i);
+  for (size_t inpos = 1; inpos < in.size (); inpos++)
+    {
+      if (isupper (in[inpos]))
+        out.push_back ('-');
+      out.push_back ( char (tolower (in[inpos])));
     }
 
-  return rv;
-}
-#endif
+  string result (&out[0], out.size ());
+  replace_all (&result, '_', '-');
 
-
-Real
-directed_round (Real f, Direction d)
-{
-  if (d < 0)
-    return floor (f);
-  else
-    return ceil (f);
+  return result;
 }
-