X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=e33d8363819a658267d0e15e62868fb1fe29e631;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=34b28a118f90394002e01fb492a85c3dbeb94796;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git diff --git a/lily/include/misc.hh b/lily/include/misc.hh index 34b28a118f..e33d836381 100644 --- a/lily/include/misc.hh +++ b/lily/include/misc.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2006 Han-Wen Nienhuys + (c) 2005--2009 Han-Wen Nienhuys */ #ifndef MISC_HH @@ -12,7 +12,7 @@ #include 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 split_string (std::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