Imported Upstream version 2.16.0

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 4b7dc472ed6fc1312522683de8321ba159645a6a..801266d79b07ff6a8114c572b00f29f51a186259 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,7 +18,6 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #include "misc.hh"
 #include "warn.hh"
 
@@ -55,13 +54,11 @@ 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)
+peak_around (Real epsilon, Real threshold, Real x)
 {
   if (x < 0)
     return 1.0;
@@ -69,51 +66,31 @@ peak_around (Real epsilon,  Real threshold, Real x)
 }
 
 /*
-  0 at 0,  1 at standard_x, and increasing thereafter. 
+  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); 
+  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])));
+        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;
-}