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

diff --git a/lily/misc.cc b/lily/misc.cc
index 5c3293073c..ee55a00c7e 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,13 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
 #include "misc.hh"
-#include "std-string.hh"
 
 /*
   Return the 2-log, rounded down
@@ -35,58 +34,55 @@ 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);
 }
 
-#if 0
-vector<string>
-split_string (string s, char c)
-{
-  vector<string> rv;
-  while (s.length ())
-    {
-      ssize i = s.find (c);
 
-      if (i == 0)
-	{
-	  s = s.substr (1, s.length () -1);
-	  continue;
-	}
 
-      if (i == NPOS)
-	i = s.length ();
-
-      rv.push_back (s.substr (0, i));
-      s = s.substr (i, s.length () - 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);
 }
-#endif
-
 
+/*
+  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;
 }