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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index b9e84c9c80..f2f0f5c6a2 100644
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,8 +1,11 @@
+#include <config.h>
+
 #include "math_symbolinset.h"
-#include "math_parser.h"
 #include "math_mathmlstream.h"
-#include "debug.h"
+#include "math_streamstr.h"
 #include "math_support.h"
+#include "math_parser.h"
+#include "debug.h"
 
 
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
@@ -10,21 +13,20 @@ MathSymbolInset::MathSymbolInset(const latexkeys * l)
 {}
 
 
-MathInset * MathSymbolInset::clone() const
-{
-	return new MathSymbolInset(*this);
-}
+MathSymbolInset::MathSymbolInset(const char * name)
+	: sym_(in_word_set(name)), h_(0)
+{}
 
 
-void MathSymbolInset::write(MathWriteInfo & os) const
-{
-	os << '\\' << sym_->name.c_str() << ' ';
-}
+MathSymbolInset::MathSymbolInset(string const & name)
+	: sym_(in_word_set(name.c_str())), h_(0)
+{}
+
 
 
-void MathSymbolInset::writeNormal(NormalStream & os) const
+MathInset * MathSymbolInset::clone() const
 {
-	os << "[symbol " << sym_->name.c_str() << "]";
+	return new MathSymbolInset(*this);
 }
 
 
@@ -58,6 +60,12 @@ MathTextCodes MathSymbolInset::code2() const
 }
 
 
+string MathSymbolInset::name() const
+{
+	return sym_->name;
+}
+
+
 void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
 {
 	mi_ = mi;
@@ -76,7 +84,7 @@ void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
 			mathed_string_dim(LM_TC_TEX, mi_, sym_->name, ascent_, descent_, width_);
 	}
 	if (isRelOp())
-		width_ +=  mathed_char_width(LM_TC_TEX, mi_, 'I');
+		width_ += mathed_char_width(LM_TC_TEX, mi_, 'I');
 }
 
 
@@ -96,7 +104,7 @@ void MathSymbolInset::draw(Painter & pain, int x, int y) const
 
 bool MathSymbolInset::isRelOp() const
 {	
-	return sym_->type == LMB_RELATION;
+	return sym_->type == "mathrel";
 }
 
 
@@ -112,27 +120,71 @@ bool MathSymbolInset::takesLimits() const
 }
 
 
+void MathSymbolInset::normalize(NormalStream & os) const
+{
+	os << "[symbol " << name() << "]";
+}
+
+
 void MathSymbolInset::maplize(MapleStream & os) const
 {
-	if (sym_->name == "cdot")
+	if (name() == "cdot")
 		os << '*';
 	else
-		os << sym_->name.c_str();
+		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
 {
-	os << sym_->name.c_str();
+	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 (sym_->name == "cdot")
+	if (name() == "cdot")
 		os << '*';
 	else
-		os << sym_->name.c_str();
+		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");
+}