fix reading UTF8 encoded symbol file

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

diff --git a/src/mathed/MathParser.h b/src/mathed/MathParser.h
index d23e9978d2abeeea6da3ab2175f4453b52e23ee8..1e4b7b7392a3d5f39173f6f45b6a6de0a2aafec1 100644 (file)
--- a/src/mathed/MathParser.h
+++ b/src/mathed/MathParser.h
@@ -13,8 +13,11 @@
 #ifndef MATH_PARSER_H
 #define MATH_PARSER_H
 
-#include <string>
+#include "support/types.h"
+#include "support/docstring.h"
 
+#include <string>
+#include <vector>
 
 namespace lyx {
 
@@ -29,34 +32,34 @@ class LyXLex;
 class latexkeys {
 public:
        /// name of the macro or primitive
-       std::string name;
+       docstring name;
        /// name of a inset that handles that macro
-       std::string inset;
-       /// position of the ting in a font
-       std::string draw;
+       docstring inset;
+       /// position of the thing in a font     
+       docstring draw;
        /// operator/..., fontname e
-       std::string extra;
+       docstring extra;
        /// how is this called as XML entity?
-       std::string xmlname;
+       docstring xmlname;
        /// required LaTeXFeatures
-       std::string requires;
+       docstring requires;
 };
 
 
 /// check whether this is a well-known (La)TeX macro or primitive
-latexkeys const * in_word_set(std::string const & str);
+latexkeys const * in_word_set(docstring const & str);
 
 /// parse formula from a string
-bool mathed_parse_normal(MathAtom &, std::string const &);
+bool mathed_parse_normal(MathAtom &, docstring const &);
 /// ... a stream
 bool mathed_parse_normal(MathAtom &, std::istream &);
 /// ... the LyX lexxer
 bool mathed_parse_normal(MathAtom &, LyXLex &);
 /// ... the LyX lexxer
-void mathed_parse_normal(InsetMathGrid &, std::string const &);
+void mathed_parse_normal(InsetMathGrid &, docstring const &);
 
 /// parse a single cell from a string
-void mathed_parse_cell(MathArray & ar, std::string const &);
+void mathed_parse_cell(MathArray & ar, docstring const &);
 /// ... a stream
 void mathed_parse_cell(MathArray & ar, std::istream &);