fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 8b7fc8d546b5595cfa054c32c560f0f9dd9af179..952dc816aeafae2d3e124ca388941ea55abeaf13 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -5,9 +5,13 @@
 #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)
 {}
@@ -32,7 +36,7 @@ MathInset * MathSymbolInset::clone() const
 
 MathTextCodes MathSymbolInset::code() const
 {
-       switch(sym_->token) {
+       switch (sym_->token) {
        case LM_TK_CMR:
                return LM_TC_CMR;
        case LM_TK_CMSY:
@@ -68,42 +72,52 @@ string MathSymbolInset::name() const
 
 void MathSymbolInset::metrics(MathMetricsInfo const & mi) const
 {
+       LyXFont font;
        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_);
+               whichFont(font, c, mi_);
+               mathed_char_dim(font, char(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_);
+               if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB)) {
+                       whichFont(font, code2(), mi_);
+                       mathed_char_dim(font, char(sym_->id), ascent_, descent_, width_);
+               } else {
+                       whichFont(font, LM_TC_TEX, mi_);
+                       mathed_string_dim(font, sym_->name, ascent_, descent_, width_);
+               }
        }
        if (isRelOp())
-               width_ += mathed_char_width(LM_TC_TEX, mi_, 'I');
+               width_ += 6;
 }
 
 
 void MathSymbolInset::draw(Painter & pain, int x, int y) const
-{  
+{
        if (isRelOp())
-               x += mathed_char_width(LM_TC_TEX, mi_, 'I') / 2;
+               x += 3;
        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);
+       LyXFont font;
+       if (sym_->latex_font_id > 0 && math_font_available(Code)) {
+               whichFont(font, Code, mi_);
+               drawChar(pain, font, x, y - h_, char(sym_->latex_font_id));
+       } else if (sym_->id > 0 && sym_->id < 255 && math_font_available(LM_TC_SYMB)){
+               whichFont(font, code2(), mi_);
+               drawChar(pain, font, x, y, char(sym_->id));
+       } else {
+               whichFont(font, LM_TC_TEX, mi_);
+               drawStr(pain, font, x, y, sym_->name);
+       }
 }
 
 
 bool MathSymbolInset::isRelOp() const
-{      
+{
        return sym_->type == "mathrel";
 }
 
@@ -119,6 +133,11 @@ bool MathSymbolInset::takesLimits() const
        return sym_->token == LM_TK_CMEX;
 }
 
+void MathSymbolInset::validate(LaTeXFeatures & features) const
+{
+       if (sym_->token == LM_TK_MSA || sym_->token == LM_TK_MSB)
+               features.require("amssymb");
+}
 
 void MathSymbolInset::normalize(NormalStream & os) const
 {
@@ -177,9 +196,7 @@ void MathSymbolInset::write(WriteStream & os) const
 }
 
 
-void MathSymbolInset::infoize(std::ostream & os) const
+void MathSymbolInset::infoize(ostream & os) const
 {
        os << '\\' << name();
 }
-
-