Run grand replace for 2015.

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 0fa4a9024006b4e24b0fe0f00e824fc65538dd86..773e4ecad83c4e9d7053af8cebe1f129122b6c0d 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
@@ -18,7 +18,10 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <complex>
+
 #include "misc.hh"
+#include "offset.hh"
 #include "warn.hh"
 
 /*
@@ -27,7 +30,8 @@
 int
 intlog2 (int d)
 {
-  assert (d);
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
   int i = 0;
   while ((d != 1))
     {
@@ -75,7 +79,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;
 
@@ -95,22 +99,19 @@ camel_case_to_lisp_identifier (string in)
   return result;
 }
 
-vsize
-utf8_char_len (char current)
+Offset
+get_point_in_y_direction (Offset orig, Real slope, Real dist, Direction dir)
 {
-  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;
+  if (slope == infinity_f)
+    return orig + Offset (dir * dist, 0.0);
+
+  Real x = slope == 0.0 ? 1.0 * dir : 1.0 * sign (slope) * dir;
+  Real y = slope * x;
+  Real angle = atan2 (y, x);
+
+  complex<Real> orig_c (orig[X_AXIS], orig[Y_AXIS]);
+  complex<Real> to_move = polar (dist, angle);
+  complex<Real> res = orig_c + to_move;
+
+  return Offset (real (res), imag (res));
 }