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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index a5eca98288..a212db15e7 100644
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -1,105 +1,141 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_charinset.h"
 #include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
+#include "frontends/font_metrics.h"
 #include "support/LOstream.h"
-#include "mathed/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>
+
+
+using std::ostream;
+using std::endl;
+
+#ifndef CXX_GLOBAL_CSTD
+using std::strchr;
+using std::isalpha;
+#endif
+
+
+namespace {
+
+	bool isBinaryOp(char c)
+	{
+		return strchr("+-<>=/*", c);
+	}
+
+
+	bool slanted(char c)
+	{
+		//if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
+		return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
+	}
 
-MathCharInset::MathCharInset(char c, MathTextCodes t)
-	: char_(c)
-{
-	code(t);
 }
 
 
+MathCharInset::MathCharInset(char c)
+	: char_(c)
+{}
+
+
+
 MathInset * MathCharInset::clone() const
-{   
+{
 	return new MathCharInset(*this);
 }
 
 
-int MathCharInset::ascent() const
+void MathCharInset::metrics(MathMetricsInfo & mi) const
 {
-	return mathed_char_ascent(code_, size(), char_);
+#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
 }
 
 
-int MathCharInset::descent() const
+void MathCharInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-	return mathed_char_descent(code_, size(), char_);
+	//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
 }
 
 
-int MathCharInset::width() const
+void MathCharInset::metricsT(TextMetricsInfo const &) const
 {
-	return mathed_char_width(code_, size(), char_);
+	width_   = 1;
+	ascent_  = 1;
+	descent_ = 0;
 }
 
 
-void MathCharInset::metrics(MathStyles st) const
+void MathCharInset::drawT(TextPainter & pain, int x, int y) const
 {
-	size_ = st;
+	//lyxerr << "drawing text '" << char_ << "' code: " << code_ << endl;
+	pain.draw(x, y, char_);
 }
 
 
-void MathCharInset::draw(Painter & pain, int x, int y) const
-{ 
-	xo(x);
-	yo(y);
-	drawChar(pain, code_, size_, x, y, char_);
+void MathCharInset::write(WriteStream & os) const
+{
+	os << char_;
 }
 
 
-void MathCharInset::write(std::ostream & os, bool) const
+void MathCharInset::normalize(NormalStream & os) const
 {
-	int brace = 0;
+	os << "[char " << char_ << " " << "mathalpha" << "]";
+}
 
-	if (MathIsSymbol(code_)) {
-		latexkeys const * l = lm_get_key_by_id(char_, LM_TK_SYM);
 
-		if (l == 0) 
-			l = lm_get_key_by_id(char_, LM_TK_BIGSYM);
+void MathCharInset::octavize(OctaveStream & os) const
+{
+	os << char_;
+}
 
-		if (l) {
-			os << '\\' << l->name << ' ';
-		} else {
-			lyxerr << "Could not find the LaTeX name for  "	
-				<< char_ << " and code_ " << code_ << "!" << std::endl;
-		}
-	} else {
-		if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM) 
-			os << '\\' << math_font_name[code_ - LM_TC_RM] << '{';
-
-		// Is there a standard logical XOR?
-		if ((code_ == LM_TC_TEX && char_ != '{' && char_ != '}') ||
-				(code_ == LM_TC_SPECIAL))
-			os << '\\';
-		else {
-			if (char_ == '{')
-				++brace;
-			if (char_ == '}')
-				--brace;
-		}
-		if (char_ == '}' && code_ == LM_TC_TEX && brace < 0) 
-			lyxerr <<"Math warning: Unexpected closing brace.\n";
-		else	       
-			os << char_;
-	}
 
-	if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM)
-		os << '}';
+bool MathCharInset::isRelOp() const
+{
+	return char_ == '=' || char_ == '<' || char_ == '>';
 }
 
 
-void MathCharInset::writeNormal(std::ostream & os) const
+bool MathCharInset::match(MathInset * p) const
 {
-	os << "[sqrt ";
-	cell(0).writeNormal(os); 
-	os << "] ";
+	MathCharInset const * q = p->asCharInset();
+	return q && char_ == q->char_;
 }