Run `make grand-replace'.

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

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index c34f1094a8abfa1b632c831c2fcadc74d0826efb..088feb91c78cbfe2eb90d47ed731411115c87d01 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -3,7 +3,7 @@
 
   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
@@ -12,7 +12,7 @@
 #include <cstdlib>
 using namespace std;
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "interval.hh"
 
 double log_2 (double x);
@@ -28,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)
 {
@@ -39,5 +37,9 @@ linear_interpolate (Real x, Real x1, Real x2, Real y1, Real 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