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 38ad5673ede1b2c91abc834e5bfeb860644898a2..bdcfdb8a1dc57c37fb41f35efd926a5193f619d9 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,48 +1,36 @@
+#include <config.h>
+
 #include "math_symbolinset.h"
-#include "math_parser.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), h_(0)
 {}
 
 
-MathInset * MathSymbolInset::clone() const
-{
-       return new MathSymbolInset(*this);
-}
+MathSymbolInset::MathSymbolInset(const char * name)
+       : sym_(in_word_set(name)), h_(0)
+{}
 
 
-MathTextCodes MathSymbolInset::code() 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;
-       }
-}
+MathSymbolInset::MathSymbolInset(string const & name)
+       : sym_(in_word_set(name.c_str())), h_(0)
+{}
+
 
 
-MathTextCodes MathSymbolInset::code2() const
+MathInset * MathSymbolInset::clone() const
 {
-       if (sym_->token == LM_TK_CMEX)
-               return LM_TC_BOLDSYMB;
-       else
-               return LM_TC_SYMB;
+       return new MathSymbolInset(*this);
 }
 
 
@@ -52,63 +40,74 @@ string MathSymbolInset::name() const
 }
 
 
-void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
+void MathSymbolInset::metrics(MathMetricsInfo & 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(), mi_, sym_->id, ascent_, descent_, width_);
-               else
-                       mathed_string_dim(LM_TC_TEX, mi_, sym_->name, ascent_, descent_, width_);
+       //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_ += mathed_char_width(LM_TC_TEX, mi_, 'I');
+               width_ += 6;
+
+       scriptable_ = false;
+       if (mi.base.style == LM_ST_DISPLAY)
+               if (sym_->inset == "cmex" || sym_->extra == "funclim")
+                       scriptable_ = true;
 }
 
 
-void MathSymbolInset::draw(Painter & pain, int x, int y) const
-{  
+void MathSymbolInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+       //lyxerr << "metrics: symbol: '" << sym_->name
+       //      << "' in font: '" << sym_->inset
+       //      << "' drawn as: '" << sym_->draw
+       //      << "'\n";
        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, 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, mi_, x, y, sym_->name);
+               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_->type == LMB_RELATION;
+{
+       return sym_->extra == "mathrel";
 }
 
 
 bool MathSymbolInset::isScriptable() const
 {
-       return mi_.style == LM_ST_DISPLAY && sym_->token == LM_TK_CMEX;
+       return scriptable_;
 }
 
 
 bool MathSymbolInset::takesLimits() const
 {
-       return sym_->token == LM_TK_CMEX;
+       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().c_str() << "]";
+       os << "[symbol " << name() << "]";
 }
 
 
@@ -116,14 +115,37 @@ void MathSymbolInset::maplize(MapleStream & os) const
 {
        if (name() == "cdot")
                os << '*';
+       else if (name() == "infty")
+               os << "infinity";
        else
-               os << 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 << name().c_str();
+       char const * type = MathMLtype(sym_->extra);
+       os << '<' << type << "> ";
+       if (sym_->xmlname == "x") // unknown so far
+               os << name();
+       else
+               os << sym_->xmlname;
+       os << " </" << type << '>';
 }
 
 
@@ -132,13 +154,17 @@ void MathSymbolInset::octavize(OctaveStream & os) const
        if (name() == "cdot")
                os << '*';
        else
-               os << name().c_str();
+               os << name();
 }
 
 
 void MathSymbolInset::write(WriteStream & os) const
 {
-       os << '\\' << name().c_str() << ' ';
+       os << '\\' << name() << ' ';
 }
 
 
+void MathSymbolInset::infoize(ostream & os) const
+{
+       os << '\\' << name();
+}