release: 1.5.29

[lilypond.git] / lily / misc.cc

diff --git a/lily/misc.cc b/lily/misc.cc
index 093af7f0d4b89b80264671dd2eaab4c85961be2c..38154556fd8efa4497254439578c5b9619121838 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -1,53 +1,69 @@
-#include <math.h>
+/*
+  misc.cc -- implement various stuff
 
-#include "item.hh"
-#include "misc.hh"
-#include "glob.hh"
-#include "moment.hh"
+  source file of the GNU LilyPond music typesetter
 
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+    Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
-// depreciated, see struct Duration*
-Moment
-wholes(int dur, int dots)
-{
-    if (!dur)
-       return 0;
-
-    Moment f = Rational(1)/Moment(dur);
-    Moment delta = f;
+#include <math.h>
+#include "misc.hh"
 
-    while (dots--) {
-       delta /= 2.0;
-       f += delta;
-    }
-    return f;    
-}
+/*
+  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);
+}
+
+
+static int
+comp (Real const &a, Real const &b)
+{
+  return sign (a-b);
 }
 
 Interval
-itemlist_width(const Array<Item*> &its)
+quantise_iv (Array<Real> positions, Real x)
 {
-    Interval iv ;
-    iv.set_empty();
-     
-    for (int j =0; j < its.size(); j++){
-       iv.unite (its[j]->width());
+  positions.sort (comp);
+  Real period = positions.top () - positions[0];
+  
+  int n =  int ((x - positions[0]) / period);
+  Real frac = (x - positions[0]) -  n * period;
 
+  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; 
     }
-    return iv;
-}
 
+  return Interval (positions[i] , positions[i+1]) + period * n;
+}