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

diff --git a/lily/misc.cc b/lily/misc.cc
index 0cfd68a1d4..ee55a00c7e 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
 #include "misc.hh"
-#include "string.hh"
 
 /*
   Return the 2-log, rounded down
@@ -35,37 +34,55 @@ 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);
 }
 
-
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter. 
+ */
 Real
-directed_round (Real f, Direction d)
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-  if (d < 0)
-    return floor (f);
-  else
-    return ceil (f);
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0); 
+}
+
+string
+camel_case_to_lisp_identifier (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;
 }