#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 {
-struct latexkeys_a {
+// file scope
+typedef map<string, latexkeys> WordList;
+WordList theWordList;
+
+
+struct key_type {
///
char const * name;
///
- short token;
+ MathTokenEnum token;
///
unsigned int id;
};
-latexkeys_a 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},
{"arctan", LM_TK_FUNC, 0},
{"arg", LM_TK_FUNC, 0},
{"atop", LM_TK_ATOP, 0},
- {"backslash", LM_TK_SPECIAL, '\\'},
{"bar", LM_TK_DECORATION, 0},
{"begin", LM_TK_BEGIN, 0},
+ {"bf", LM_TK_OLDFONT, LM_TC_BF},
{"binom", LM_TK_BINOM, 0},
{"bmod", LM_TK_FUNC, 0},
{"breve", 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},
{"hom", LM_TK_FUNC, 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},
{"left", LM_TK_LEFT, 0},
{"lg", LM_TK_FUNC, 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},
{"mathsf", LM_TK_FONT, LM_TC_SF},
{"mathtt", LM_TK_FONT, LM_TC_TT},
{"max", LM_TK_FUNCLIM, 0},
+ //{"mbox", LM_TK_BOX, 0},
{"min", LM_TK_FUNCLIM, 0},
{"newcommand", LM_TK_NEWCOMMAND, 0 },
{"nolimits", LM_TK_LIMIT, static_cast<unsigned>(-1)},
{"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},
{"widetilde", LM_TK_DECORATION, 0},
{"{", LM_TK_SPECIAL, '{'},
- {"|", LM_TK_UNDEF, '|'},
{"}", LM_TK_SPECIAL, '}'}
};
-std::map<string, latexkeys> wordlist;
-
-
MathTokenEnum tokenEnum(const string & font)
{
return LM_TK_SYM;
}
-MathSymbolTypes symbolType(const string & type)
-{
- if (type == "mathrel")
- return LMB_RELATION;
- if (type == "mathbin")
- return LMB_OPERATOR;
- return LMB_NONE;
-}
-
-} // namespace anon
-
-
-void ReadSymbols(string const & filename)
+void readSymbols(string const & filename)
{
LyXLex lex(0, 0);
lex.setFile(filename);
if (lex.next())
tmp.id = lex.getInteger();
if (lex.next())
- tmp.type = symbolType(lex.getString());
- if (wordlist.find(tmp.name) != wordlist.end())
- lyxerr << "ReadSymbols: token " << tmp.name
+ 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";
else
- wordlist[tmp.name] = tmp;
+ theWordList[tmp.name] = tmp;
}
}
void initSymbols()
{
unsigned const n = sizeof(wordlist_array) / sizeof(wordlist_array[0]);
- for (latexkeys_a * p = wordlist_array; p != wordlist_array + n; ++p) {
+ for (key_type * p = wordlist_array; p != wordlist_array + n; ++p) {
latexkeys tmp;
tmp.name = p->name;
tmp.token = p->token;
tmp.id = p->id;
- tmp.type = LMB_NONE;
tmp.latex_font_id = 0;
- wordlist[p->name] = tmp;
+ theWordList[p->name] = tmp;
}
- lyxerr[Debug::MATHED] << "Reading symbols file\n";
+ lyxerr[Debug::MATHED] << "reading symbols file\n";
string const file = LibFileSearch(string(), "symbols");
if (file.empty())
lyxerr << "Could not find symbols file\n";
else
- ReadSymbols(file);
+ readSymbols(file);
}
+} // namespace anon
+
+
latexkeys const * in_word_set(string const & str)
{
static bool initialized = false;
initialized = true;
}
- std::map<string, latexkeys>::iterator it = wordlist.find(str);
- return (it != wordlist.end()) ? &(it->second) : 0;
+ WordList::iterator it = theWordList.find(str);
+ return (it != theWordList.end()) ? &(it->second) : 0;
}
projects / lyx.git / blobdiff