oh well

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

diff --git a/src/mathed/math_hash.C b/src/mathed/math_hash.C
index 5878967be6b74ccc70b735085683790a2fb559ba..8a56952d2b3aba8041a9ace465eb2ab3b45148c5 100644 (file)
--- a/src/mathed/math_hash.C
+++ b/src/mathed/math_hash.C
@@ -8,11 +8,13 @@
 
 #include <map>
 
+using std::map;
 
 namespace {
 
-// global
-std::map<string, latexkeys> theWordList;
+// file scope
+typedef map<string, latexkeys> WordList;
+WordList theWordList;
 
 
 struct key_type {
@@ -25,7 +27,7 @@ struct key_type {
 };
 
 
-key_type wordlist_array[] = 
+key_type wordlist_array[] =
 {
        {"!",  LM_TK_SPACE, 0},
        {"#",  LM_TK_SPECIAL, '#'},
@@ -82,7 +84,6 @@ key_type wordlist_array[] =
        {"inf",  LM_TK_FUNCLIM, 0},
        {"it",  LM_TK_OLDFONT, LM_TC_IT},
        {"ker",  LM_TK_FUNC, 0},
-       {"kern",  LM_TK_KERN, 0},
        {"label",  LM_TK_LABEL, 0},
        {"lefteqn",  LM_TK_LEFTEQN, 1},
        {"ldots",  LM_TK_DOTS, 0},
@@ -95,12 +96,14 @@ key_type wordlist_array[] =
        {"ln",  LM_TK_FUNC, 0},
        {"log",  LM_TK_FUNC, 0},
        {"lyxbox",  LM_TK_BOX, 0},
+       {"lyxnegspace",  LM_TK_SPACE, 6},
        {"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},
+       {"mathring",  LM_TK_DECORATION, 0},
        {"mathrm",  LM_TK_FONT, LM_TC_RM},
        {"mathsf",  LM_TK_FONT, LM_TC_SF},
        {"mathtt",  LM_TK_FONT, LM_TC_TT},
@@ -197,6 +200,7 @@ void readSymbols(string const & filename)
        }
 }
 
+
 void initSymbols()
 {
        unsigned const n = sizeof(wordlist_array) / sizeof(wordlist_array[0]);
@@ -230,6 +234,6 @@ latexkeys const * in_word_set(string const & str)
                initialized = true;
        }
 
-       std::map<string, latexkeys>::iterator it = theWordList.find(str);
+       WordList::iterator it = theWordList.find(str);
        return (it != theWordList.end()) ? &(it->second) : 0;
 }