fix reading UTF8 encoded symbol file

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

diff --git a/src/mathed/InsetMathFont.C b/src/mathed/InsetMathFont.C
index 75118442117e30a6002c2dbdc51b0875a10635be..7326b698175c5a7f8bfa856298b8c0ea9a920946 100644 (file)
--- a/src/mathed/InsetMathFont.C
+++ b/src/mathed/InsetMathFont.C
@@ -12,12 +12,14 @@
 
 #include "InsetMathFont.h"
 #include "MathData.h"
-#include "MathMLStream.h"
+#include "MathStream.h"
 #include "MathParser.h"
 #include "LaTeXFeatures.h"
 #include "support/std_ostream.h"
 
-using std::string;
+
+namespace lyx {
+
 using std::auto_ptr;
 
 
@@ -44,7 +46,7 @@ InsetMath::mode_type InsetMathFont::currentMode() const
 
 void InsetMathFont::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       FontSetChanger dummy(mi.base, key_->name.c_str());
+       FontSetChanger dummy(mi.base, key_->name);
        cell(0).metrics(mi, dim);
        metricsMarkers(dim);
        dim_ = dim;
@@ -72,7 +74,7 @@ void InsetMathFont::drawT(TextPainter & pain, int x, int y) const
 }
 
 
-string InsetMathFont::name() const
+docstring InsetMathFont::name() const
 {
        return key_->name;
 }
@@ -92,7 +94,10 @@ void InsetMathFont::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetMathFont::infoize(std::ostream & os) const
+void InsetMathFont::infoize(odocstream & os) const
 {
        os << "Font: " << key_->name;
 }
+
+
+} // namespace lyx