float2string #4 (Spacing)

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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index b1b2a333283fd80e7bddb26ced6560b23f459f0f..8f2674bba30fc1e90ddb6f247783962f919b2afe 100644 (file)
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -1,28 +1,26 @@
+/**
+ * \file math_charinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #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"
-#include "debug.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
-#include "LaTeXFeatures.h"
-#include "textpainter.h"
 
-#include <cctype>
-#include <cstring>
-
-
-using std::ostream;
-using std::endl;
+#include "debug.h"
+#include "dimension.h"
+#include "support/lstrings.h"
+#include "textpainter.h"
 
-#ifndef CXX_GLOBAL_CSTD
-using std::strchr;
-using std::isalpha;
-#endif
+using std::auto_ptr;
 
 extern bool has_math_fonts;
 
@@ -30,13 +28,12 @@ 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');
        }
 
@@ -49,9 +46,9 @@ MathCharInset::MathCharInset(char c)
 
 
 
-InsetBase * MathCharInset::clone() const
+auto_ptr<InsetBase> MathCharInset::doClone() const
 {
-       return new MathCharInset(*this);
+       return auto_ptr<InsetBase>(new MathCharInset(*this));
 }
 
 
@@ -64,8 +61,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);
@@ -80,8 +77,9 @@ void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
        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
+       width_ = dim.wid;
 }
 
 
@@ -100,8 +98,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_);
@@ -149,10 +147,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_;
-}