X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=7af00698f29af01deddb596c09caeaeb8e4b9894;hb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;hp=6837df0d744838c4eff0978318902ff3d6324e6c;hpb=2e613f5d4d7232507698d3a717576f46920a988b;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 6837df0d74..7af00698f2 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,14 +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--2007 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 "warn.hh"
 
 /*
   Return the 2-log, rounded down
@@ -53,7 +65,7 @@ peak_around (Real epsilon,  Real threshold, Real x)
 {
   if (x < 0)
     return 1.0;
-  return max (- epsilon * (x - threshold) / ((x + epsilon)  * threshold), 0.0);
+  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
 /*
@@ -71,18 +83,37 @@ camel_case_to_lisp_identifier (string in)
   vector<char> out;
   
   /* don't add '-' before first character */
-  out.push_back (tolower (in[0]));
+  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 (tolower (in[inpos]));
+      out.push_back ( char(tolower (in[inpos])));
     }
   
   string result (&out[0], out.size ());
-  replace_all (result, '_', '-');
+  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;
+}