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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 10520453ec..f2f0f5c6a2 100644
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,30 +1,32 @@
+#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 "debug.h"
 
-using std::ostream;
 
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
-	: sym_(l), h_(0) {}
+	: sym_(l), h_(0)
+{}
 
 
-MathInset * MathSymbolInset::clone() const
-{
-	return new MathSymbolInset(*this);
-}
+MathSymbolInset::MathSymbolInset(const char * name)
+	: sym_(in_word_set(name)), h_(0)
+{}
 
 
-void MathSymbolInset::write(ostream & os, bool /* fragile */) const
-{
-	os << '\\' << sym_->name << ' ';
-}
+MathSymbolInset::MathSymbolInset(string const & name)
+	: sym_(in_word_set(name.c_str())), h_(0)
+{}
+
 
 
-void MathSymbolInset::writeNormal(ostream & os) const
+MathInset * MathSymbolInset::clone() const
 {
-	os << "[" << sym_->name << "] ";
+	return new MathSymbolInset(*this);
 }
 
 
@@ -58,52 +60,57 @@ MathTextCodes MathSymbolInset::code2() const
 }
 
 
-void MathSymbolInset::metrics(MathStyles st) const
+string MathSymbolInset::name() 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;
+	return sym_->name;
+}
+
+
+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(), size_, sym_->id,
-				ascent_, descent_, width_);
 	} else {
-		mathed_string_dim(LM_TC_TEX, size_, sym_->name, ascent_, descent_, width_);
+		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);
+	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, 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);
+		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, size_, x, y, sym_->name);
+		drawStr(pain, LM_TC_TEX, mi_, x, y, sym_->name);
 }
 
 
 bool MathSymbolInset::isRelOp() const
-{
-	return sym_->type == LMB_RELATION;
+{	
+	return sym_->type == "mathrel";
 }
 
 
 bool MathSymbolInset::isScriptable() const
 {
-	return size_ == LM_ST_DISPLAY && sym_->token == LM_TK_CMEX;
+	return mi_.style == LM_ST_DISPLAY && sym_->token == LM_TK_CMEX;
 }
 
 
@@ -111,3 +118,73 @@ bool MathSymbolInset::takesLimits() const
 {
 	return sym_->token == LM_TK_CMEX;
 }
+
+
+void MathSymbolInset::normalize(NormalStream & os) const
+{
+	os << "[symbol " << name() << "]";
+}
+
+
+void MathSymbolInset::maplize(MapleStream & os) const
+{
+	if (name() == "cdot")
+		os << '*';
+	else
+		os << name();
+}
+
+
+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_->type);
+	os << '<' << type << "> ";
+	if (sym_->xmlname == "x") // unknown so far
+		os << name();
+	else
+		os << sym_->xmlname;
+	os << " </" << type << '>';
+}
+
+
+void MathSymbolInset::octavize(OctaveStream & os) const
+{
+	if (name() == "cdot")
+		os << '*';
+	else
+		os << name();
+}
+
+
+void MathSymbolInset::write(WriteStream & os) const
+{
+	os << '\\' << name() << ' ';
+}
+
+
+void MathSymbolInset::infoize(std::ostream & os) const
+{
+	os << '\\' << name();
+}
+
+
+void MathSymbolInset::validate(LaTeXFeatures & features) const
+{
+	// if (...)
+	//	features.require("amssymb");
+}