#include <config.h>
#include "math_charinset.h"
-#include "dimension.h"
-#include "support/LOstream.h"
#include "math_support.h"
#include "math_mathmlstream.h"
-#include "textpainter.h"
-
+#include "debug.h"
+#include "dimension.h"
+#include "textpainter.h"
-using std::ostream;
-using std::endl;
using std::auto_ptr;
#ifndef CXX_GLOBAL_CSTD
using std::strchr;
-using std::isalpha;
#endif
+
extern bool has_math_fonts;
namespace {
} 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::ITALIC_SHAPE);
+ } 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);
width_ += 2 * font_metrics::width(' ', font_);
lyxerr << "MathCharInset::metrics: " << dim << endl;
#endif
+ width_ = dim.wid;
}
} 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::ITALIC_SHAPE);
+ } 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_);
{
return char_ == '=' || char_ == '<' || char_ == '>';
}
-
-
-bool MathCharInset::match(MathInset const * p) const
-{
- MathCharInset const * q = p->asCharInset();
- return q && char_ == q->char_;
-}