X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=b294b3188f0c5ac99885f587e9fa9dc59a579984;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f36e7cecc60de740ebd1f95eb22900f7ea8387eb;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index f36e7cecc6..b294b3188f 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ sign (int i)
 inline int
 shift_left (int value, int shiftamount)
 {
- if (shiftamount < 0) return (value >> -shiftamount); 
+  if (shiftamount < 0) return (value >> -shiftamount);
   else return (value << shiftamount);
 }
 
@@ -50,15 +50,21 @@ inline Real
 linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
 {
   return (x2 - x) / (x2 - x1) * y1
-    + (x - x1) / (x2 - x1) * y2;
+         + (x - x1) / (x2 - x1) * y2;
+}
+
+inline Real
+normalize (Real x, Real x1, Real x2)
+{
+  return (x - x1) / (x2 - x1);
 }
 
 Real directed_round (Real f, Direction d);
 
-Real peak_around (Real epsilon,  Real threshold, Real x);
+Offset get_point_in_y_direction (Offset orig, Real slope, Real dist, Direction dir);
+Real peak_around (Real epsilon, Real threshold, Real x);
 Real convex_amplifier (Real standard_x, Real increase_factor, Real x);
-string camel_case_to_lisp_identifier (string in);
-vsize utf8_char_len (char);
+string camel_case_to_lisp_identifier (const string &in);
 
 #endif