inactive new stuff to re-sync my tree before going on holyday

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

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index 3cc3cae92d1a3c7ad21dc96210638744d36ee52f..b19eeab53a14799344383825d634ff516a9218ac 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;
@@ -67,8 +69,6 @@ enum MathFont {
        FONT_SYMBOL,
        FONT_SYMBOLI,
        FONT_BF,
-       FONT_BB,
-       FONT_CAL,
        FONT_TT,
        FONT_RM,
        FONT_SF,
@@ -79,17 +79,15 @@ enum MathFont {
        FONT_MSA,
        FONT_MSB,
        FONT_EUFRAK,
+       FONT_FAKEBB,
+       FONT_FAKECAL,
+       FONT_FAKEFRAK,
        FONT_NUM
 };
 
 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);
 
@@ -100,16 +98,8 @@ void mathed_init_fonts()
 
        MathFonts[FONT_BF].setSeries(LyXFont::BOLD_SERIES);
 
-       MathFonts[FONT_BB].setSeries(LyXFont::BOLD_SERIES);
-       MathFonts[FONT_BB].setFamily(LyXFont::TYPEWRITER_FAMILY);
-
-       MathFonts[FONT_CAL].setFamily(LyXFont::SANS_FAMILY);
-       MathFonts[FONT_CAL].setShape(LyXFont::ITALIC_SHAPE);
-
        MathFonts[FONT_TT].setFamily(LyXFont::TYPEWRITER_FAMILY);
-
        MathFonts[FONT_RM].setFamily(LyXFont::ROMAN_FAMILY);
-
        MathFonts[FONT_SF].setFamily(LyXFont::SANS_FAMILY);
 
        MathFonts[FONT_CMR].setFamily(LyXFont::CMR_FAMILY);
@@ -120,12 +110,21 @@ void mathed_init_fonts()
        MathFonts[FONT_MSB].setFamily(LyXFont::MSB_FAMILY);
        MathFonts[FONT_EUFRAK].setFamily(LyXFont::EUFRAK_FAMILY);
 
+       MathFonts[FONT_FAKEBB].setFamily(LyXFont::TYPEWRITER_FAMILY);
+       MathFonts[FONT_FAKEBB].setSeries(LyXFont::BOLD_SERIES);
+
+       MathFonts[FONT_FAKECAL].setFamily(LyXFont::SANS_FAMILY);
+       MathFonts[FONT_FAKECAL].setShape(LyXFont::ITALIC_SHAPE);
+
+       MathFonts[FONT_FAKEFRAK].setFamily(LyXFont::SANS_FAMILY);
+       MathFonts[FONT_FAKEFRAK].setSeries(LyXFont::BOLD_SERIES);
+
        for (int i = 0; i < LM_FONT_END; ++i)
                font_available_initialized[i] = false;
 }
 
 
-LyXFont const & whichFontBase(MathTextCodes type)
+LyXFont const & whichFontBaseIntern(MathTextCodes type)
 {
        if (!MathFonts)
                mathed_init_fonts();
@@ -143,20 +142,15 @@ LyXFont const & whichFontBase(MathTextCodes type)
                return MathFonts[FONT_BF];
 
        case LM_TC_BB:
-               if (math_font_available(LM_TC_MSB))
-                       return MathFonts[FONT_MSB];
-               else
-                       return MathFonts[FONT_BB];
+               return MathFonts[FONT_MSB];
 
        case LM_TC_CAL:
-               if (math_font_available(LM_TC_CMSY))
-                       return MathFonts[FONT_CMSY];
-               else
-                       return MathFonts[FONT_CAL];
+               return MathFonts[FONT_CMSY];
 
        case LM_TC_TT:
                return MathFonts[FONT_TT];
 
+       case LM_TC_BOX:
        case LM_TC_TEXTRM:
        case LM_TC_CONST:
        case LM_TC_TEX:
@@ -184,16 +178,44 @@ LyXFont const & whichFontBase(MathTextCodes type)
        case LM_TC_MSB:
                return MathFonts[FONT_MSB];
 
+       case LM_TC_EUFRAK:
+               return MathFonts[FONT_EUFRAK];
+
+       default:
+               break;
+       }
+       return MathFonts[1];
+}
+
+
+LyXFont const & whichFontBase(MathTextCodes type)
+{
+       if (!MathFonts)
+               mathed_init_fonts();
+
+       switch (type) {
+       case LM_TC_BB:
+               if (math_font_available(LM_TC_MSB))
+                       return MathFonts[FONT_MSB];
+               else
+                       return MathFonts[FONT_FAKEBB];
+
+       case LM_TC_CAL:
+               if (math_font_available(LM_TC_CMSY))
+                       return MathFonts[FONT_CMSY];
+               else
+                       return MathFonts[FONT_FAKECAL];
+
        case LM_TC_EUFRAK:
                if (math_font_available(LM_TC_EUFRAK))
                        return MathFonts[FONT_EUFRAK];
                else
-                       return MathFonts[FONT_BB];
+                       return MathFonts[FONT_FAKEFRAK];
 
        default:
                break;
        }
-       return MathFonts[1];
+       return whichFontBaseIntern(type);
 }
 
 
@@ -230,7 +252,7 @@ LyXFont whichFont(MathTextCodes type, MathMetricsInfo const & size)
                break;
        }
 
-       if (type != LM_TC_TEXTRM)
+       if (type != LM_TC_TEXTRM && type != LM_TC_BOX)
                f.setColor(LColor::math);
 
        if (type == LM_TC_TEX)
@@ -246,7 +268,9 @@ bool math_font_available(MathTextCodes type)
 {
        if (!font_available_initialized[type]) {
                font_available_initialized[type] = true;
-               font_available[type] = fontloader.available(whichFontBase(type));
+               font_available[type] = fontloader.available(whichFontBaseIntern(type));
+               if (!font_available[type])
+                       lyxerr[Debug::FONT] << "Math font " << type << " not available.\n";
        }
        return font_available[type];
 }
@@ -370,9 +394,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
 };
 
@@ -434,13 +466,18 @@ 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 },
-       
+       {"xleftarrow",     arrow,      1 },
+       {"xrightarrow",    arrow,      3 },
+       {"underleftarrow", arrow,      1 },
+       {"underrightarrow", arrow,     3 },
+
        // Delimiters
        {"(",              parenth,    0 },
        {")",              parenth,    2 },
@@ -467,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 },
@@ -690,6 +728,14 @@ 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)
@@ -747,6 +793,7 @@ char const * latex_mathspace[] = {
 };
 
 
+
 char const * math_font_name(MathTextCodes code)
 {
        static char const * theFontNames[] = {
@@ -765,3 +812,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 + " ";
+}
+
+