#include <config.h>
#include "math_parser.h"
+#include "math_metricsinfo.h"
#include "lyxlex.h"
#include "debug.h"
#include "support/filetools.h" // LibFileSearch
#include <map>
+using std::map;
namespace {
-std::map<string, latexkeys> theWordList;
+// file scope
+typedef map<string, latexkeys> WordList;
+WordList theWordList;
struct key_type {
///
char const * name;
///
- short token;
+ MathTokenEnum token;
///
unsigned int id;
};
-key_type wordlist_array[] =
+
+key_type wordlist_array[] =
{
{"!", LM_TK_SPACE, 0},
{"#", LM_TK_SPECIAL, '#'},
{";", 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},
{"coth", LM_TK_FUNC, 0},
{"csc", LM_TK_FUNC, 0},
{"ddot", LM_TK_DECORATION, 0},
+ {"dddot", LM_TK_DECORATION, 0},
{"ddots", LM_TK_DOTS, 0},
{"deg", LM_TK_FUNC, 0},
{"det", LM_TK_FUNCLIM, 0},
{"dim", LM_TK_FUNC, 0},
- //{"displaystyle", LM_TK_STY, LM_ST_DISPLAY},
+ {"displaystyle", LM_TK_STY, LM_ST_DISPLAY},
{"dot", LM_TK_DECORATION, 0},
{"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},
{"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},
{"limsup", LM_TK_FUNCLIM, 0},
{"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},
{"mathrm", LM_TK_FONT, LM_TC_RM},
{"overleftarrow", LM_TK_DECORATION, 0},
{"overline", LM_TK_DECORATION, 0},
{"overrightarrow", LM_TK_DECORATION, 0},
+ {"overleftrightarrow", LM_TK_DECORATION, 0},
{"protect", LM_TK_PROTECT, 0},
{"qquad", LM_TK_SPACE, 5},
{"quad", LM_TK_SPACE, 4},
{"right", LM_TK_RIGHT, 0},
{"rm", LM_TK_OLDFONT, LM_TC_RM},
{"root", LM_TK_ROOT, 0},
- //{"scriptscriptstyle", LM_TK_STY, LM_ST_SCRIPTSCRIPT},
- //{"scriptstyle", LM_TK_STY, LM_ST_SCRIPT},
+ {"scriptscriptstyle", LM_TK_STY, LM_ST_SCRIPTSCRIPT},
+ {"scriptstyle", LM_TK_STY, LM_ST_SCRIPT},
{"sec", LM_TK_FUNC, 0},
{"sin", LM_TK_FUNC, 0},
{"sinh", LM_TK_FUNC, 0},
{"tan", LM_TK_FUNC, 0},
{"tanh", LM_TK_FUNC, 0},
{"textrm", LM_TK_FONT, LM_TC_TEXTRM},
- //{"textstyle", LM_TK_STY, LM_ST_TEXT},
+ {"textstyle", LM_TK_STY, LM_ST_TEXT},
{"tilde", LM_TK_DECORATION, 0},
{"tt", LM_TK_OLDFONT, LM_TC_TT},
+ {"underbar", LM_TK_DECORATION, 0},
{"underbrace", LM_TK_DECORATION, 0},
+ {"underleftarrow", LM_TK_DECORATION, 0},
{"underline", LM_TK_DECORATION, 0},
+ {"underrightarrow", LM_TK_DECORATION, 0},
+ {"underleftrightarrow", LM_TK_DECORATION, 0},
+ {"underset", LM_TK_UNDERSET, 0},
{"vdots", LM_TK_DOTS, 0},
{"vec", LM_TK_DECORATION, 0},
{"widehat", LM_TK_DECORATION, 0},
lex.setFile(filename);
while (lex.isOK() && lex.next()) {
latexkeys tmp;
- string xmlname;
tmp.name = lex.getString();
if (lex.next())
tmp.token = tokenEnum(lex.getString());
if (lex.next())
tmp.type = lex.getString();
if (lex.next())
- xmlname = lex.getString();
+ tmp.xmlname = lex.getString();
if (theWordList.find(tmp.name) != theWordList.end())
lyxerr << "readSymbols: token " << tmp.name
<< " already exists.\n";
}
}
+
void initSymbols()
{
unsigned const n = sizeof(wordlist_array) / sizeof(wordlist_array[0]);
initialized = true;
}
- std::map<string, latexkeys>::iterator it = theWordList.find(str);
+ WordList::iterator it = theWordList.find(str);
return (it != theWordList.end()) ? &(it->second) : 0;
}