X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_symbolinset.C;h=94d5697be0aecb6506d4a84b4056c2aca9b71de2;hb=7cccd80619f757b705ea14020b1fd00043607224;hp=ea1efff9b069556d46081cf2c86c4ef3d1a52c76;hpb=20effa2eb1feaad48d8d0daf6d9d8eb250cf78be;p=lyx.git

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index ea1efff9b0..94d5697be0 100644
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,12 +1,14 @@
 #include "math_symbolinset.h"
-#include "mathed/math_parser.h"
+#include "math_parser.h"
+#include "debug.h"
+#include "support.h"
 #include "support/LOstream.h"
 
 
 using std::ostream;
 
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
-	: sym_(l)
+	: sym_(l), h_(0)
 {}
 
 
@@ -16,7 +18,7 @@ MathInset * MathSymbolInset::clone() const
 }
 
 
-void MathSymbolInset::write(ostream & os, bool /* fragile */) const
+void MathSymbolInset::write(MathWriteInfo & os) const
 {
 	os << '\\' << sym_->name << ' ';
 }
@@ -24,37 +26,115 @@ void MathSymbolInset::write(ostream & os, bool /* fragile */) const
 
 void MathSymbolInset::writeNormal(ostream & os) const
 {
-	os << "[bigop " << sym_->name << "] ";
+	os << "[symbol " << sym_->name << "]";
 }
 
 
-void MathSymbolInset::metrics(MathStyles st) const
+MathTextCodes MathSymbolInset::code() const
 {
-	size(st);
-	
-	if (sym_->id > 0 && sym_->id < 256) {
-		ssym_ = string();
-		ssym_ += sym_->id;
-		code_ = (sym_->token == LM_TK_BIGSYM) ? LM_TC_BSYM : LM_TC_SYMB;
-	} else {
-		ssym_ = sym_->name;
-		code_ = LM_TC_TEX;
+	switch(sym_->token) {
+	case LM_TK_CMR:
+		return LM_TC_CMR;
+	case LM_TK_CMSY:
+		return LM_TC_CMSY;
+	case LM_TK_CMM:
+		return LM_TC_CMM;
+	case LM_TK_CMEX:
+		return LM_TC_CMEX;
+	case LM_TK_MSA:
+		return LM_TC_MSA;
+	case LM_TK_MSB:
+		return LM_TC_MSB;
+	default:
+		return LM_TC_SYMB;
 	}
+}
+
+
+MathTextCodes MathSymbolInset::code2() const
+{
+	if (sym_->token == LM_TK_CMEX)
+		return LM_TC_BOLDSYMB;
+	else
+		return LM_TC_SYMB;
+}
 
-	mathed_string_dim(code_, size(), ssym_, ascent_, descent_, width_);
+
+void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
+{
+	mi_ = mi;
+	MathTextCodes c = code();
+	if (sym_->latex_font_id > 0 && math_font_available(c)) {
+		mathed_char_dim(c, mi_, sym_->latex_font_id, ascent_, descent_, width_);
+		if (c == LM_TC_CMEX) {
+			h_ = 4 * descent_ / 5;
+			ascent_  += h_;
+			descent_ -= h_;
+		}
+	} else {
+		if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB))
+			mathed_char_dim(code2(), mi_, sym_->id, ascent_, descent_, width_);
+		else
+			mathed_string_dim(LM_TC_TEX, mi_, sym_->name, ascent_, descent_, width_);
+	}
+	if (isRelOp())
+		width_ +=  mathed_char_width(LM_TC_TEX, mi_, 'I');
 }
 
 
 void MathSymbolInset::draw(Painter & pain, int x, int y) const
 {  
-	xo(x);
-	yo(y);
-
-	drawStr(pain, code_, size_, x, y, ssym_);
+	if (isRelOp())
+		x += mathed_char_width(LM_TC_TEX, mi_, 'I') / 2;
+	MathTextCodes Code = code();
+	if (sym_->latex_font_id > 0 && math_font_available(Code))
+		drawChar(pain, Code, mi_, x, y - h_, sym_->latex_font_id);
+	else if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB))
+		drawChar(pain, code2(), mi_, x, y, sym_->id);
+	else
+		drawStr(pain, LM_TC_TEX, mi_, x, y, sym_->name);
 }
 
 
 bool MathSymbolInset::isRelOp() const
+{	
+	return sym_->type == LMB_RELATION;
+}
+
+
+bool MathSymbolInset::isScriptable() const
+{
+	return mi_.style == LM_ST_DISPLAY && sym_->token == LM_TK_CMEX;
+}
+
+
+bool MathSymbolInset::takesLimits() const
+{
+	return sym_->token == LM_TK_CMEX;
+}
+
+
+void MathSymbolInset::maplize(MapleStream & os) const
+{
+	if (sym_->name == "cdot")
+		os << '*';
+	else
+		os << sym_->name.c_str();
+}
+
+
+void MathSymbolInset::mathmlize(MathMLStream & os) const
+{
+	os << sym_->name.c_str();
+}
+
+
+void MathSymbolInset::octavize(OctaveStream & os) const
 {
-	return sym_->id == LM_leq || sym_->id == LM_geq;
+	if (sym_->name == "cdot")
+		os << '*';
+	else
+		os << sym_->name.c_str();
 }
+
+