#include <config.h>
#include "math_charinset.h"
-#include "dimension.h"
#include "math_support.h"
#include "math_mathmlstream.h"
+
+#include "debug.h"
+#include "dimension.h"
+#include "support/lstrings.h"
#include "textpainter.h"
using std::auto_ptr;
-#ifndef CXX_GLOBAL_CSTD
-using std::strchr;
-#endif
-
-
extern bool has_math_fonts;
namespace {
bool isBinaryOp(char c)
{
- return strchr("+-<>=/*", c);
+ return lyx::support::contains("+-<>=/*", c);
}
bool slanted(char c)
{
- //if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
}
-auto_ptr<InsetBase> MathCharInset::clone() const
+auto_ptr<InsetBase> MathCharInset::doClone() const
{
return auto_ptr<InsetBase>(new MathCharInset(*this));
}
} 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_);
void MathCharInset::normalize(NormalStream & os) const
{
- os << "[char " << char_ << ' ' << "mathalpha]";
+ os << "[char " << char_ << " mathalpha]";
}
}
-bool MathCharInset::isRelOp() const
+void MathCharInset::mathmlize(MathMLStream & ms) const
{
- return char_ == '=' || char_ == '<' || char_ == '>';
+ switch (char_) {
+ case '<': ms << "<"; break;
+ case '>': ms << ">"; break;
+ case '&': ms << "&"; break;
+ default: ms << char_; break;
+ }
}
-bool MathCharInset::match(MathInset const * p) const
+bool MathCharInset::isRelOp() const
{
- MathCharInset const * q = p->asCharInset();
- return q && char_ == q->char_;
+ return char_ == '=' || char_ == '<' || char_ == '>';
}