X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_symbolinset.C;h=bdcfdb8a1dc57c37fb41f35efd926a5193f619d9;hb=c649284611c4198c9d70be8a16d153cdf1ec0700;hp=10520453ec46f7793493d41ec6c57930277b73ea;hpb=e4c58b72be2c1357a389f71b20e5c29809ed6cbf;p=lyx.git

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 10520453ec..bdcfdb8a1d 100644
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,13 +1,31 @@
+#include <config.h>
+
 #include "math_symbolinset.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
 #include "math_parser.h"
-#include "support.h"
-#include "support/LOstream.h"
+#include "LaTeXFeatures.h"
+#include "debug.h"
 
 
 using std::ostream;
 
+
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
-	: sym_(l), h_(0) {}
+	: sym_(l), h_(0)
+{}
+
+
+MathSymbolInset::MathSymbolInset(const char * name)
+	: sym_(in_word_set(name)), h_(0)
+{}
+
+
+MathSymbolInset::MathSymbolInset(string const & name)
+	: sym_(in_word_set(name.c_str())), h_(0)
+{}
+
 
 
 MathInset * MathSymbolInset::clone() const
@@ -16,98 +34,137 @@ MathInset * MathSymbolInset::clone() const
 }
 
 
-void MathSymbolInset::write(ostream & os, bool /* fragile */) const
+string MathSymbolInset::name() const
 {
-	os << '\\' << sym_->name << ' ';
+	return sym_->name;
 }
 
 
-void MathSymbolInset::writeNormal(ostream & os) const
+void MathSymbolInset::metrics(MathMetricsInfo & mi) const
 {
-	os << "[" << sym_->name << "] ";
+	//lyxerr << "metrics: symbol: '" << sym_->name
+	//	<< "' in font: '" << sym_->inset
+	//	<< "' drawn as: '" << sym_->draw
+	//	<< "'\n";
+	MathFontSetChanger dummy(mi.base, sym_->inset.c_str());
+	mathed_string_dim(mi.base.font, sym_->draw, ascent_, descent_, width_);
+	// correct height for broken cmex font
+	if (sym_->inset == "cmex") {
+		h_ = 4 * descent_ / 5;
+		ascent_  += h_;
+		descent_ -= h_;
+	}
+	if (isRelOp())
+		width_ += 6;
+
+	scriptable_ = false;
+	if (mi.base.style == LM_ST_DISPLAY)
+		if (sym_->inset == "cmex" || sym_->extra == "funclim")
+			scriptable_ = true;
 }
 
 
-MathTextCodes MathSymbolInset::code() const
+void MathSymbolInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-	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;
-	}
+	//lyxerr << "metrics: symbol: '" << sym_->name
+	//	<< "' in font: '" << sym_->inset
+	//	<< "' drawn as: '" << sym_->draw
+	//	<< "'\n";
+	if (isRelOp())
+		x += 3;
+	MathFontSetChanger dummy(pi.base, sym_->inset.c_str());
+	drawStr(pi, pi.base.font, x, y - h_, sym_->draw);
+}
+
+
+bool MathSymbolInset::isRelOp() const
+{
+	return sym_->extra == "mathrel";
+}
+
+
+bool MathSymbolInset::isScriptable() const
+{
+	return scriptable_;
 }
 
 
-MathTextCodes MathSymbolInset::code2() const
+bool MathSymbolInset::takesLimits() const
 {
-	if (sym_->token == LM_TK_CMEX)
-		return LM_TC_BOLDSYMB;
+	return
+		sym_->inset == "cmex" ||
+		sym_->inset == "lyxboldsymb" ||
+		sym_->extra == "funclim";
+}
+
+
+void MathSymbolInset::validate(LaTeXFeatures & features) const
+{
+	if (sym_->inset == "msa" || sym_->inset == "msb")
+		features.require("amssymb");
+}
+
+
+void MathSymbolInset::normalize(NormalStream & os) const
+{
+	os << "[symbol " << name() << "]";
+}
+
+
+void MathSymbolInset::maplize(MapleStream & os) const
+{
+	if (name() == "cdot")
+		os << '*';
+	else if (name() == "infty")
+		os << "infinity";
 	else
-		return LM_TC_SYMB;
-}
-
-
-void MathSymbolInset::metrics(MathStyles st) const
-{
-	size_ = st;
-	MathTextCodes Code = code();
-	if (sym_->latex_font_id > 0 && math_font_available(Code)) {
-		mathed_char_dim(Code, size_, sym_->latex_font_id,
-				ascent_, descent_, width_);
-		if (Code == 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(), size_, sym_->id,
-				ascent_, descent_, width_);
-	} else {
-		mathed_string_dim(LM_TC_TEX, size_, sym_->name, ascent_, descent_, width_);
-	}
+		os << name();
 }
 
 
-void MathSymbolInset::draw(Painter & pain, int x, int y) const
-{  
-	xo(x);
-	yo(y);
-	MathTextCodes Code = code();
-	if (sym_->latex_font_id > 0 && math_font_available(Code))
-		drawChar(pain, Code, size_, x, y - h_, sym_->latex_font_id);
-	else if (sym_->id > 0 && sym_->id < 255 &&
-		 math_font_available(LM_TC_SYMB))
-		drawChar(pain, code2(), size_, x, y, sym_->id);
+char const * MathMLtype(string const & s)
+{
+	if (s == "mathop")
+		return "mo";
+	return "mi";
+}
+
+
+bool MathSymbolInset::match(MathInset * p) const
+{
+	MathSymbolInset const * q = p->asSymbolInset();
+	return q && name() == q->name();
+}
+
+
+void MathSymbolInset::mathmlize(MathMLStream & os) const
+{
+	char const * type = MathMLtype(sym_->extra);
+	os << '<' << type << "> ";
+	if (sym_->xmlname == "x") // unknown so far
+		os << name();
 	else
-		drawStr(pain, LM_TC_TEX, size_, x, y, sym_->name);
+		os << sym_->xmlname;
+	os << " </" << type << '>';
 }
 
 
-bool MathSymbolInset::isRelOp() const
+void MathSymbolInset::octavize(OctaveStream & os) const
 {
-	return sym_->type == LMB_RELATION;
+	if (name() == "cdot")
+		os << '*';
+	else
+		os << name();
 }
 
 
-bool MathSymbolInset::isScriptable() const
+void MathSymbolInset::write(WriteStream & os) const
 {
-	return size_ == LM_ST_DISPLAY && sym_->token == LM_TK_CMEX;
+	os << '\\' << name() << ' ';
 }
 
 
-bool MathSymbolInset::takesLimits() const
+void MathSymbolInset::infoize(ostream & os) const
 {
-	return sym_->token == LM_TK_CMEX;
+	os << '\\' << name();
 }