*** empty log message ***

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index b1f6b5b734a55a389f119201c2b2095b6d62bd3d..607cbe99534ccc246d421cf725bec332144b643a 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,35 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-    Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <math.h>
+
 #include "misc.hh"
+#include "std-string.hh"
 
 /*
-  Return the 2-log, rounded down 
- */
+  Return the 2-log, rounded down
+*/
 int
 intlog2 (int d)
 {
   assert (d);
-  int i=0;
-  while ((d != 1)) 
+  int i = 0;
+  while ((d != 1))
     {
       d /= 2;
       i++;
     }
-  
-  assert (! (d/2));
+
+  assert (! (d / 2));
   return i;
 }
 
 double
 log_2 (double x)
 {
-  return log (x)  /log (2.0);
+  return log (x) / log (2.0);
+}
+
+Array<std::string>
+split_string (std::string s, char c)
+{
+  Array<std::string> rv;
+  while (s.length ())
+    {
+      ssize i = s.find (c);
+
+      if (i == 0)
+       {
+         s = s.substr (1);
+         continue;
+       }
+
+      if (i == NPOS)
+       i = s.length ();
+
+      rv.push (s.substr (0, i));
+      s = s.substr (i);
+    }
+
+  return rv;
+}
+
+
+Real
+directed_round (Real f, Direction d)
+{
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
 }
 
-