forward search in math insets. ugly. seems to work. don't ask why.

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

diff --git a/src/mathed/math_hash.C b/src/mathed/math_hash.C
index df468ddb2986d102af38e33802305a3d584e3218..1f22147ab4633847dbf692f99865ff872867c139 100644 (file)
--- a/src/mathed/math_hash.C
+++ b/src/mathed/math_hash.C
@@ -37,7 +37,6 @@ key_type wordlist_array[] =
        {";",  LM_TK_SPACE, 3},
        {"Pr",  LM_TK_FUNCLIM, 0},
        {"[",  LM_TK_BEGIN, LM_OT_EQUATION},
-       {"\\",  LM_TK_NEWLINE, static_cast<unsigned>(-1)}, // -1 needed in mathed_parse_lines!
        {"]",  LM_TK_END, LM_OT_EQUATION},
        {"_",  LM_TK_SPECIAL, '_'},
        {"acute",  LM_TK_DECORATION, 0},
@@ -71,6 +70,7 @@ key_type wordlist_array[] =
        {"end",  LM_TK_END, 0},
        {"exp",  LM_TK_FUNC, 0},
        {"frac",  LM_TK_FRAC, 0},
+       {"frak",  LM_TK_FONT, LM_TC_EUFRAK},
        {"gcd",  LM_TK_FUNCLIM, 0},
        {"grave",  LM_TK_DECORATION, 0},
        {"hat",  LM_TK_DECORATION, 0},
@@ -90,9 +90,11 @@ key_type wordlist_array[] =
        {"limsup",  LM_TK_FUNCLIM, 0},
        {"ln",  LM_TK_FUNC, 0},
        {"log",  LM_TK_FUNC, 0},
+       {"lyxbox",  LM_TK_BOX, 0},
        {"mathbb",  LM_TK_FONT, LM_TC_BB},
        {"mathbf",  LM_TK_FONT, LM_TC_BF},
        {"mathcal",  LM_TK_FONT, LM_TC_CAL},
+       {"mathfrak",  LM_TK_FONT, LM_TC_EUFRAK},
        {"mathit",  LM_TK_FONT, LM_TC_IT},
        {"mathnormal",  LM_TK_FONT, LM_TC_VAR},
        {"mathrm",  LM_TK_FONT, LM_TC_RM},
@@ -160,16 +162,6 @@ MathTokenEnum tokenEnum(const string & font)
 }
 
 
-MathSymbolTypes symbolType(const string & type)
-{
-       if (type == "mathrel")
-               return LMB_RELATION;
-       if (type == "mathbin")
-               return LMB_OPERATOR;    
-       return LMB_NONE;
-}
-
-
 void readSymbols(string const & filename)
 {
        LyXLex lex(0, 0);
@@ -184,7 +176,9 @@ void readSymbols(string const & filename)
                if (lex.next())
                        tmp.id = lex.getInteger();
                if (lex.next())
-                       tmp.type = symbolType(lex.getString());
+                       tmp.type = lex.getString();
+               if (lex.next())
+                       tmp.xmlname = lex.getString();
                if (theWordList.find(tmp.name) != theWordList.end())
                        lyxerr << "readSymbols: token " << tmp.name
                               << " already exists.\n";
@@ -201,7 +195,6 @@ void initSymbols()
                tmp.name          = p->name;
                tmp.token         = p->token;
                tmp.id            = p->id;
-               tmp.type          = LMB_NONE;
                tmp.latex_font_id = 0;
                theWordList[p->name] = tmp;
        }