X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=0ea0a942522ab08b218a2f64c94e3e2777e6cb71;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=8ea878cc2efe3387bb2ff6e7748d3296b924a6c0;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 8ea878cc2e..0ea0a94252 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--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 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,14 +39,32 @@ sign (int i)
   else return 0;
 }
 
-Array<String> split_string (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)
 {
   return (x2 - x) / (x2 - x1) * y1
-    + (x - x1) / (x2 - x1) * y2;
+         + (x - x1) / (x2 - x1) * y2;
 }
 
+inline Real
+normalize (Real x, Real x1, Real x2)
+{
+  return (x - x1) / (x2 - x1);
+}
+
+Real directed_round (Real f, Direction d);
+
+Offset get_point_in_y_direction (Offset orig, Real slope, Real dist, Direction dir);
+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 (const string &in);
+
 #endif