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

diff --git a/src/mathed/math_charinset.C b/src/mathed/math_charinset.C
index ff1852c162..8f2674bba3 100644
--- a/src/mathed/math_charinset.C
+++ b/src/mathed/math_charinset.C
@@ -1,125 +1,145 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include <cctype>
+/**
+ * \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 "Painter.h"
-#include "support/LOstream.h"
-#include "mathed/support.h"
-#include "math_parser.h"
-#include "debug.h"
-
+#include "math_support.h"
+#include "math_mathmlstream.h"
 
-namespace {
-
-char const * math_font_name[] = {
-	"mathrm",
-	"mathcal",
-	"mathbf",
-	"mathbb",
-	"mathsf",
-	"mathtt",
-	"mathit",
-	"textrm"
-};
+#include "debug.h"
+#include "dimension.h"
+#include "support/lstrings.h"
+#include "textpainter.h"
 
-}
+using std::auto_ptr;
 
+extern bool has_math_fonts;
 
-MathCharInset::MathCharInset(char c)
-	: char_(c), code_(nativeCode(c))
-{
-//lyxerr << "creating char '" << char_ << "' with code " << int(code_) << endl;
-}
+namespace {
 
+	bool isBinaryOp(char c)
+	{
+		return lyx::support::contains("+-<>=/*", c);
+	}
 
-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;
-}
 
+	bool slanted(char c)
+	{
+		return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z');
+	}
 
-MathTextCodes MathCharInset::nativeCode(char c) const
-{
-	if (isalpha(c))
-		return LM_TC_VAR;
-	//if (strchr("0123456789;:!|[]().,?+/-*<>=", c)
-	return LM_TC_CONST;
 }
 
 
-MathInset * MathCharInset::clone() const
-{   
-	return new MathCharInset(*this);
-}
-
+MathCharInset::MathCharInset(char c)
+	: char_(c)
+{}
 
-int MathCharInset::ascent() const
-{
-	return mathed_char_ascent(code_, mi_, char_);
-}
 
 
-int MathCharInset::descent() const
+auto_ptr<InsetBase> MathCharInset::doClone() const
 {
-	return mathed_char_descent(code_, mi_, char_);
+	return auto_ptr<InsetBase>(new MathCharInset(*this));
 }
 
 
-int MathCharInset::width() const
+void MathCharInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	return mathed_char_width(code_, mi_, char_);
+#if 1
+	if (char_ == '=' && has_math_fonts) {
+		FontSetChanger dummy(mi.base, "cmr");
+		mathed_char_dim(mi.base.font, char_, dim);
+	} 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::UP_SHAPE);
+		mathed_char_dim(mi.base.font, char_, dim);
+	} else {
+		mathed_char_dim(mi.base.font, char_, dim);
+	}
+	int const em = mathed_char_width(mi.base.font, 'M');
+	if (isBinaryOp(char_))
+		dim.wid += static_cast<int>(0.5*em+0.5);
+	else if (char_ == '\'')
+		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 << endl;
+#endif
+	width_ = dim.wid;
 }
 
 
-void MathCharInset::metrics(MathMetricsInfo const & mi) const
+void MathCharInset::draw(PainterInfo & pi, int x, int y) const
 {
-	mi_ = mi;
-}
-
-
-void MathCharInset::draw(Painter & pain, int x, int y) const
-{ 
-	//lyxerr << "drawing '" << char_ << "' code: " << code_ << endl;
-	drawChar(pain, code_, mi_, x, y, char_);
+	//lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << endl;
+	int const em = mathed_char_width(pi.base.font, 'M');
+	if (isBinaryOp(char_))
+		x += static_cast<int>(0.25*em+0.5);
+	else if (char_ == '\'')
+		x += static_cast<int>(0.0833*em+0.5);
+#if 1
+	if (char_ == '=' && has_math_fonts) {
+		FontSetChanger dummy(pi.base, "cmr");
+		pi.draw(x, y, char_);
+	} 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::UP_SHAPE);
+		pi.draw(x, y, char_);
+	} else {
+		pi.draw(x, y, char_);
+	}
+#else
+	drawChar(pain, font_, x, y, char_);
+#endif
 }
 
 
-void MathCharInset::writeHeader(std::ostream & os) const
+void MathCharInset::metricsT(TextMetricsInfo const &, Dimension & dim) const
 {
-	if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM) 
-		os << '\\' << math_font_name[code_ - LM_TC_RM] << '{';
+	dim.wid = 1;
+	dim.asc = 1;
+	dim.des = 0;
 }
 
 
-void MathCharInset::writeTrailer(std::ostream & os) const
+void MathCharInset::drawT(TextPainter & pain, int x, int y) const
 {
-	if (code_ >= LM_TC_RM && code_ <= LM_TC_TEXTRM)
-		os << '}';
+	//lyxerr << "drawing text '" << char_ << "' code: " << code_ << endl;
+	pain.draw(x, y, char_);
 }
 
 
-void MathCharInset::writeRaw(std::ostream & os) const
+void MathCharInset::write(WriteStream & os) const
 {
 	os << char_;
 }
 
 
-void MathCharInset::write(MathWriteInfo & os) const
+void MathCharInset::normalize(NormalStream & os) const
 {
-	writeHeader(os.os);
-	writeRaw(os.os);
-	writeTrailer(os.os);
+	os << "[char " << char_ << ' ' << "mathalpha]";
 }
 
 
-void MathCharInset::writeNormal(std::ostream & os) const
+void MathCharInset::octave(OctaveStream & os) const
 {
-	os << "[char " << char_ << " " << "mathalpha" << "]";
+	os << char_;
 }
 
 
@@ -127,9 +147,3 @@ bool MathCharInset::isRelOp() const
 {
 	return char_ == '=' || char_ == '<' || char_ == '>';
 }
-
-
-void MathCharInset::handleFont(MathTextCodes t)
-{
-	code_ = (code_ == t) ? LM_TC_VAR : t;
-}