fix reading UTF8 encoded symbol file

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

diff --git a/src/mathed/InsetFormulaMacro.C b/src/mathed/InsetFormulaMacro.C
index 3b644b65e45243abac603dd5cb3946e5de5fbd56..39bb488042f0b95888eb8465ea45d9396177e743 100644 (file)
--- a/src/mathed/InsetFormulaMacro.C
+++ b/src/mathed/InsetFormulaMacro.C
@@ -24,8 +24,6 @@
 #include "lyxlex.h"
 #include "outputparams.h"
 
-#include "frontends/Application.h"
-#include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
@@ -33,7 +31,11 @@
 
 #include <sstream>
 
-using lyx::support::bformat;
+
+namespace lyx {
+
+using odocstream;
+using support::bformat;
 
 using std::string;
 using std::auto_ptr;
@@ -77,7 +79,7 @@ void InsetFormulaMacro::write(Buffer const &, ostream & os) const
 }
 
 
-int InsetFormulaMacro::latex(Buffer const &, ostream & os,
+int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
                             OutputParams const & runparams) const
 {
        //lyxerr << "InsetFormulaMacro::latex" << endl;
@@ -87,7 +89,7 @@ int InsetFormulaMacro::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetFormulaMacro::plaintext(Buffer const &, ostream & os,
+int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
                             OutputParams const &) const
 {
        WriteStream wi(os, false, true);
@@ -119,7 +121,7 @@ void InsetFormulaMacro::read(std::istream & is)
 
 string InsetFormulaMacro::prefix() const
 {
-       return lyx::to_utf8(bformat(_(" Macro: %1$s: "), lyx::from_utf8(name_)));
+       return to_utf8(bformat(_(" Macro: %1$s: "), lyx::from_utf8(name_)));
 }
 
 
@@ -129,8 +131,7 @@ void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
        tmpl()->metrics(mi, dim);
        dim.asc += 5;
        dim.des += 5;
-       dim.wid += 10 
-               + theApp->fontLoader().metrics(mi.base.font).width(prefix());
+       dim.wid += 10 + theFontMetrics(mi.base.font).width(prefix());
        dim_ = dim;
 }
 
@@ -166,7 +167,7 @@ void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
 
        // body
        tmpl()->draw(pi,
-               x + theApp->fontLoader().metrics(p.base.font).width(prefix()) + 5,
+               x + theFontMetrics(p.base.font).width(prefix()) + 5,
                y);
 
        setPosCache(pi, x, y);
@@ -177,3 +178,6 @@ MathAtom & InsetFormulaMacro::tmpl() const
 {
        return MathMacroTable::provide(name_);
 }
+
+
+} // namespace lyx