X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=ee55a00c7ecb2478a04fabdb77682b6ce8689dde;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=946e27e4bb4025d8c88fc79da6c77e080cdb978f;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/misc.cc b/lily/misc.cc
index 946e27e4bb..ee55a00c7e 100644
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,43 +3,86 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <math.h>
 
-#include "item.hh"
 #include "misc.hh"
-#include "moment.hh"
 
+/*
+  Return the 2-log, rounded down
+*/
 int
-intlog2(int d) {
-    int i=0;
-    while (!(d&1)) {
-	d/= 2;
-	i++;
+intlog2 (int d)
+{
+  assert (d);
+  int i = 0;
+  while ((d != 1))
+    {
+      d /= 2;
+      i++;
     }
-    assert (!(d/2));
-    return i;
+
+  assert (! (d / 2));
+  return i;
 }
 
 double
-log_2(double x) {
-    return log (x)  /log (2.0);
+log_2 (double x)
+{
+  return log (x) / log (2.0);
+}
+
+Real
+directed_round (Real f, Direction d)
+{
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
+}
+
+
+
+/*
+   0 at threshold,  1 at 0, with 1/x falloff.
+ */
+Real
+peak_around (Real epsilon,  Real threshold, Real x)
+{
+  if (x < 0)
+    return 1.0;
+  return max (- epsilon * (x - threshold) / ((x + epsilon) * threshold), 0.0);
 }
 
-#if 1
-Interval
-itemlist_width (const Array<Item*> &its)
+/*
+  0 at 0,  1 at standard_x, and increasing thereafter. 
+ */
+Real
+convex_amplifier (Real standard_x, Real increase_factor, Real x)
 {
-    Interval iv ;
-    iv.set_empty();
-     
-    for (int j =0; j < its.size(); j++){
-	iv.unite (its[j]->width());
+  return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0); 
+}
 
+string
+camel_case_to_lisp_identifier (string in)
+{
+  vector<char> out;
+  
+  /* don't add '-' before first character */
+  out.push_back (char (tolower (in[0])));
+    
+  for (size_t inpos = 1; inpos < in.size (); inpos++)
+    {
+      if (isupper (in[inpos]))
+	out.push_back ('-');
+      out.push_back ( char(tolower (in[inpos])));
     }
-    return iv;
+  
+  string result (&out[0], out.size ());
+  replace_all (&result, '_', '-');
+
+  return result;
 }
 
-#endif