-int MathCharInset::width() const
-{
- return mathed_char_width(code_, mi_, char_);
-}
-
-
-void MathCharInset::metrics(MathMetricsInfo const & mi) const
-{
- mi_ = mi;
-}
-
-
-void MathCharInset::draw(Painter & pain, int x, int y) const
-{
- //lyxerr << "drawing '" << char_ << "' code: " << code_ << endl;
- drawChar(pain, code_, mi_, x, y, char_);
+MathCharInset::MathCharInset(char c)
+ : char_(c)
+{}
+
+
+
+auto_ptr<InsetBase> MathCharInset::doClone() const
+{
+ return auto_ptr<InsetBase>(new MathCharInset(*this));
+}
+
+
+void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+#if 1
+ if (char_ == '=' && has_math_fonts) {
+ FontSetChanger dummy(mi.base, "cmr");
+ mathed_char_dim(mi.base.font, char_, dim);
+ } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
+ FontSetChanger dummy(mi.base, "cmm");
+ mathed_char_dim(mi.base.font, char_, dim);
+ } else if (!slanted(char_) && mi.base.fontname == "mathnormal") {
+ ShapeChanger dummy(mi.base.font, LyXFont::UP_SHAPE);
+ mathed_char_dim(mi.base.font, char_, dim);
+ } else {
+ mathed_char_dim(mi.base.font, char_, dim);
+ }
+ int const em = mathed_char_width(mi.base.font, 'M');
+ if (isBinaryOp(char_))
+ dim.wid += static_cast<int>(0.5*em+0.5);
+ else if (char_ == '\'')
+ 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 << endl;
+#endif
+ width_ = dim.wid;
+}
+
+
+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');
+ if (isBinaryOp(char_))
+ x += static_cast<int>(0.25*em+0.5);
+ else if (char_ == '\'')
+ x += static_cast<int>(0.0833*em+0.5);
+#if 1
+ if (char_ == '=' && has_math_fonts) {
+ FontSetChanger dummy(pi.base, "cmr");
+ pi.draw(x, y, char_);
+ } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
+ FontSetChanger dummy(pi.base, "cmm");
+ pi.draw(x, y, char_);
+ } else if (!slanted(char_) && pi.base.fontname == "mathnormal") {
+ ShapeChanger dummy(pi.base.font, LyXFont::UP_SHAPE);
+ pi.draw(x, y, char_);
+ } else {
+ pi.draw(x, y, char_);
+ }
+#else
+ drawChar(pain, font_, x, y, char_);
+#endif