(get_voice_to_lyrics): use NPOS everywhere.

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index d9c56c4a8da2abd3a2fe5c7b7b4bc13456f2db8e..d605eb88a5fa9ec3fec46a339da4b9f5a7b0836c 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,62 +3,69 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 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 "string.hh"
 
+/*
+  Return the 2-log, rounded down
+*/
 int
-intlog2(int d)
+intlog2 (int d)
 {
-  int i=0;
-  while (!(d&1)) 
+  assert (d);
+  int i = 0;
+  while ((d != 1))
     {
-       d/= 2;
-       i++;
+      d /= 2;
+      i++;
     }
-  assert (!(d/2));
+
+  assert (! (d / 2));
   return i;
 }
 
 double
-log_2(double x)
+log_2 (double x)
 {
-  return log (x)  /log (2.0);
+  return log (x) / log (2.0);
 }
 
-
-static int
-comp (Real const &a, Real const &b)
+Array<String>
+split_string (String s, char c)
 {
-  return sign (a-b);
-}
+  Array<String> rv;
+  while (s.length ())
+    {
+      int i = s.index (c);
 
-Interval
-quantise_iv (Array<Real> positions, Real x)
-{
-  positions.sort (comp);
-  Real period = positions.top () - positions[0];
-  
-  int n =  int ((x - positions[0]) / period);
-  Real frac = (x - positions[0] ) -  n * period;
+      if (i == 0)
+       {
+         s = s.nomid_string (0, 1);
+         continue;
+       }
 
-  while (frac < 0)
-    {
-      frac += period;
-      n --;
-    }
-  
-  Real px = frac + positions[0];
-  assert ( positions[0] <= px && px <= positions.top ());
-  int i=0;
-  for (; i < positions.size () - 1; i++)
-    {
-      if (positions[i] <= px && px <= positions[i+1])
-       break; 
+      if (i == NPOS)
+       i = s.length ();
+
+      rv.push (s.cut_string (0, i));
+      s = s.nomid_string (0, i);
     }
 
-  return Interval (positions[i] , positions[i+1]) + period * n;
+  return rv;
+}
+
+
+Real
+directed_round (Real f, Direction d)
+{
+  if (d < 0)
+    return floor (f);
+  else
+    return ceil (f);
 }
+