X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=088feb91c78cbfe2eb90d47ed731411115c87d01;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e659602e991497492d17a7611972426150918e2d;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index e659602e99..088feb91c7 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,40 +1,45 @@
+/*
+  misc.hh -- declare miscellaneous functions.
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2005--2008 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) ;
-int intlog2(int d);
+double log_2 (double x);
+int intlog2 (int d);
 
-#if 0
-				// defined in real.hh
 inline int
-abs (int i){
-    return (i < 0)?-i:i;
+sign (int i)
+{
+  if (i < 0)
+    return -1;
+  else if (i)
+    return 1;
+  else return 0;
 }
-#endif
 
-inline int
-sign (int i) {
-    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;
 }
 
-#ifndef STANDALONE
-#include "lily-proto.hh"
-Interval itemlist_width (const Array<Item*> &its);
-#endif
+Real directed_round (Real f, Direction d);
 
-void set_frobnify (void*, size_t);
-int get_lower_bound (Array<Real> const& positions, Real x);
-Slice get_bounds_slice (Array<Real> const& positions, Real x);
-Interval get_bounds_iv (Array<Real> const& positions, Real x);
-Interval quantise_iv (Array<Real> const& positions, Real period, 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);
 
 #endif