X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=773e4ecad83c4e9d7053af8cebe1f129122b6c0d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=92dece88e10635550aa7dbfd6b9a54dbc589ef2f;hpb=b7a0cffbf9d1069860368f289a5b50e9d1d90ba8;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 92dece88e1..773e4ecad8 100644
--- 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--2009 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,8 +18,10 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <complex>
 
 #include "misc.hh"
+#include "offset.hh"
 #include "warn.hh"
 
 /*
@@ -28,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))
     {
@@ -55,13 +58,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 +70,48 @@ 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)
+camel_case_to_lisp_identifier (const 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)
+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));
 }