Run `make grand-replace'.

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

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index b40e936e9ef67dce20abca556281d629190a8b9a..088feb91c78cbfe2eb90d47ed731411115c87d01 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -3,15 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MISC_HH
 #define MISC_HH
 
 #include <cstdlib>
+using namespace std;
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "interval.hh"
 
 double log_2 (double x);
@@ -27,8 +28,6 @@ sign (int i)
   else return 0;
 }
 
-Array<String> split_string (String s, char c);
-
 inline Real
 linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
 {
@@ -36,5 +35,11 @@ linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
     + (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