#include "MathMacroTemplate.h"
-#include "DocIterator.h"
-#include "LaTeXFeatures.h"
#include "InsetMathBrace.h"
#include "InsetMathChar.h"
#include "InsetMathHull.h"
#include "Color.h"
#include "Cursor.h"
#include "DispatchResult.h"
+#include "DocIterator.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "LaTeXFeatures.h"
#include "Lexer.h"
+#include "MetricsInfo.h"
#include "TocBackend.h"
#include "frontends/Painter.h"
void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
{
- Changer dummy1 = mi.base.changeFontSet(from_ascii("mathnormal"));
+ Changer dummy1 = mi.base.changeFontSet("mathnormal");
Changer dummy2 = mi.base.changeStyle(LM_ST_TEXT);
// valid macro?
{
// FIXME: Calling Changer on the same object repeatedly is inefficient.
Changer dummy0 = pi.base.font.changeColor(Color_math);
- Changer dummy1 = pi.base.changeFontSet(from_ascii("mathnormal"));
+ Changer dummy1 = pi.base.changeFontSet("mathnormal");
Changer dummy2 = pi.base.changeStyle(LM_ST_TEXT);
setPosCache(pi, x, y);
int const a = y - dim.asc + 1;
int const w = dim.wid - 2;
int const h = dim.height() - 2;
- pi.pain.rectangle(x, a, w, h, Color_mathframe);
+ pi.pain.rectangle(x + 1, a, w, h, Color_mathframe);
// just to be sure: set some dummy values for coord cache
for (idx_type i = 0; i < nargs(); ++i)
void MathMacroTemplate::write(ostream & os) const
{
odocstringstream oss;
- TexRow texrow(false);
- otexrowstream ots(oss,texrow);
+ otexrowstream ots(oss);
WriteStream wi(ots, false, false, WriteStream::wsDefault);
oss << "FormulaMacro\n";
write(wi);