#include "InsetFormulaMacro.h"
#include "MathMacroTable.h"
#include "MathMacroTemplate.h"
-#include "MathMLStream.h"
#include "BufferView.h"
#include "cursor.h"
#include "lyxlex.h"
#include "outputparams.h"
+#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
-#include "frontends/font_metrics.h"
#include "support/lstrings.h"
#include <sstream>
-using lyx::support::bformat;
+
+namespace lyx {
+
+using odocstream;
+using support::bformat;
using std::string;
using std::auto_ptr;
}
-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);
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_)));
}
tmpl()->metrics(mi, dim);
dim.asc += 5;
dim.des += 5;
- dim.wid += 10 + font_metrics::width(prefix(), mi.base.font);
+ dim.wid += 10 + theFontMetrics(mi.base.font).width(prefix());
dim_ = dim;
}
pi.pain.text(x + 2, y, prefix(), font);
// body
- tmpl()->draw(pi, x + font_metrics::width(prefix(), p.base.font) + 5, y);
+ tmpl()->draw(pi,
+ x + theFontMetrics(p.base.font).width(prefix()) + 5,
+ y);
setPosCache(pi, x, y);
}
{
return MathMacroTable::provide(name_);
}
+
+
+} // namespace lyx