Run grand-replace (issue 3765)

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

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 754379d477a19edd99772b4893c51bd0fa7191b7..0ea0a942522ab08b218a2f64c94e3e2777e6cb71 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,34 +1,70 @@
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2005--2014 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
 #define MISC_HH
 
 #include <cstdlib>
+using namespace std;
 
-#include "array.hh"
+#include "std-vector.hh"
 #include "interval.hh"
 
-double log_2 (double x) ;
+double log_2 (double x);
 int intlog2 (int d);
 
 inline int
 sign (int i)
 {
-  if (i<0)
+  if (i < 0)
     return -1;
   else if (i)
     return 1;
   else return 0;
 }
 
+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;
+}
 
 inline Real
-linear_interpolate (Real x, Real x1, Real x2,  Real y1, Real  y2)
+normalize (Real x, Real x1, Real x2)
 {
-  return (x2 - x) / (x2 - x1) * y1 +
-    (x - x1) / (x2 - x1) * y2 ;
+  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