patch::: 1.1.37.mb1: Re: LilyPond 1.1.37

[lilypond.git] / lily / include / misc.hh

diff --git a/lily/include/misc.hh b/lily/include/misc.hh
index 28e55399ecef3dbd594b0739529c9fa45056a562..d45eabe840e958dfd34685f0b08835fc08f9fdb2 100644 (file)
--- a/lily/include/misc.hh
+++ b/lily/include/misc.hh
@@ -1,21 +1,23 @@
 #ifndef MISC_HH
 #define MISC_HH
 
-#include "lily-proto.hh"
+#include <stdlib.h>
+
 #include "real.hh"
-#include "moment.hh"
-#include "scalar.hh"
-#include "grouping.hh"
+#include "array.hh"
+#include "interval.hh"
 
-Moment wholes (int dur, int dots);
 double log_2(double x) ;
 int intlog2(int d);
-#if ! defined(_ABS_)
+
+#if 0
+                               // defined in real.hh
 inline int
 abs (int i){
     return (i < 0)?-i:i;
 }
 #endif
+
 inline int
 sign (int i) {
     if (i<0) return -1;
@@ -23,6 +25,16 @@ sign (int i) {
     else return 0;
 }
 
-Interval itemlist_width (const Array<Item*> &its);
+#ifndef STANDALONE
+#include "lily-proto.hh"
+Interval itemlist_width (const Link_array<Item> &its);
+#endif
+
+void set_frobnify (void*, size_t);
+int get_lower_bound (Array<Real> const& positions, Real x);
+Slice get_bounds_slice (Array<Real> const& positions, Real x);
+Interval get_bounds_iv (Array<Real> const& positions, Real x);
+Interval quantise_iv (Array<Real> const& positions, Real period, Real x);
 
 #endif
+