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

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index fa7555d086..b294b3188f 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,9 +1,20 @@
 /*
-  misc.hh -- declare miscellaneous functions.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef MISC_HH
@@ -28,17 +39,32 @@ sign (int i)
   else return 0;
 }
 
+inline int
+shift_left (int value, int shiftamount)
+{
+  if (shiftamount < 0) return (value >> -shiftamount);
+  else return (value << shiftamount);
+}
+
 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);
-string camel_case_to_lisp_identifier (string in);
+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 (const string &in);
 
 #endif