#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"
MathMacroTemplate::MathMacroTemplate(Buffer * buf)
: InsetMathNest(buf, 3), numargs_(0), argsInLook_(0), optionals_(0),
- type_(MacroTypeNewcommand), lookOutdated_(true)
+ type_(MacroTypeNewcommand), redefinition_(false), lookOutdated_(true),
+ premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0)
{
initMath();
}
MathData const & def, MathData const & display)
: InsetMathNest(buf, optionals + 3), numargs_(numargs), argsInLook_(numargs),
optionals_(optionals), optionalValues_(optionalValues),
- type_(type), lookOutdated_(true)
+ type_(type), redefinition_(false), lookOutdated_(true),
+ premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0)
{
initMath();
void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
{
- FontSetChanger dummy1(mi.base, from_ascii("mathnormal"));
- StyleChanger dummy2(mi.base, LM_ST_TEXT);
+ Changer dummy1 = mi.base.changeFontSet("mathnormal");
+ Changer dummy2 = mi.base.changeStyle(LM_ST_TEXT);
// valid macro?
MacroData const * macro = 0;
void MathMacroTemplate::draw(PainterInfo & pi, int x, int y) const
{
- ColorChanger dummy0(pi.base.font, Color_math);
- FontSetChanger dummy1(pi.base, from_ascii("mathnormal"));
- StyleChanger dummy2(pi.base, LM_ST_TEXT);
+ // FIXME: Calling Changer on the same object repeatedly is inefficient.
+ Changer dummy0 = pi.base.font.changeColor(Color_math);
+ Changer dummy1 = pi.base.changeFontSet("mathnormal");
+ Changer dummy2 = pi.base.changeStyle(LM_ST_TEXT);
setPosCache(pi, x, y);
Dimension const dim = dimension(*pi.base.bv);
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;
- WriteStream wi(oss, false, false, WriteStream::wsDefault);
+ otexrowstream ots(oss);
+ WriteStream wi(ots, false, false, WriteStream::wsDefault);
oss << "FormulaMacro\n";
write(wi);
os << to_utf8(oss.str());