X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmisc.cc;h=0fa4a9024006b4e24b0fe0f00e824fc65538dd86;hb=6e624bc354e691c7a0b9035e6cd9bee4257fe101;hp=7af00698f29af01deddb596c09caeaeb8e4b9894;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/misc.cc b/lily/misc.cc index 7af00698f2..0fa4a90240 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2011 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -18,7 +18,6 @@ along with LilyPond. If not, see . */ - #include "misc.hh" #include "warn.hh" @@ -55,13 +54,11 @@ directed_round (Real f, Direction d) return ceil (f); } - - /* 0 at threshold, 1 at 0, with 1/x falloff. */ Real -peak_around (Real epsilon, Real threshold, Real x) +peak_around (Real epsilon, Real threshold, Real x) { if (x < 0) return 1.0; @@ -69,29 +66,29 @@ peak_around (Real epsilon, Real threshold, Real x) } /* - 0 at 0, 1 at standard_x, and increasing thereafter. + 0 at 0, 1 at standard_x, and increasing thereafter. */ Real convex_amplifier (Real standard_x, Real increase_factor, Real x) { - return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0); + return (exp (increase_factor * x / standard_x) - 1.0) / (exp (increase_factor) - 1.0); } string camel_case_to_lisp_identifier (string in) { vector 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]))); + out.push_back ('-'); + out.push_back ( char (tolower (in[inpos]))); } - + string result (&out[0], out.size ()); replace_all (&result, '_', '-');