X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=fad61b1ad381e33ddbdc3f164f08b0757935d6f6;hb=be65b81068e99ed855334f332c3176d8b4942a11;hp=811858e4bbaedf577f28ac02bc9bcce1481ea129;hpb=667d9bdb6227dd10819599c6d069a5eeb67eedd7;p=lilypond.git

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 811858e4bb..fad61b1ad3 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,26 +1,45 @@
+/*
+  misc.hh -- declare miscellaneous functions.
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #ifndef MISC_HH
 #define MISC_HH
 
-#include <stdlib.h>
+#include <cstdlib>
+using namespace std;
 
-#include "real.hh"
-#include "array.hh"
+#include "std-vector.hh"
 #include "interval.hh"
 
-double log_2 (double x) ;
+double log_2 (double x);
 int intlog2 (int d);
 
 inline int
 sign (int i)
 {
-  if (i<0)
+  if (i < 0)
     return -1;
   else if (i)
     return 1;
   else return 0;
 }
 
+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;
+}
+
+Real directed_round (Real f, Direction d);
 
+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);
 
 #endif