bug + spped fixes + small stuff

[lyx.git] / src / mathed / math_charinset.C

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index 47e0d0292daba32d2ab16f63641cdfd132232904..8578aa81486d7eec75be2960c4da77436dd69d2b 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -12,23 +12,20 @@
 #include <config.h>
 
 #include "math_charinset.h"
-#include "dimension.h"
-#include "support/std_ostream.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 {
@@ -69,8 +66,8 @@ void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
        } 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);
@@ -87,6 +84,7 @@ void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
                width_ += 2 * font_metrics::width(' ', font_);
        lyxerr << "MathCharInset::metrics: " << dim << endl;
 #endif
+       width_ = dim.wid;
 }
 
 
@@ -105,8 +103,8 @@ void MathCharInset::draw(PainterInfo & pi, int x, int y) const
        } 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_);
@@ -154,10 +152,3 @@ bool MathCharInset::isRelOp() const
 {
        return char_ == '=' || char_ == '<' || char_ == '>';
 }
-
-
-bool MathCharInset::match(MathInset const * p) const
-{
-       MathCharInset const * q = p->asCharInset();
-       return q && char_ == q->char_;
-}