use stream-like syntax for LaTeX output

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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 1afc2938aa6b321b0623b84a9b41d1a828c0eb9e..dd7915780d3f628404d7cea75513126bdde1b8cc 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,13 +1,13 @@
 #include "math_symbolinset.h"
-#include "mathed/math_parser.h"
+#include "math_parser.h"
+#include "support.h"
 #include "support/LOstream.h"
 
 
 using std::ostream;
 
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
-       : sym_(l)
-{}
+       : sym_(l), h_(0) {}
 
 
 MathInset * MathSymbolInset::clone() const
@@ -16,7 +16,7 @@ MathInset * MathSymbolInset::clone() const
 }
 
 
-void MathSymbolInset::write(ostream & os, bool /* fragile */) const
+void MathSymbolInset::write(MathWriteInfo & os) const
 {
        os << '\\' << sym_->name << ' ';
 }
@@ -24,24 +24,59 @@ void MathSymbolInset::write(ostream & os, bool /* fragile */) const
 
 void MathSymbolInset::writeNormal(ostream & os) const
 {
-       os << "[bigop " << sym_->name << "] ";
+       os << "[" << sym_->name << "] ";
 }
 
 
-void MathSymbolInset::metrics(MathStyles st) const
+MathTextCodes MathSymbolInset::code() 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;
+       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;
+}
 
-       mathed_string_dim(code_, size(), ssym_, ascent_, descent_, width_);
+
+void MathSymbolInset::metrics(MathMetricsInfo const & st) const
+{
+       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_;
+               }
+               return;
+       }
+
+       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_);
 }
 
 
@@ -49,6 +84,29 @@ void MathSymbolInset::draw(Painter & pain, int x, int y) const
 {  
        xo(x);
        yo(y);
+       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);
+}
 
-       drawStr(pain, code_, size_, x, y, ssym_);
+
+bool MathSymbolInset::isRelOp() const
+{
+       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;
 }