(precision_string): >? fix.

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index c9cb8e5dcfcb720a2bc51ebb3825c6fc1baab9b0..bb8a05201c103904bd3a3e2aa8900c5db260e855 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -3,119 +3,59 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998, 1998 Han-Wen Nienhuys <hanwen@stack.nl>
-    Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <math.h>
 
 #include "misc.hh"
+#include "string.hh"
 
-#ifndef STANDALONE
-#include "item.hh"
-#endif
-
+/*
+  Return the 2-log, rounded down
+*/
 int
-intlog2(int d) {
-  int i=0;
-  while (!(d&1)) 
-    {
-       d/= 2;
-       i++;
-    }
-  assert (!(d/2));
-  return i;
-}
-
-double
-log_2(double x) {
-  return log (x)  /log (2.0);
-}
-
-#ifndef STANDALONE
-Interval
-itemlist_width (const Array<Item*> &its)
+intlog2 (int d)
 {
-  Interval iv ;
-  iv.set_empty();
-   
-  for (int j =0; j < its.size(); j++)
+  assert (d);
+  int i = 0;
+  while ((d != 1))
     {
-       iv.unite (its[j]->width());
-
+      d /= 2;
+      i++;
     }
-  return iv;
-}
-
-#endif
-
 
-/*
-  TODO
-    group in some Array_*
-    make more generic / templatise
- */
-int
-get_lower_bound (Array<Real> const& positions, Real x)
-{
-  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;
-}
-
-Slice
-get_bounds_slice (Array<Real> const& positions, 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);
+  assert (! (d / 2));
+  return i;
 }
 
-Interval
-get_bounds_iv (Array<Real> const& positions, Real x)
+double
+log_2 (double x)
 {
-  Slice slice = get_bounds_slice (positions, x);
-  return Interval (positions[slice.min ()], positions[slice.max ()]);
+  return log (x) / log (2.0);
 }
 
-// silly name
-Interval
-quantise_iv (Array<Real> const& positions, Real period, Real x)
+Array<String>
+split_string (String s, char c)
 {
-  /*
-    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)
+  Array<String> rv;
+  while (s.length ())
     {
-      frac += period;
-      n--;
-    }
+      int i = s.index (c);
 
-  Slice slice = get_bounds_slice (positions, frac);
-  Interval iv(positions[slice.min ()], positions[slice.max ()]);
+      if (i == 0)
+       {
+         s = s.nomid_string (0, 1);
+         continue;
+       }
 
-  if (slice.min () == slice.max ())
-    {
-      if (slice.min () == 0)
-       iv.min () = - period + positions.top ();
-      else
-       iv.max () = period + positions[0];
-    }
+      if (i < 0)
+       i = s.length ();
 
-  iv += period * n;
+      rv.push (s.cut_string (0, i));
+      s = s.nomid_string (0, i);
+    }
 
-  return iv;
+  return rv;
 }
-