input/regression/bookparts.ly fails at PDF conversion stage

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 0fa4a9024006b4e24b0fe0f00e824fc65538dd86..77fbb2137489cb55ed16fe04a205200958a7a381 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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -19,15 +19,20 @@
 */
 
 #include "misc.hh"
+#include "offset.hh"
 #include "warn.hh"
 
+using std::string;
+using std::vector;
+
 /*
   Return the 2-log, rounded down
 */
 int
 intlog2 (int d)
 {
-  assert (d);
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
   int i = 0;
   while ((d != 1))
     {
@@ -62,7 +67,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 std::max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
 /*
@@ -75,7 +80,7 @@ convex_amplifier (Real standard_x, Real increase_factor, Real x)
 }
 
 string
-camel_case_to_lisp_identifier (string in)
+camel_case_to_lisp_identifier (const string &in)
 {
   vector<char> out;
 
@@ -94,23 +99,3 @@ camel_case_to_lisp_identifier (string in)
 
   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;
-}