X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=6cafa2b50b3669fac258e5d2b1d3e51cdb737db1;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=ab6cceb5f55310b13d0ed221ec6e3d3c3b60cbef;hpb=795708fdc77fccf592103e995d97ea5fda9e094f;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index ab6cceb5f5..6cafa2b50b 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,103 +1,79 @@
 /*
-  misc.cc -- implement various stuff
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-    Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-#include <math.h>
+  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.
 
-#include "misc.hh"
+  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.
 
-#ifndef STANDALONE
-#include "item.hh"
-#endif
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-int
-intlog2(int d) {
-  int i=0;
-  while (!(d&1)) 
-    {
-	d/= 2;
-	i++;
-    }
-  assert (!(d/2));
-  return i;
-}
+#include "misc.hh"
+#include "offset.hh"
+#include "warn.hh"
 
 double
-log_2(double x) {
-  return log (x)  /log (2.0);
+log_2 (double x)
+{
+  return log (x) / log (2.0);
 }
 
-
-/*
-  TODO
-    group in some Array_*
-    make more generic / templatise
- */
-int
-get_lower_bound (Array<Real> const& positions, Real x)
+Real
+directed_round (Real f, Direction d)
 {
-  if (x < positions[0])
-    return 0;
-  for (int i = 1; i < positions.size (); i++)
-    if (x < positions[i])
-      return i - 1;
-  return positions.size () - 1;
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
 }
 
-Slice
-get_bounds_slice (Array<Real> const& positions, Real x)
+/*
+   0 at threshold,  1 at 0, with 1/x falloff.
+ */
+Real
+peak_around (Real epsilon, Real threshold, Real x)
 {
-  int l = get_lower_bound (positions, x);
-  int u = positions.size () - 1 <? l + 1;
-  if (x < positions[l])
-    u = l;
-  return Slice (l, u);
+  if (x < 0)
+    return 1.0;
+  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
-Interval
-get_bounds_iv (Array<Real> const& positions, Real x)
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter.
+ */
+Real
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-  Slice slice = get_bounds_slice (positions, x);
-  return Interval (positions[slice[SMALLER]], positions[slice[BIGGER]]);
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0);
 }
 
-// silly name
-Interval
-quantise_iv (Array<Real> const& positions, Real period, Real x)
+string
+camel_case_to_lisp_identifier (const string &in)
 {
-  /*
-    ugh
-    assume that 
-      * positions are sorted, 
-      * positions are nonnegative
-      * period starts at zero
-   */
-
-  int n = (int)(x / period);
-  Real frac = (x / period - n) * period;
-  if (frac < 0)
-    {
-      frac += period;
-      n--;
-    }
+  vector<char> out;
 
-  Slice slice = get_bounds_slice (positions, frac);
-  Interval iv(positions[slice[SMALLER]], positions[slice[BIGGER]]);
+  /* don't add '-' before first character */
+  out.push_back (char (tolower (in[0])));
 
-  if (slice[SMALLER] == slice[BIGGER])
+  for (size_t inpos = 1; inpos < in.size (); inpos++)
     {
-      if (slice[SMALLER] == 0)
-	iv[SMALLER] = - period + positions.top ();
-      else
-	iv[BIGGER] = period + positions[0];
+      if (isupper (in[inpos]))
+        out.push_back ('-');
+      out.push_back ( char (tolower (in[inpos])));
     }
 
-  iv += period * n;
+  string result (&out[0], out.size ());
+  replace_all (&result, '_', '-');
 
-  return iv;
+  return result;
 }