-
#include <config.h>
-
#include <map>
#include "math_defs.h"
#include "math_parser.h"
+#include "support/lstrings.h"
+#include <iostream>
namespace {
latexkeys const wordlist[] =
{
- {"",0,0}, {"",0,0}, {"",0,0}, {"",0,0},
- {"",0,0}, {"",0,0}, {"",0,0}, {"",0,0},
{"setminus", LM_TK_SYM, LM_setminus},
{"ldots", LM_TK_DOTS, LM_ldots},
{"limits", LM_TK_LIMIT, 1 },
{"smile", LM_TK_SYM, LM_smile},
{"exists", LM_TK_SYM, LM_exists},
{"Vert", LM_TK_SYM, LM_Vert},
- {"scriptstyle", LM_TK_STY, LM_ST_SCRIPT},
+ //{"scriptstyle", LM_TK_STY, LM_ST_SCRIPT},
{"uplus", LM_TK_SYM, LM_uplus},
{"ell", LM_TK_SYM, LM_ell},
{"langle", LM_TK_SYM, LM_langle},
- {"scriptscriptstyle", LM_TK_STY, LM_ST_SCRIPTSCRIPT},
+ //{"scriptscriptstyle", LM_TK_STY, LM_ST_SCRIPTSCRIPT},
{"zeta", LM_TK_SYM, LM_zeta},
{"sigma", LM_TK_SYM, LM_sigma},
{"arccos", LM_TK_FUNC, 0},
{"approx", LM_TK_SYM, LM_approx},
{"triangleleft", LM_TK_SYM, LM_triangleleft},
{"triangleright", LM_TK_SYM, LM_triangleright},
- {"tilde", LM_TK_ACCENT, LM_tilde},
+ {"tilde", LM_TK_DECORATION, LM_tilde},
{"lambda", LM_TK_SYM, LM_lambda},
{"emptyset", LM_TK_MACRO, LM_emptyset},
{"triangle", LM_TK_SYM, LM_triangle},
- {"textstyle", LM_TK_STY, LM_ST_TEXT},
+ //{"textstyle", LM_TK_STY, LM_ST_TEXT},
{"tau", LM_TK_SYM, LM_tau},
{"limsup", LM_TK_FUNCLIM, 0},
{"partial", LM_TK_SYM, LM_partial},
{"swarrow", LM_TK_SYM, LM_swarrow},
{"top", LM_TK_SYM, LM_top},
{"Rightarrow", LM_TK_SYM, LM_Rightarrow},
- {"underline", LM_TK_WIDE, LM_underline},
- {"underbrace", LM_TK_WIDE, LM_underbrace},
+ {"underline", LM_TK_DECORATION, LM_underline},
+ {"underbrace", LM_TK_DECORATION, LM_underbrace},
{"eta", LM_TK_SYM, LM_eta},
- {"acute", LM_TK_ACCENT, LM_acute},
+ {"acute", LM_TK_DECORATION, LM_acute},
{"angle", LM_TK_SYM, LM_angle},
{"exp", LM_TK_FUNC, 0},
{"leftarrow", LM_TK_SYM, LM_leftarrow},
{"Psi", LM_TK_SYM, LM_Psi},
{"longleftrightarrow", LM_TK_SYM, LM_longleftrightarrow},
{"alpha", LM_TK_SYM, LM_alpha},
- {"widehat", LM_TK_WIDE, LM_widehat},
+ {"widehat", LM_TK_DECORATION, LM_widehat},
{"sin", LM_TK_FUNC, 0},
{"asymp", LM_TK_SYM, LM_asymp},
{"nolimits", LM_TK_LIMIT, 0 },
{"perp", LM_TK_MACRO, LM_perp},
{"wedge", LM_TK_SYM, LM_wedge},
{"ln", LM_TK_FUNC, 0},
- {"widetilde", LM_TK_WIDE, LM_widetilde},
+ {"widetilde", LM_TK_DECORATION, LM_widetilde},
{"Omega", LM_TK_SYM, LM_Omega},
{"natural", LM_TK_SYM, LM_natural},
{"iota", LM_TK_SYM, LM_iota},
{"star", LM_TK_SYM, LM_star},
{"leftharpoondown", LM_TK_SYM, LM_leftharpoondown},
{"wp", LM_TK_SYM, LM_wp},
- {"not", LM_TK_ACCENT, LM_not},
+ {"not", LM_TK_DECORATION, LM_not},
{"tan", LM_TK_FUNC, 0},
{"Theta", LM_TK_SYM, LM_Theta},
{"rceil", LM_TK_SYM, LM_rceil},
{"arcsin", LM_TK_FUNC, 0},
{"arctan", LM_TK_FUNC, 0},
{"flat", LM_TK_SYM, LM_flat},
- {"check", LM_TK_ACCENT, LM_check},
+ {"check", LM_TK_DECORATION, LM_check},
{"rangle", LM_TK_SYM, LM_rangle},
{"cot", LM_TK_FUNC, 0},
{"cdot", LM_TK_SYM, LM_cdot},
{"mp", LM_TK_SYM, LM_mp},
{"pm", LM_TK_SYM, LM_pm},
{"nonumber", LM_TK_NONUM, 0},
- {"breve", LM_TK_ACCENT, LM_breve},
+ {"breve", LM_TK_DECORATION, LM_breve},
{"bigvee", LM_TK_BIGSYM, LM_vee},
{"bowtie", LM_TK_SYM, LM_bowtie},
{"bigwedge", LM_TK_BIGSYM, LM_wedge},
{"frown", LM_TK_SYM, LM_frown},
{"rightharpoondown", LM_TK_SYM, LM_rightharpoondown},
{"det", LM_TK_FUNCLIM, 0},
- {"dot", LM_TK_ACCENT, LM_dot},
- {"ddot", LM_TK_ACCENT, LM_ddot},
+ {"dot", LM_TK_DECORATION, LM_dot},
+ {"ddot", LM_TK_DECORATION, LM_ddot},
{"lg", LM_TK_FUNC, 0},
{"log", LM_TK_FUNC, 0},
{"oplus", LM_TK_SYM, LM_oplus},
{"diamondsuit", LM_TK_SYM, LM_diamondsuit},
{"rfloor", LM_TK_SYM, LM_rfloor},
{"end", LM_TK_END, 0},
- {"hat", LM_TK_ACCENT, LM_hat},
+ {"hat", LM_TK_DECORATION, LM_hat},
{"tanh", LM_TK_FUNC, 0},
{"vdots", LM_TK_DOTS, LM_vdots},
{"bigcap", LM_TK_BIGSYM, LM_cap},
{"bigcup", LM_TK_BIGSYM, LM_cup},
{"bigsqcup", LM_TK_BIGSYM, LM_bigsqcup},
{"heartsuit", LM_TK_SYM, LM_heartsuit},
- {"displaystyle", LM_TK_STY, LM_ST_DISPLAY},
+ //{"displaystyle", LM_TK_STY, LM_ST_DISPLAY},
{"longmapsto", LM_TK_SYM, LM_longmapsto},
{"bigtriangleup", LM_TK_SYM, LM_bigtriangleup},
{"preceq", LM_TK_SYM, LM_preceq},
{"delta", LM_TK_SYM, LM_delta},
{"odot", LM_TK_SYM, LM_odot},
{"oint", LM_TK_BIGSYM, LM_oint},
- {"grave", LM_TK_ACCENT, LM_grave},
+ {"grave", LM_TK_DECORATION, LM_grave},
{"pmod", LM_TK_PMOD, 0},
{"prod", LM_TK_BIGSYM, LM_prod},
{"frac", LM_TK_FRAC, 0},
{"circ", LM_TK_SYM, LM_circ},
{"aleph", LM_TK_SYM, LM_aleph},
{"min", LM_TK_FUNCLIM, 0},
- {"overline", LM_TK_WIDE, LM_overline},
+ {"overline", LM_TK_DECORATION, LM_overline},
{"arg", LM_TK_FUNC, 0},
- {"overbrace", LM_TK_WIDE, LM_overbrace},
+ {"overbrace", LM_TK_DECORATION, LM_overbrace},
{"amalg", LM_TK_SYM, LM_amalg},
{"gamma", LM_TK_SYM, LM_gamma},
{"vee", LM_TK_SYM, LM_vee},
{"bigtriangledown", LM_TK_SYM, LM_bigtriangledown},
{"mathbf", LM_TK_FONT, LM_TC_BF},
{"mathsf", LM_TK_FONT, LM_TC_SF},
- {"bar", LM_TK_ACCENT, LM_bar},
+ {"bar", LM_TK_DECORATION, LM_bar},
{"varpi", LM_TK_SYM, LM_varpi},
{"varphi", LM_TK_SYM, LM_varphi},
{"newcommand", LM_TK_NEWCOMMAND, 0 },
- {"overleftarrow", LM_TK_WIDE, LM_overleftarrow},
- {"overrightarrow", LM_TK_WIDE, LM_overightarrow},
+ {"overleftarrow", LM_TK_DECORATION, LM_overleftarrow},
+ {"overrightarrow", LM_TK_DECORATION, LM_overightarrow},
{"Leftarrow", LM_TK_SYM, LM_Leftarrow},
{"Longleftarrow", LM_TK_SYM, LM_Longleftarrow},
{"Leftrightarrow", LM_TK_SYM, LM_Leftrightarrow},
{"coth", LM_TK_FUNC, 0},
{"rho", LM_TK_SYM, LM_rho},
{"cong", LM_TK_SYM, LM_cong},
- {"vec", LM_TK_ACCENT, LM_vec},
+ {"vec", LM_TK_DECORATION, LM_vec},
{"dim", LM_TK_FUNC, 0},
{"mid", LM_TK_SYM, LM_mid},
{"hom", LM_TK_FUNC, 0},
};
-
struct symbolindex {
- int id;
+ unsigned int id;
short token;
- symbolindex(int i, short t) : id(i), token(t)
+ symbolindex(unsigned int i, short t) : id(i), token(t)
{}
-
+
bool operator<(symbolindex const & s) const
{
return (id < s.id) || (id == s.id && token < s.token);
init() {
int const n = sizeof(wordlist)/sizeof(wordlist[0]);
for (latexkeys const * it = wordlist; it != wordlist + n; ++it) {
+ if (LatexkeyByName.find(it->name) != LatexkeyByName.end()) {
+ std::cerr << "math_hash.C: Bug: Duplicate entry: "
+ << it->name << std::endl;
+ }
LatexkeyByName[it->name] = it - wordlist;
+ if (it->id != 0 &&
+ LatexkeyById.find(symbolindex(it->id, it->token)) !=
+ LatexkeyById.end()) {
+ std::cerr << "math_hash.C: Bug: Duplicate entry: "
+ << it->name << " Id: "
+ << it->id << " token: " << it->token
+ << std::endl;
+ }
LatexkeyById[symbolindex(it->id, it->token)] = it - wordlist;
}
}
}
-latexkeys const * lm_get_key_by_id(int id, short tc)
+latexkeys const * lm_get_key_by_id(unsigned int id, short tc)
{
std::map<symbolindex, int>::const_iterator pos
= LatexkeyById.find(symbolindex(id, tc));
projects / lyx.git / blobdiff