X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=7af00698f29af01deddb596c09caeaeb8e4b9894;hb=87aec4a93a0fe08275dd6cce6961dd9f80f581d1;hp=ee5dd51fda048d1b96167d4a4167d7035b506a27;hpb=eb87f600313f2d56a8708e5624b7bc7ec7acf1ff;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index ee5dd51fda..7af00698f2 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2010 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 "std-string.hh"
+#include "warn.hh"
 
 /*
   Return the 2-log, rounded down
@@ -35,37 +46,74 @@ log_2 (double x)
   return log (x) / log (2.0);
 }
 
-Array<std::string>
-split_string (std::string s, char c)
+Real
+directed_round (Real f, Direction d)
 {
-  Array<std::string> rv;
-  while (s.length ())
-    {
-      ssize i = s.find (c);
-
-      if (i == 0)
-	{
-	  s = s.substr (1, s.length () -1);
-	  continue;
-	}
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
+}
 
-      if (i == NPOS)
-	i = s.length ();
 
-      rv.push (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);
 }
 
-
+/*
+  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;
+}
+
+vsize
+utf8_char_len (char current)
+{
+  vsize char_len = 1;
+
+  // U+10000 - U+10FFFF
+  if ((current & 0xF0) == 0xF0)
+    char_len = 4;
+  // U+0800 - U+FFFF
+  else if ((current & 0xE0) == 0xE0)
+    char_len = 3;
+  // U+0080 - U+07FF
+  else if ((current & 0xC0) == 0xC0)
+    char_len = 2;
+  else if (current & 0x80)
+    programming_error ("invalid UTF-8 string");
+
+  return char_len;
+}