#include "lyxlex.h"
#include "outputparams.h"
-#include "frontends/Application.h"
-#include "frontends/FontLoader.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
#include <sstream>
+using lyx::odocstream;
using lyx::support::bformat;
using std::string;
}
-int InsetFormulaMacro::latex(Buffer const &, ostream & os,
+int InsetFormulaMacro::latex(Buffer const &, odocstream & os,
OutputParams const & runparams) const
{
//lyxerr << "InsetFormulaMacro::latex" << endl;
}
-int InsetFormulaMacro::plaintext(Buffer const &, ostream & os,
+int InsetFormulaMacro::plaintext(Buffer const &, odocstream & os,
OutputParams const &) const
{
WriteStream wi(os, false, true);
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;
}
// 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);