further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 1ca489bd5b5f954c53ed405ca561da1302957a59..10520453ec46f7793493d41ec6c57930277b73ea 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -7,8 +7,7 @@
 using std::ostream;
 
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
-       : sym_(l)
-{}
+       : sym_(l), h_(0) {}
 
 
 MathInset * MathSymbolInset::clone() const
@@ -25,14 +24,59 @@ void MathSymbolInset::write(ostream & os, bool /* fragile */) const
 
 void MathSymbolInset::writeNormal(ostream & os) const
 {
-       os << "[bigop " << sym_->name << "] ";
+       os << "[" << sym_->name << "] ";
+}
+
+
+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;
+       }
+}
+
+
+MathTextCodes MathSymbolInset::code2() const
+{
+       if (sym_->token == LM_TK_CMEX)
+               return LM_TC_BOLDSYMB;
+       else
+               return LM_TC_SYMB;
 }
 
 
 void MathSymbolInset::metrics(MathStyles st) const
 {
-       size(st);
-       mathed_char_dim(LM_TC_SYMB, size_, sym_->id, ascent_, descent_, width_);
+       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;
+                       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_);
+       }
 }
 
 
@@ -40,12 +84,30 @@ void MathSymbolInset::draw(Painter & pain, int x, int y) const
 {  
        xo(x);
        yo(y);
-
-       drawChar(pain, LM_TC_SYMB, size_, x, y, sym_->id);
+       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);
+       else
+               drawStr(pain, LM_TC_TEX, size_, x, y, sym_->name);
 }
 
 
 bool MathSymbolInset::isRelOp() const
 {
-       return sym_->id == LM_leq || sym_->id == LM_geq;
+       return sym_->type == LMB_RELATION;
+}
+
+
+bool MathSymbolInset::isScriptable() const
+{
+       return size_ == LM_ST_DISPLAY && sym_->token == LM_TK_CMEX;
+}
+
+
+bool MathSymbolInset::takesLimits() const
+{
+       return sym_->token == LM_TK_CMEX;
 }