Imported Upstream version 2.16.0

[lilypond.git] / lily / include / misc.hh

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index f36e7cecc60de740ebd1f95eb22900f7ea8387eb..b70d2c2ce2e2d15dad2b95973af7cf47fca62007 100644 (file)
--- 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--2012 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,20 @@ 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);
+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);
 
 #endif