X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_charinset.C;h=a212db15e7e356c3e8851de0fe1ecd7a73cf2b68;hb=4bc59f21015e9151841eea3733b97d25cd616fdc;hp=b89280fce28b84124a48d31b68d9c9cc405572bf;hpb=aed2b1804c474ad4927a681c708b45bee6c4a36f;p=lyx.git

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index b89280fce2..a212db15e7 100644
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -1,104 +1,118 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <cctype>
-
 #include "math_charinset.h"
 #include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
+#include "frontends/font_metrics.h"
 #include "support/LOstream.h"
-#include "math_support.h"
-#include "math_parser.h"
 #include "debug.h"
+#include "math_support.h"
 #include "math_mathmlstream.h"
+#include "LaTeXFeatures.h"
+#include "textpainter.h"
 
+#include <cctype>
+#include <cstring>
 
-MathCharInset::MathCharInset(char c)
-	: char_(c), code_(nativeCode(c))
-{
-//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl;
-}
 
+using std::ostream;
+using std::endl;
 
-MathCharInset::MathCharInset(char c, MathTextCodes t)
-	: char_(c), code_((t == LM_TC_MIN) ? nativeCode(c) : t)
-{
-//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl;
-}
+#ifndef CXX_GLOBAL_CSTD
+using std::strchr;
+using std::isalpha;
+#endif
 
 
-MathTextCodes MathCharInset::nativeCode(char c) const
-{
-	if (isalpha(c))
-		return LM_TC_VAR;
-	//if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
-	return LM_TC_CONST;
-}
+namespace {
 
+	bool isBinaryOp(char c)
+	{
+		return strchr("+-<>=/*", c);
+	}
 
-MathInset * MathCharInset::clone() const
-{   
-	return new MathCharInset(*this);
-}
 
+	bool slanted(char c)
+	{
+		//if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
+		return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
+	}
 
-int MathCharInset::ascent() const
-{
-	return mathed_char_ascent(code_, mi_, char_);
 }
 
 
-int MathCharInset::descent() const
-{
-	return mathed_char_descent(code_, mi_, char_);
-}
+MathCharInset::MathCharInset(char c)
+	: char_(c)
+{}
 
 
-int MathCharInset::width() const
-{
-	return mathed_char_width(code_, mi_, char_);
-}
 
-
-void MathCharInset::metrics(MathMetricsInfo const & mi) const
+MathInset * MathCharInset::clone() const
 {
-	mi_ = mi;
+	return new MathCharInset(*this);
 }
 
 
-void MathCharInset::draw(Painter & pain, int x, int y) const
-{ 
-	//lyxerr << "drawing '" << char_ << "' code: " << code_ << endl;
-	drawChar(pain, code_, mi_, x, y, char_);
+void MathCharInset::metrics(MathMetricsInfo & mi) const
+{
+#if 1
+	if (slanted(char_) && mi.base.fontname == "mathnormal") {
+		MathShapeChanger dummy(mi.base.font, LyXFont::ITALIC_SHAPE);
+		mathed_char_dim(mi.base.font, char_, ascent_, descent_, width_);
+	} else {
+		mathed_char_dim(mi.base.font, char_, ascent_, descent_, width_);
+	}
+	if (isBinaryOp(char_))
+		width_ += 2 * font_metrics::width(' ', mi.base.font);
+#else
+	whichFont(font_, code_, mi);
+	mathed_char_dim(font_, char_, ascent_, descent_, width_);
+	if (isBinaryOp(char_, code_))
+		width_ += 2 * font_metrics::width(' ', font_);
+#endif
 }
 
 
-void MathCharInset::writeHeader(std::ostream & os) const
+void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-	if (math_font_name(code_))
-		os << '\\' << math_font_name(code_) << '{';
+	//lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << endl;
+	if (isBinaryOp(char_))
+		x += font_metrics::width(' ', pi.base.font);
+#if 1
+	if (slanted(char_) && pi.base.fontname == "mathnormal") {
+		MathShapeChanger dummy(pi.base.font, LyXFont::ITALIC_SHAPE);
+		pi.draw(x, y, char_);
+	} else {
+		pi.draw(x, y, char_);
+	}
+#else
+	drawChar(pain, font_, x, y, char_);
+#endif
 }
 
 
-void MathCharInset::writeTrailer(std::ostream & os) const
+void MathCharInset::metricsT(TextMetricsInfo const &) const
 {
-	if (math_font_name(code_))
-		os << '}';
+	width_   = 1;
+	ascent_  = 1;
+	descent_ = 0;
 }
 
 
-void MathCharInset::writeRaw(std::ostream & os) const
+void MathCharInset::drawT(TextPainter & pain, int x, int y) const
 {
-	os << char_;
+	//lyxerr << "drawing text '" << char_ << "' code: " << code_ << endl;
+	pain.draw(x, y, char_);
 }
 
 
 void MathCharInset::write(WriteStream & os) const
 {
-	writeHeader(os.os());
-	writeRaw(os.os());
-	writeTrailer(os.os());
+	os << char_;
 }
 
 
@@ -108,20 +122,20 @@ void MathCharInset::normalize(NormalStream & os) const
 }
 
 
-bool MathCharInset::isRelOp() const
+void MathCharInset::octavize(OctaveStream & os) const
 {
-	return char_ == '=' || char_ == '<' || char_ == '>';
+	os << char_;
 }
 
 
-void MathCharInset::handleFont(MathTextCodes t)
+bool MathCharInset::isRelOp() const
 {
-	code_ = (code_ == t) ? LM_TC_VAR : t;
+	return char_ == '=' || char_ == '<' || char_ == '>';
 }
 
 
 bool MathCharInset::match(MathInset * p) const
 {
 	MathCharInset const * q = p->asCharInset();
-	return q && char_ == q->char_ && code_ == q->code_;
+	return q && char_ == q->char_;
 }