X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmisc.hh;h=174b2f4c01663be76fed63778e558d03cf708d6f;hb=f7013d65b51f1372dc31973b78bbe04f505ea569;hp=0e8c148ef061c34d672c76e763cbe5055dd7e772;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 0e8c148ef0..174b2f4c01 100644
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,26 +1,88 @@
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2005--2015 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 "lily-proto.hh"
-#include "real.hh"
-#include "moment.hh"
-#include "scalar.hh"
-#include "grouping.hh"
+#include <cstdlib>
+using namespace std;
+
+#include "std-vector.hh"
+#include "interval.hh"
+
+double log_2 (double x);
+
+/*
+  Return the 2-log, rounded down
+*/
+template <class T>
+int
+intlog2 (T d)
+{
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + ::to_string (d));
+  int i = 0;
+  while ((d != 1))
+    {
+      d /= 2;
+      i++;
+    }
+
+  assert (! (d / 2));
+  return i;
+}
 
-Moment wholes (int dur, int dots);
-double log_2(double x) ;
-int intlog2(int d);
 inline int
-abs (int i){
-    return (i < 0)?-i:i;
+sign (int i)
+{
+  if (i < 0)
+    return -1;
+  else if (i)
+    return 1;
+  else return 0;
 }
+
 inline int
-sign (int i) {
-    if (i<0) return -1;
-    else if (i) return 1;
-    else return 0;
+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;
 }
 
-Interval itemlist_width (const Array<Item*> &its);
+inline Real
+normalize (Real x, Real x1, Real x2)
+{
+  return (x - x1) / (x2 - x1);
+}
+
+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 (const string &in);
 
 #endif
+