several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 1afc2938aa6b321b0623b84a9b41d1a828c0eb9e..bdcfdb8a1dc57c37fb41f35efd926a5193f619d9 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,54 +1,170 @@
+#include <config.h>
+
 #include "math_symbolinset.h"
-#include "mathed/math_parser.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
+#include "math_parser.h"
+#include "LaTeXFeatures.h"
+#include "debug.h"
 
 
 using std::ostream;
 
+
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
-       : sym_(l)
+       : 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
 {
        return new MathSymbolInset(*this);
 }
 
 
-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 << "[bigop " << 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;
 }
 
 
-void MathSymbolInset::metrics(MathStyles st) const
+void MathSymbolInset::draw(MathPainterInfo & pi, int x, int y) 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_TEXTRM;
-       }
+       //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);
+}
+
 
-       mathed_string_dim(code_, size(), ssym_, ascent_, descent_, width_);
+bool MathSymbolInset::isRelOp() const
+{
+       return sym_->extra == "mathrel";
+}
+
+
+bool MathSymbolInset::isScriptable() const
+{
+       return scriptable_;
+}
+
+
+bool MathSymbolInset::takesLimits() const
+{
+       return
+               sym_->inset == "cmex" ||
+               sym_->inset == "lyxboldsymb" ||
+               sym_->extra == "funclim";
 }
 
 
-void MathSymbolInset::draw(Painter & pain, int x, int y) const
-{  
-       xo(x);
-       yo(y);
+void MathSymbolInset::validate(LaTeXFeatures & features) const
+{
+       if (sym_->inset == "msa" || sym_->inset == "msb")
+               features.require("amssymb");
+}
 
-       drawStr(pain, code_, size_, x, y, ssym_);
+
+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
+               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_->extra);
+       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(ostream & os) const
+{
+       os << '\\' << name();
 }