X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=f36e7cecc60de740ebd1f95eb22900f7ea8387eb;hb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;hp=34b28a118f90394002e01fb492a85c3dbeb94796;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 34b28a118f..f36e7cecc6 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,9 +1,20 @@
 /*
-  misc.hh -- declare miscellaneous functions.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef MISC_HH
@@ -12,7 +23,7 @@
 #include <cstdlib>
 using namespace std;
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "interval.hh"
 
 double log_2 (double x);
@@ -28,7 +39,12 @@ sign (int i)
   else return 0;
 }
 
-Array<std::string> split_string (std::string s, char c);
+inline int
+shift_left (int value, int shiftamount)
+{
+ if (shiftamount < 0) return (value >> -shiftamount); 
+  else return (value << shiftamount);
+}
 
 inline Real
 linear_interpolate (Real x, Real x1, Real x2, Real y1, Real y2)
@@ -39,5 +55,10 @@ 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);
+vsize utf8_char_len (char);
+
 #endif