X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=b930fd521a50e4eb2c93d69736591cac7a7b402e;hb=d59856c2469b4b1e7f18a4ec9c5c0da4107f9de3;hp=0cfd68a1d4cc1e3d8a920fc2d189a1942dc5f1b9;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 0cfd68a1d4..b930fd521a 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,15 +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--2005 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.
+
+  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 "string.hh"
+#include "offset.hh"
+#include "warn.hh"
 
 /*
   Return the 2-log, rounded down
@@ -17,7 +28,8 @@
 int
 intlog2 (int d)
 {
-  assert (d);
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
   int i = 0;
   while ((d != 1))
     {
@@ -35,31 +47,6 @@ log_2 (double x)
   return log (x) / log (2.0);
 }
 
-Array<String>
-split_string (String s, char c)
-{
-  Array<String> rv;
-  while (s.length ())
-    {
-      int i = s.index (c);
-
-      if (i == 0)
-	{
-	  s = s.nomid_string (0, 1);
-	  continue;
-	}
-
-      if (i < 0)
-	i = s.length ();
-
-      rv.push (s.cut_string (0, i));
-      s = s.nomid_string (0, i);
-    }
-
-  return rv;
-}
-
-
 Real
 directed_round (Real f, Direction d)
 {
@@ -69,3 +56,43 @@ directed_round (Real f, Direction d)
     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);
+}
+
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter.
+ */
+Real
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
+{
+  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;
+}