fix reading UTF8 encoded symbol file

[lyx.git] / src / mathed / MathData.h

diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index 9889b1a2f0da4679042efa8580ff07538533bee5..b808dba5790a43304cca06eea1ef6decada528b3 100644 (file)
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -14,12 +14,17 @@
 #ifndef MATH_DATA_H
 #define MATH_DATA_H
 
-#include <iosfwd>
 #include <vector>
 
 #include "MathAtom.h"
 #include "dimension.h"
 
+#include "support/docstream.h"
+
+
+namespace lyx {
+
+class BufferView;
 class LaTeXFeatures;
 class ReplaceData;
 class MetricsInfo;
@@ -52,7 +57,7 @@ public:
 
 public:
        ///
-       MathArray();
+       MathArray() {}
        ///
        MathArray(const_iterator from, const_iterator to);
        ///
@@ -112,15 +117,15 @@ public:
        void touch() const;
 
        /// access to cached x coordinate of last drawing
-       int xo() const;
+       int xo(BufferView & bv) const;
        /// access to cached y coordinate of last drawing
-       int yo() const;
+       int yo(BufferView & bv) const;
        /// access to cached x coordinate of mid point of last drawing
-       int xm() const { return xo() + dim_.wid / 2; }
+       int xm(BufferView & bv) const { return xo(bv) + dim_.wid / 2; }
        /// access to cached y coordinate of mid point of last drawing
-       int ym() const { return yo() + (dim_.des - dim_.asc) / 2; }
+       int ym(BufferView & bv) const { return yo(bv) + (dim_.des - dim_.asc) / 2; }
        /// write access to coordinate;
-       void setXY(int x, int y) const;
+       void setXY(BufferView & bv, int x, int y) const;
        /// returns x coordinate of given position in the array
        int pos2x(size_type pos) const;
        /// returns position of given x coordinate
@@ -131,7 +136,7 @@ public:
        size_type x2pos(int targetx, int glue) const;
        /// returns distance of this cell to the point given by x and y
        // assumes valid position and size cache
-       int dist(int x, int y) const;
+       int dist(BufferView & bv, int x, int y) const;
 
        /// ascent of this cell above the baseline
        int ascent() const { return dim_.asc; }
@@ -156,6 +161,10 @@ private:
 
 ///
 std::ostream & operator<<(std::ostream & os, MathArray const & ar);
+///
+odocstream & operator<<(odocstream & os, MathArray const & ar);
+
 
+} // namespace lyx
 
 #endif