whichFont down to 5.3%

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

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index f3d5a0b3d5c9725bc827ad4df219070f89446a2f..8bea104b7d35149920c49c1c57dea63906b26f36 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -6,11 +6,13 @@
 #include "lyxfont.h"
 #include "FontLoader.h"
 #include "font.h"
+#include "math_cursor.h"
 #include "math_defs.h"
 #include "math_inset.h"
 #include "math_parser.h"
 #include "Painter.h"
 #include "debug.h"
+#include "commandtags.h"
 
 using std::map;
 using std::endl;
@@ -85,12 +87,7 @@ enum MathFont {
 
 void mathed_init_fonts()
 {
-       MathFonts = new LyXFont[FONT_NUM]; //DEC cxx cannot initialize all fonts
-       //at once (JMarc) rc
-
-       for (int i = 0 ; i < FONT_NUM ; ++i) {
-               MathFonts[i] = LyXFont(LyXFont::ALL_SANE);
-       }
+       MathFonts = new LyXFont[FONT_NUM];
 
        MathFonts[FONT_IT].setShape(LyXFont::ITALIC_SHAPE);
 
@@ -190,6 +187,7 @@ LyXFont const & whichFontBaseIntern(MathTextCodes type)
        return MathFonts[1];
 }
 
+
 LyXFont const & whichFontBase(MathTextCodes type)
 {
        if (!MathFonts)
@@ -221,9 +219,9 @@ LyXFont const & whichFontBase(MathTextCodes type)
 }
 
 
-LyXFont whichFont(MathTextCodes type, MathMetricsInfo const & size)
+void whichFont(LyXFont & f, MathTextCodes type, MathMetricsInfo const & size)
 {
-       LyXFont f = whichFontBase(type);
+       f = whichFontBase(type);
        // use actual size
        f.setSize(size.font.size());
 
@@ -259,8 +257,6 @@ LyXFont whichFont(MathTextCodes type, MathMetricsInfo const & size)
 
        if (type == LM_TC_TEX)
                f.setColor(LColor::latex);
-
-       return f;
 }
 
 } // namespace
@@ -271,6 +267,8 @@ bool math_font_available(MathTextCodes type)
        if (!font_available_initialized[type]) {
                font_available_initialized[type] = true;
                font_available[type] = fontloader.available(whichFontBaseIntern(type));
+               if (!font_available[type])
+                       lyxerr[Debug::FONT] << "Math font " << type << " not available.\n";
        }
        return font_available[type];
 }
@@ -394,9 +392,17 @@ double const hline[] = {
 };
 
 
-double const hline2[] = {
-       1, 0.1, 0.5,  0.3, 0.5,
-       1, 0.7, 0.5,  0.9, 0.5,
+double const ddot[] = {
+       1, 0.2, 0.5,  0.3, 0.5,
+       1, 0.7, 0.5,  0.8, 0.5,
+       0
+};
+
+
+double const dddot[] = {
+       1, 0.1, 0.5,  0.2, 0.5,
+       1, 0.45, 0.5, 0.55, 0.5,
+       1, 0.8, 0.5,  0.9, 0.5,
        0
 };
 
@@ -458,13 +464,20 @@ named_deco_struct deco_table[] = {
        // Decorations
        {"widehat",        angle,      3 },
        {"widetilde",      tilde,      0 },
+       {"underbar",       hline,      0 },
        {"underline",      hline,      0 },
        {"overline",       hline,      0 },
        {"underbrace",     brace,      1 },
        {"overbrace",      brace,      3 },
        {"overleftarrow",  arrow,      1 },
        {"overrightarrow", arrow,      3 },
-       
+       {"overleftrightarrow", udarrow, 1 },
+       {"xleftarrow",     arrow,      1 },
+       {"xrightarrow",    arrow,      3 },
+       {"underleftarrow", arrow,      1 },
+       {"underrightarrow", arrow,     3 },
+       {"underleftrightarrow",udarrow, 1 },
+
        // Delimiters
        {"(",              parenth,    0 },
        {")",              parenth,    2 },
@@ -491,7 +504,8 @@ named_deco_struct deco_table[] = {
        {"Updownarrow",    Udarrow,    0 },     
        
        // Accents
-       {"ddot",           hline2,     0 },
+       {"ddot",           ddot,       0 },
+       {"dddot",          dddot,      0 },
        {"hat",            angle,      3 },
        {"grave",          slash,      1 },
        {"acute",          slash,      0 },
@@ -542,7 +556,8 @@ deco_struct const * search_deco(string const & name)
 void mathed_char_dim(MathTextCodes type, MathMetricsInfo const & size,
        unsigned char c, int & asc, int & des, int & wid)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        des = lyxfont::descent(c, font);
        asc = lyxfont::ascent(c, font);
        wid = mathed_char_width(type, size, c);
@@ -552,7 +567,8 @@ void mathed_char_dim(MathTextCodes type, MathMetricsInfo const & size,
 int mathed_char_height(MathTextCodes type, MathMetricsInfo const & size,
        unsigned char c, int & asc, int & des)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        des = lyxfont::descent(c, font);
        asc = lyxfont::ascent(c, font);
        return asc + des;
@@ -571,7 +587,8 @@ int mathed_char_height(MathTextCodes type, MathMetricsInfo const & size,
 int mathed_char_ascent(MathTextCodes type, MathMetricsInfo const & size,
        unsigned char c)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        return lyxfont::ascent(c, font);
 }
 
@@ -579,7 +596,8 @@ int mathed_char_ascent(MathTextCodes type, MathMetricsInfo const & size,
 int mathed_char_descent(MathTextCodes type, MathMetricsInfo const & size,
        unsigned char c)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        return lyxfont::descent(c, font);
 }
 
@@ -587,7 +605,8 @@ int mathed_char_descent(MathTextCodes type, MathMetricsInfo const & size,
 int mathed_char_width(MathTextCodes type, MathMetricsInfo const & size,
        unsigned char c)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        if (isBinaryOp(c, type))
                return lyxfont::width(c, font) + 2 * lyxfont::width(' ', font);
        else
@@ -606,7 +625,8 @@ void mathed_string_dim(MathTextCodes type, MathMetricsInfo const & size,
 int mathed_string_height(MathTextCodes type, MathMetricsInfo const & size,
        string const & s, int & asc, int & des)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        asc = des = 0;
        for (string::const_iterator it = s.begin(); it != s.end(); ++it) {
                des = max(des, lyxfont::descent(*it, font));
@@ -619,14 +639,17 @@ int mathed_string_height(MathTextCodes type, MathMetricsInfo const & size,
 int mathed_string_width(MathTextCodes type, MathMetricsInfo const & size,
        string const & s)
 {
-       return lyxfont::width(s, whichFont(type, size));
+       LyXFont font;
+       whichFont(font, type, size);
+       return lyxfont::width(s, font);
 }
 
 
 int mathed_string_ascent(MathTextCodes type, MathMetricsInfo const & size,
        string const & s)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        int asc = 0;
        for (string::const_iterator it = s.begin(); it != s.end(); ++it)
                asc = max(asc, lyxfont::ascent(*it, font));
@@ -637,7 +660,8 @@ int mathed_string_ascent(MathTextCodes type, MathMetricsInfo const & size,
 int mathed_string_descent(MathTextCodes type, MathMetricsInfo const & size,
        string const & s)
 {
-       LyXFont const font = whichFont(type, size);
+       LyXFont font;
+       whichFont(font, type, size);
        int des = 0;
        for (string::const_iterator it = s.begin(); it != s.end(); ++it)
                des = max(des, lyxfont::descent(*it, font));
@@ -714,15 +738,25 @@ void mathed_draw_deco(Painter & pain, int x, int y, int w, int h,
 }
 
 
+void mathed_draw_framebox(Painter & pain, int x, int y, MathInset const * p)
+{
+       if (mathcursor && mathcursor->isInside(p))
+               pain.rectangle(x, y - p->ascent(), p->width(), p->height(),
+                       LColor::mathframe);
+}
+
+
 // In the future maybe we use a better fonts renderer
-void drawStr(Painter & pain, MathTextCodes type, MathMetricsInfo const & siz,
-       int x, int y, string const & s)
+void drawStr(Painter & pain, MathTextCodes type, MathMetricsInfo const & size,
+       int x, int y, string const & str)
 {
-       pain.text(x, y, s, whichFont(type, siz));
+       LyXFont font;
+       whichFont(font, type, size);
+       pain.text(x, y, str, font);
 }
 
 
-void drawChar(Painter & pain, MathTextCodes type, MathMetricsInfo const & siz,
+void drawChar(Painter & pain, MathTextCodes type, MathMetricsInfo const & size,
        int x, int y, char c)
 {
        string s;
@@ -731,7 +765,7 @@ void drawChar(Painter & pain, MathTextCodes type, MathMetricsInfo const & siz,
        s += c;
        if (isBinaryOp(c, type))
                s += ' ';
-       drawStr(pain, type, siz, x, y, s);
+       drawStr(pain, type, size, x, y, s);
 }
 
 
@@ -757,10 +791,11 @@ void smallerStyleFrac(MathMetricsInfo & st)
 }
 
 
-void math_font_max_dim(MathTextCodes code, MathMetricsInfo const & siz,
+void math_font_max_dim(MathTextCodes code, MathMetricsInfo const & size,
        int & asc, int & des)
 {
-       LyXFont font = whichFont(code, siz);
+       LyXFont font;
+       whichFont(font, code, size);
        asc = lyxfont::maxAscent(font);
        des = lyxfont::maxDescent(font);
 }
@@ -771,6 +806,7 @@ char const * latex_mathspace[] = {
 };
 
 
+
 char const * math_font_name(MathTextCodes code)
 {
        static char const * theFontNames[] = {
@@ -789,3 +825,24 @@ char const * math_font_name(MathTextCodes code)
                return theFontNames[code - LM_TC_RM];
        return 0;
 }
+
+string convertDelimToLatexName(string const & name)
+{
+       if (name == "(")
+               return name;
+       if (name == "[")
+               return name;
+       if (name == ".")
+               return name;
+       if (name == ")")
+               return name;
+       if (name == "]")
+               return name;
+       if (name == "/")
+               return name;
+       if (name == "|")
+               return name;
+       return "\\" + name + " ";
+}
+
+