#include <config.h>
-
#include "math_charinset.h"
#include "LColor.h"
+#include "dimension.h"
#include "frontends/Painter.h"
#include "frontends/font_metrics.h"
#include "support/LOstream.h"
using std::ostream;
using std::endl;
+using std::auto_ptr;
#ifndef CXX_GLOBAL_CSTD
using std::strchr;
-MathInset * MathCharInset::clone() const
+auto_ptr<InsetBase> MathCharInset::clone() const
{
- return new MathCharInset(*this);
+ return auto_ptr<InsetBase>(new MathCharInset(*this));
}
-void MathCharInset::metrics(MathMetricsInfo & mi) const
+void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
{
#if 1
if (char_ == '=' && has_math_fonts) {
- MathFontSetChanger dummy(mi.base, "cmr");
- mathed_char_dim(mi.base.font, char_, dim_);
+ FontSetChanger dummy(mi.base, "cmr");
+ mathed_char_dim(mi.base.font, char_, dim);
} else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
- MathFontSetChanger dummy(mi.base, "cmm");
- mathed_char_dim(mi.base.font, char_, dim_);
+ FontSetChanger dummy(mi.base, "cmm");
+ mathed_char_dim(mi.base.font, char_, dim);
} else if (slanted(char_) && mi.base.fontname == "mathnormal") {
- MathShapeChanger dummy(mi.base.font, LyXFont::ITALIC_SHAPE);
- mathed_char_dim(mi.base.font, char_, dim_);
+ ShapeChanger dummy(mi.base.font, LyXFont::ITALIC_SHAPE);
+ mathed_char_dim(mi.base.font, char_, dim);
} else {
- mathed_char_dim(mi.base.font, char_, dim_);
+ mathed_char_dim(mi.base.font, char_, dim);
}
int const em = mathed_char_width(mi.base.font, 'M');
if (isBinaryOp(char_))
- dim_.w += static_cast<int>(0.5*em+0.5);
+ dim.wid += static_cast<int>(0.5*em+0.5);
else if (char_ == '\'')
- dim_.w += static_cast<int>(0.1667*em+0.5);
+ dim.wid += static_cast<int>(0.1667*em+0.5);
#else
whichFont(font_, code_, mi);
mathed_char_dim(font_, char_, dim_);
if (isBinaryOp(char_, code_))
width_ += 2 * font_metrics::width(' ', font_);
- lyxerr << "MathCharInset::metrics: " << dim_ << "\n";
+ lyxerr << "MathCharInset::metrics: " << dim << endl;
#endif
}
-void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathCharInset::draw(PainterInfo & pi, int x, int y) const
{
//lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << endl;
int const em = mathed_char_width(pi.base.font, 'M');
x += static_cast<int>(0.0833*em+0.5);
#if 1
if (char_ == '=' && has_math_fonts) {
- MathFontSetChanger dummy(pi.base, "cmr");
+ FontSetChanger dummy(pi.base, "cmr");
pi.draw(x, y, char_);
} else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
- MathFontSetChanger dummy(pi.base, "cmm");
+ FontSetChanger dummy(pi.base, "cmm");
pi.draw(x, y, char_);
} else if (slanted(char_) && pi.base.fontname == "mathnormal") {
- MathShapeChanger dummy(pi.base.font, LyXFont::ITALIC_SHAPE);
+ ShapeChanger dummy(pi.base.font, LyXFont::ITALIC_SHAPE);
pi.draw(x, y, char_);
} else {
pi.draw(x, y, char_);
}
-void MathCharInset::metricsT(TextMetricsInfo const &) const
+void MathCharInset::metricsT(TextMetricsInfo const &, Dimension & dim) const
{
- dim_.w = 1;
- dim_.a = 1;
- dim_.d = 0;
+ dim.wid = 1;
+ dim.asc = 1;
+ dim.des = 0;
}
}
-void MathCharInset::octavize(OctaveStream & os) const
+void MathCharInset::octave(OctaveStream & os) const
{
os << char_;
}