fix reading UTF8 encoded symbol file

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

diff --git a/src/mathed/InsetMathNumber.C b/src/mathed/InsetMathNumber.C
index 8988a571c8517a59cb025c0844cb086c160edcfc..9ab909cf0899885f5b8e78962a4ce634a57fea5a 100644 (file)
--- a/src/mathed/InsetMathNumber.C
+++ b/src/mathed/InsetMathNumber.C
@@ -11,17 +11,18 @@
 #include <config.h>
 
 #include "InsetMathNumber.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
-using lyx::docstring;
+
+namespace lyx {
 
 using std::string;
 using std::auto_ptr;
+using std::vector;
 
-
-InsetMathNumber::InsetMathNumber(string const & s)
+InsetMathNumber::InsetMathNumber(docstring const & s)
        : str_(s)
 {}
 
@@ -34,15 +35,13 @@ auto_ptr<InsetBase> InsetMathNumber::doClone() const
 
 void InsetMathNumber::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       // FIXME UNICODE
-       mathed_string_dim(mi.base.font, lyx::from_utf8(str_), dim);
+       mathed_string_dim(mi.base.font, str_, dim);
 }
 
 
 void InsetMathNumber::draw(PainterInfo & pi, int x, int y) const
 {
-       // FIXME UNICODE
-       pi.draw(x, y, lyx::from_utf8(str_));
+       pi.draw(x, y, str_);
 }
 
 
@@ -70,7 +69,7 @@ void InsetMathNumber::octave(OctaveStream & os) const
 }
 
 
-void InsetMathNumber::mathmlize(MathMLStream & os) const
+void InsetMathNumber::mathmlize(MathStream & os) const
 {
        os << "<mi> " << str_ << " </mi>";
 }
@@ -80,3 +79,6 @@ void InsetMathNumber::write(WriteStream & os) const
 {
        os << str_;
 }
+
+
+} // namespace lyx