updates to latexfeatures stuff; allow empty \document_path

[lyx.git] / src / mathed / math_symbolinset.C

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 0e8c4a609ac5d5e9e7a9ccd584c4cd2f1b5cad01..c861d5c94289f70744f7543a7af01f1b61eee024 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,32 +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 "debug.h"
-#include "support.h"
-#include "support/LOstream.h"
-
 
-using std::ostream;
 
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
        : 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(MathWriteInfo & os) 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 << "[symbol " << sym_->name << "]";
+       return new MathSymbolInset(*this);
 }
 
 
@@ -60,6 +60,12 @@ MathTextCodes MathSymbolInset::code2() const
 }
 
 
+string MathSymbolInset::name() const
+{
+       return sym_->name;
+}
+
+
 void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
 {
        mi_ = mi;
@@ -78,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');
 }
 
 
@@ -98,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";
 }
 
 
@@ -114,23 +120,60 @@ bool MathSymbolInset::takesLimits() const
 }
 
 
-string MathSymbolInset::octavize() const
+void MathSymbolInset::normalize(NormalStream & os) const
 {
-       if (sym_->name == "cdot")
-               return "*";
-       return sym_->name;
+       os << "[symbol " << name() << "]";
 }
 
 
-string MathSymbolInset::maplize() const
+void MathSymbolInset::maplize(MapleStream & os) const
 {
-       if (sym_->name == "cdot")
-               return "*";
-       return sym_->name;
+       if (name() == "cdot")
+               os << '*';
+       else
+               os << name();
 }
 
 
-string MathSymbolInset::mathmlize() const
+char const * MathMLtype(string const & s)
 {
-       return sym_->name;
+       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() << ' ';
+}
+
+