fix reading UTF8 encoded symbol file

[lyx.git] / src / mathed / InsetMathTabular.C

diff --git a/src/mathed/InsetMathTabular.C b/src/mathed/InsetMathTabular.C
index 00f0d73d308ae029807bed9b308a16d635e4211a..663559d79b6096b41e2da9d811d7626837e73387 100644 (file)
--- a/src/mathed/InsetMathTabular.C
+++ b/src/mathed/InsetMathTabular.C
@@ -12,7 +12,7 @@
 
 #include "InsetMathTabular.h"
 #include "MathData.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
 #include "MathStream.h"
 
 #include "support/lstrings.h"
@@ -21,23 +21,26 @@
 #include <iterator>
 
 
+namespace lyx {
+
+
 using std::string;
 using std::auto_ptr;
 
 
-InsetMathTabular::InsetMathTabular(string const & name, int m, int n)
+InsetMathTabular::InsetMathTabular(docstring const & name, int m, int n)
        : InsetMathGrid(m, n), name_(name)
 {}
 
 
-InsetMathTabular::InsetMathTabular(string const & name, int m, int n,
-               char valign, string const & halign)
+InsetMathTabular::InsetMathTabular(docstring const & name, int m, int n,
+               char valign, docstring const & halign)
        : InsetMathGrid(m, n, valign, halign), name_(name)
 {}
 
 
-InsetMathTabular::InsetMathTabular(string const & name, char valign,
-               string const & halign)
+InsetMathTabular::InsetMathTabular(docstring const & name, char valign,
+               docstring const & halign)
        : InsetMathGrid(valign, halign), name_(name)
 {}
 
@@ -84,10 +87,10 @@ void InsetMathTabular::write(WriteStream & os) const
 }
 
 
-void InsetMathTabular::infoize(std::ostream & os) const
+void InsetMathTabular::infoize(odocstream & os) const
 {
-       string name = name_;
-       name[0] = lyx::support::uppercase(name[0]);
+       docstring name = name_;
+       name[0] = support::uppercase(name[0]);
        os << name << ' ';
 }
 
@@ -106,3 +109,6 @@ void InsetMathTabular::maple(MapleStream & os) const
        InsetMathGrid::maple(os);
        os << ')';
 }
+
+
+} // namespace lyx