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 a85b43ae57f0247ede586213ebdba3242c5e2b50..aa49a697a6e990bac32fc78e76cd3ace09dd66ef 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -9,7 +9,6 @@
 
 
 #include "misc.hh"
-#include "string.hh"
 
 /*
   Return the 2-log, rounded down
@@ -35,37 +34,47 @@ log_2 (double x)
   return log (x) / log (2.0);
 }
 
-Array<String>
-split_string (String s, char c)
+Real
+directed_round (Real f, Direction d)
 {
-  Array<String> rv;
-  while (s.length ())
-    {
-      int i = s.index (c);
-
-      if (i == 0)
-       {
-         s = s.nomid_string (0, 1);
-         continue;
-       }
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
+}
 
-      if (i < 0)
-       i = s.length ();
 
-      rv.push (s.cut_string (0, i));
-      s = s.nomid_string (0, i);
-    }
 
-  return rv;
+/*
+   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);
 }
 
 
-Real
-directed_round (Real f, Direction d)
+string
+camel_case_to_lisp_identifier (string in)
 {
-  if (d < 0)
-    return floor (f);
-  else
-    return ceil (f);
+  vector<char> out;
+  
+  /* don't add '-' before first character */
+  out.push_back (tolower (in[0]));
+    
+  for (size_t inpos = 1; inpos < in.size (); inpos++)
+    {
+      if (isupper (in[inpos]))
+       out.push_back ('-');
+      out.push_back (tolower (in[inpos]));
+    }
+  
+  string result (&out[0], out.size ());
+  replace_all (result, '_', '-');
+
+  return result;
 }