X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_charinset.C;h=8f2674bba30fc1e90ddb6f247783962f919b2afe;hb=701b99ecd70ac472aa53c8b2317af44def4f9670;hp=20261403873808ea85ad0f5e5c03d5324b2761c8;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index 2026140387..8f2674bba3 100644
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -1,28 +1,26 @@
-#include <config.h>
+/**
+ * \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 "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,43 +46,44 @@ MathCharInset::MathCharInset(char c)
 
 
 
-MathInset * MathCharInset::clone() const
+auto_ptr<InsetBase> MathCharInset::doClone() const
 {
-	return new MathCharInset(*this);
+	return auto_ptr<InsetBase>(new MathCharInset(*this));
 }
 
 
-void MathCharInset::metrics(MathMetricsInfo & mi) const
+void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 #if 1
 	if (char_ == '=' && has_math_fonts) {
-		MathFontSetChanger dummy(mi.base, "cmr");
-		mathed_char_dim(mi.base.font, char_, dim_);
+		FontSetChanger dummy(mi.base, "cmr");
+		mathed_char_dim(mi.base.font, char_, dim);
 	} else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
-		MathFontSetChanger dummy(mi.base, "cmm");
-		mathed_char_dim(mi.base.font, char_, dim_);
-	} else if (slanted(char_) && mi.base.fontname == "mathnormal") {
-		MathShapeChanger dummy(mi.base.font, LyXFont::ITALIC_SHAPE);
-		mathed_char_dim(mi.base.font, char_, dim_);
+		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_);
+		mathed_char_dim(mi.base.font, char_, dim);
 	}
 	int const em = mathed_char_width(mi.base.font, 'M');
 	if (isBinaryOp(char_))
-		dim_.w += static_cast<int>(0.5*em+0.5);
+		dim.wid += static_cast<int>(0.5*em+0.5);
 	else if (char_ == '\'')
-		dim_.w += static_cast<int>(0.1667*em+0.5);
+		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_ << "\n";
+	lyxerr << "MathCharInset::metrics: " << dim << endl;
 #endif
+	width_ = dim.wid;
 }
 
 
-void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
+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');
@@ -95,13 +93,13 @@ void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
 		x += static_cast<int>(0.0833*em+0.5);
 #if 1
 	if (char_ == '=' && has_math_fonts) {
-		MathFontSetChanger dummy(pi.base, "cmr");
+		FontSetChanger dummy(pi.base, "cmr");
 		pi.draw(x, y, char_);
 	} else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
-		MathFontSetChanger dummy(pi.base, "cmm");
+		FontSetChanger dummy(pi.base, "cmm");
 		pi.draw(x, y, char_);
-	} else if (slanted(char_) && pi.base.fontname == "mathnormal") {
-		MathShapeChanger 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_);
@@ -112,11 +110,11 @@ void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
 }
 
 
-void MathCharInset::metricsT(TextMetricsInfo const &) const
+void MathCharInset::metricsT(TextMetricsInfo const &, Dimension & dim) const
 {
-	dim_.w = 1;
-	dim_.a = 1;
-	dim_.d = 0;
+	dim.wid = 1;
+	dim.asc = 1;
+	dim.des = 0;
 }
 
 
@@ -139,7 +137,7 @@ void MathCharInset::normalize(NormalStream & os) const
 }
 
 
-void MathCharInset::octavize(OctaveStream & os) const
+void MathCharInset::octave(OctaveStream & os) const
 {
 	os << 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_;
-}