lilypond-0.0.20

diff --git a/hdr/boxes.hh b/hdr/boxes.hh
index 5bc2cb2e735197da924d7c75b832e598a5234c8a..d817dc42e89d3c634922e79b4d8145553b470eca 100644 (file)
--- a/hdr/boxes.hh
+++ b/hdr/boxes.hh
@@ -8,35 +8,8 @@
 #include "fproto.hh"
 #include "real.hh"
 #include "interval.hh"
-
-
-/// 2d vector 
-struct Offset {
-    Real x,y;
-
-    Offset operator+(Offset o)const {
-       Offset r(*this);
-       r+=o;
-       return r;
-    }
-    
-    Offset operator+=(Offset o) {
-       x+=o.x;
-       y+=o.y;
-       return *this;
-    }
-    Offset(Real ix , Real iy) {
-       x=ix;
-       y=iy;
-    }
-    Offset() {
-       x=0.0;
-       y=0.0;
-    }
-};
-
-
-/// a 4-tuple of #Real#s
+#include "offset.hh"
+/// a square subset of Real^2
 struct Box {
     Interval x, y;
     
@@ -48,7 +21,6 @@ struct Box {
        x.unite(b.x);
        y.unite(b.y);
     }
-    Box(svec<Real> &);
     Box();
     Box(Interval ix, Interval iy);
 };

diff --git a/hdr/leastsquares.hh b/hdr/leastsquares.hh
index 71586d8d5ca13dfaa03ad7d95a450cfc90a215ca..105efd0aa714ed3d3869450edb2a0a2687b796d7 100644 (file)
--- a/hdr/leastsquares.hh
+++ b/hdr/leastsquares.hh
@@ -7,7 +7,7 @@
 #ifndef LEASTSQUARE_HH
 #define LEASTSQUARE_HH
 #include "vray.hh"
-#include "boxes.hh"
+#include "offset.hh"
 
 struct Least_squares {
     svec<Offset> input;

diff --git a/hdr/offset.hh b/hdr/offset.hh
new file mode 100644 (file)
index 0000000..b186700
--- /dev/null
+++ b/hdr/offset.hh
@@ -0,0 +1,38 @@
+/*
+  offset.hh -- part of LilyPond
+
+  (c) 1996 Han-Wen Nienhuys
+*/
+
+#ifndef OFFSET_HH
+#define OFFSET_HH
+#include "real.hh"
+
+/// 2d vector 
+struct Offset {
+    Real x,y;
+
+    Offset operator+(Offset o)const {
+       Offset r(*this);
+       r+=o;
+       return r;
+    }
+    
+    Offset operator+=(Offset o) {
+       x+=o.x;
+       y+=o.y;
+       return *this;
+    }
+    Offset(Real ix , Real iy) {
+       x=ix;
+       y=iy;
+    }
+    Offset() {
+       x=0.0;
+       y=0.0;
+    }
+};
+
+#endif // OFFSET_HH
+
+