--- d/dmd/entity.c.orig	2011-01-30 14:18:50.612691365 +0000
+++ d/dmd/entity.c	2011-01-30 14:23:33.404691364 +0000
@@ -15,15 +15,13 @@
  * Convert from named entity to its encoding.
  * For reference:
  *      http://www.htmlhelp.com/reference/html40/entities/
- *      http://www.w3.org/TR/1999/REC-html401-19991224/sgml/entities.html
- * TODO: This reference appears to be more complete and accurate
  *      http://www.w3.org/2003/entities/2007/w3centities-f.ent
  */
 
 struct NameId
 {
     const char *name;
-    unsigned short value;
+    unsigned value;
 };
 
 static NameId namesA[]={
@@ -33,6 +31,9 @@
         "aacute",       0x00E1,
         "Abreve",       0x0102,
         "abreve",       0x0103,
+        "ac",               0x223E,
+        "acd",              0x223F,
+//      "acE",              0x0223E;0x0333,
         "Acirc",        0x00C2,
         "acirc",        0x00E2,
         "acute",        0x00B4,
@@ -40,6 +41,9 @@
         "acy",          0x0430,
         "AElig",        0x00C6,
         "aelig",        0x00E6,
+        "af",               0x2061,
+        "Afr",              0x1D504,
+        "afr",              0x1D51E,
         "Agr",          0x0391,
         "agr",          0x03B1,
         "Agrave",       0x00C0,
@@ -50,52 +54,152 @@
         "alpha",        0x03B1,
         "Amacr",        0x0100,
         "amacr",        0x0101,
-        "amalg",        0x2210,
+        "amalg",            0x2A3F,
         "amp",          0x0026,
+        "AMP",              0x0026,
         "and",          0x2227,
+        "And",              0x2A53,
+        "andand",           0x2A55,
+        "andd",             0x2A5C,
+        "andslope",         0x2A58,
+        "andv",             0x2A5A,
         "ang",          0x2220,
-        "ang90",        0x221F,
+        "ange",             0x29A4,
+        "angle",            0x2220,
         "angmsd",       0x2221,
+        "angmsdaa",         0x29A8,
+        "angmsdab",         0x29A9,
+        "angmsdac",         0x29AA,
+        "angmsdad",         0x29AB,
+        "angmsdae",         0x29AC,
+        "angmsdaf",         0x29AD,
+        "angmsdag",         0x29AE,
+        "angmsdah",         0x29AF,
+        "angrt",            0x221F,
+        "angrtvb",          0x22BE,
+        "angrtvbd",         0x299D,
         "angsph",       0x2222,
-        "angst",        0x212B,
+        "angst",            0x00C5,
+        "angzarr",          0x237C,
         "Aogon",        0x0104,
         "aogon",        0x0105,
+        "Aopf",             0x1D538,
+        "aopf",             0x1D552,
         "ap",           0x2248,
+        "apacir",           0x2A6F,
         "ape",          0x224A,
-        "apos",         0x02BC,
+        "apE",              0x2A70,
+        "apid",             0x224B,
+        "apos",             0x0027,
+        "ApplyFunction",    0x2061,
+        "approx",           0x2248,
+        "approxeq",         0x224A,
         "Aring",        0x00C5,
         "aring",        0x00E5,
+        "Ascr",             0x1D49C,
+        "ascr",             0x1D4B6,
+        "Assign",           0x2254,
         "ast",          0x002A,
         "asymp",        0x2248,
+        "asympeq",          0x224D,
         "Atilde",       0x00C3,
         "atilde",       0x00E3,
         "Auml",         0x00C4,
         "auml",         0x00E4,
+        "awconint",         0x2233,
+        "awint",            0x2A11,
         NULL,           0
 };
 
 static NameId namesB[]={
-        "barwed",       0x22BC,
+        "backcong",         0x224C,
+        "backepsilon",      0x03F6,
+        "backprime",        0x2035,
+        "backsim",          0x223D,
+        "backsimeq",        0x22CD,
+        "Backslash",        0x2216,
+//      "b.alpha",          0x1D6C2,
+        "Barv",             0x2AE7,
+        "barvee",           0x22BD,
+        "barwed",           0x2305,
         "Barwed",       0x2306,
+        "barwedge",         0x2305,
+//      "b.beta",           0x1D6C3,
+        "bbrk",             0x23B5,
+        "bbrktbrk",         0x23B6,
+//      "b.chi",            0x1D6D8,
         "bcong",        0x224C,
         "Bcy",          0x0411,
         "bcy",          0x0431,
+//      "b.Delta",          0x1D6AB,
+//      "b.delta",          0x1D6C5,
         "bdquo",        0x201E,
         "becaus",       0x2235,
-        "bepsi",        0x220D,
+        "because",          0x2235,
+        "Because",          0x2235,
+        "bemptyv",          0x29B0,
+        "bepsi",            0x03F6,
+//      "b.epsi",           0x1D6C6,
+//      "b.epsiv",          0x1D6DC,
         "bernou",       0x212C,
+        "Bernoullis",       0x212C,
         "Beta",         0x0392,
         "beta",         0x03B2,
+//      "b.eta",            0x1D6C8,
         "beth",         0x2136,
+        "between",          0x226C,
+        "Bfr",              0x1D505,
+        "bfr",              0x1D51F,
+//      "b.Gamma",          0x1D6AA,
+//      "b.gamma",          0x1D6C4,
+//      "b.Gammad",         0x1D7CA,
+//      "b.gammad",         0x1D7CB,
         "Bgr",          0x0392,
         "bgr",          0x03B2,
+        "bigcap",           0x22C2,
+        "bigcirc",          0x25EF,
+        "bigcup",           0x22C3,
+        "bigodot",          0x2A00,
+        "bigoplus",         0x2A01,
+        "bigotimes",        0x2A02,
+        "bigsqcup",         0x2A06,
+        "bigstar",          0x2605,
+        "bigtriangledown",  0x25BD,
+        "bigtriangleup",    0x25B3,
+        "biguplus",         0x2A04,
+        "bigvee",           0x22C1,
+        "bigwedge",         0x22C0,
+//      "b.iota",           0x1D6CA,
+//      "b.kappa",          0x1D6CB,
+//      "b.kappav",         0x1D6DE,
+        "bkarow",           0x290D,
+        "blacklozenge",     0x29EB,
+        "blacksquare",      0x25AA,
+        "blacktriangle",    0x25B4,
+        "blacktriangledown", 0x25BE,
+        "blacktriangleleft", 0x25C2,
+        "blacktriangleright", 0x25B8,
+//      "b.Lambda",         0x1D6B2,
+//      "b.lambda",         0x1D6CC,
         "blank",        0x2423,
         "blk12",        0x2592,
         "blk14",        0x2591,
         "blk34",        0x2593,
         "block",        0x2588,
+//      "b.mu",             0x1D6CD,
+//      "bne",              0x0003D;0x20E5,
+//      "bnequiv",          0x02261;0x20E5,
+        "bnot",             0x2310,
+        "bNot",             0x2AED,
+//      "b.nu",             0x1D6CE,
+//      "b.Omega",          0x1D6C0,
+//      "b.omega",          0x1D6DA,
+        "Bopf",             0x1D539,
+        "bopf",             0x1D553,
+        "bot",              0x22A5,
         "bottom",       0x22A5,
         "bowtie",       0x22C8,
+        "boxbox",           0x29C9,
         "boxdl",        0x2510,
         "boxdL",        0x2555,
         "boxDl",        0x2556,
@@ -114,6 +218,9 @@
         "boxHu",        0x2567,
         "boxhU",        0x2568,
         "boxHU",        0x2569,
+        "boxminus",         0x229F,
+        "boxplus",          0x229E,
+        "boxtimes",         0x22A0,
         "boxul",        0x2518,
         "boxuL",        0x255B,
         "boxUl",        0x255C,
@@ -136,16 +243,47 @@
         "boxvR",        0x255E,
         "boxVr",        0x255F,
         "boxVR",        0x2560,
+//      "b.Phi",            0x1D6BD,
+//      "b.phi",            0x1D6D7,
+//      "b.phiv",           0x1D6DF,
+//      "b.Pi",             0x1D6B7,
+//      "b.pi",             0x1D6D1,
+//      "b.piv",            0x1D6E1,
         "bprime",       0x2035,
+//      "b.Psi",            0x1D6BF,
+//      "b.psi",            0x1D6D9,
         "breve",        0x02D8,
-        "brkbar",       0x00A6,
+        "Breve",            0x02D8,
+//      "b.rho",            0x1D6D2,
+//      "b.rhov",           0x1D6E0,
         "brvbar",       0x00A6,
+        "Bscr",             0x212C,
+        "bscr",             0x1D4B7,
+        "bsemi",            0x204F,
+//      "b.Sigma",          0x1D6BA,
+//      "b.sigma",          0x1D6D4,
+//      "b.sigmav",         0x1D6D3,
         "bsim",         0x223D,
         "bsime",        0x22CD,
         "bsol",         0x005C,
+        "bsolb",            0x29C5,
+        "bsolhsub",         0x27C8,
+//      "b.tau",            0x1D6D5,
+//      "b.Theta",          0x1D6AF,
+//      "b.thetas",         0x1D6C9,
+//      "b.thetav",         0x1D6DD,
         "bull",         0x2022,
+        "bullet",           0x2022,
         "bump",         0x224E,
         "bumpe",        0x224F,
+        "bumpE",            0x2AAE,
+        "Bumpeq",           0x224E,
+        "bumpeq",           0x224F,
+//      "b.Upsi",           0x1D6BC,
+//      "b.upsi",           0x1D6D6,
+//      "b.Xi",             0x1D6B5,
+//      "b.xi",             0x1D6CF,
+//      "b.zeta",           0x1D6C7,
         NULL,           0
 };
 
@@ -154,50 +292,130 @@
         "cacute",       0x0107,
         "cap",          0x2229,
         "Cap",          0x22D2,
+        "capand",           0x2A44,
+        "capbrcup",         0x2A49,
+        "capcap",           0x2A4B,
+        "capcup",           0x2A47,
+        "capdot",           0x2A40,
+        "CapitalDifferentialD", 0x2145,
+//      "caps",             0x02229;0xFE00,
         "caret",        0x2041,
         "caron",        0x02C7,
+        "Cayleys",          0x212D,
+        "ccaps",            0x2A4D,
         "Ccaron",       0x010C,
         "ccaron",       0x010D,
         "Ccedil",       0x00C7,
         "ccedil",       0x00E7,
         "Ccirc",        0x0108,
         "ccirc",        0x0109,
+        "Cconint",          0x2230,
+        "ccups",            0x2A4C,
+        "ccupssm",          0x2A50,
         "Cdot",         0x010A,
         "cdot",         0x010B,
         "cedil",        0x00B8,
+        "Cedilla",          0x00B8,
+        "cemptyv",          0x29B2,
         "cent",         0x00A2,
+        "centerdot",        0x00B7,
+        "CenterDot",        0x00B7,
+        "Cfr",              0x212D,
+        "cfr",              0x1D520,
         "CHcy",         0x0427,
         "chcy",         0x0447,
         "check",        0x2713,
+        "checkmark",        0x2713,
         "Chi",          0x03A7,
         "chi",          0x03C7,
         "cir",          0x25CB,
         "circ",         0x02C6,
+        "circeq",           0x2257,
+        "circlearrowleft",  0x21BA,
+        "circlearrowright", 0x21BB,
+        "circledast",       0x229B,
+        "circledcirc",      0x229A,
+        "circleddash",      0x229D,
+        "CircleDot",        0x2299,
+        "circledR",         0x00AE,
+        "circledS",         0x24C8,
+        "CircleMinus",      0x2296,
+        "CirclePlus",       0x2295,
+        "CircleTimes",      0x2297,
         "cire",         0x2257,
+        "cirE",             0x29C3,
+        "cirfnint",         0x2A10,
+        "cirmid",           0x2AEF,
+        "cirscir",          0x29C2,
+        "ClockwiseContourIntegral", 0x2232,
+        "CloseCurlyDoubleQuote", 0x201D,
+        "CloseCurlyQuote",  0x2019,
         "clubs",        0x2663,
+        "clubsuit",         0x2663,
         "colon",        0x003A,
+        "Colon",            0x2237,
         "colone",       0x2254,
+        "Colone",           0x2A74,
+        "coloneq",          0x2254,
         "comma",        0x002C,
         "commat",       0x0040,
         "comp",         0x2201,
         "compfn",       0x2218,
+        "complement",       0x2201,
+        "complexes",        0x2102,
         "cong",         0x2245,
+        "congdot",          0x2A6D,
+        "Congruent",        0x2261,
         "conint",       0x222E,
+        "Conint",           0x222F,
+        "ContourIntegral",  0x222E,
+        "Copf",             0x2102,
+        "copf",             0x1D554,
         "coprod",       0x2210,
+        "Coproduct",        0x2210,
         "copy",         0x00A9,
+        "COPY",             0x00A9,
         "copysr",       0x2117,
+        "CounterClockwiseContourIntegral", 0x2233,
         "crarr",        0x21B5,
         "cross",        0x2717,
+        "Cross",            0x2A2F,
+        "Cscr",             0x1D49E,
+        "cscr",             0x1D4B8,
+        "csub",             0x2ACF,
+        "csube",            0x2AD1,
+        "csup",             0x2AD0,
+        "csupe",            0x2AD2,
+        "ctdot",            0x22EF,
+        "cudarrl",          0x2938,
+        "cudarrr",          0x2935,
         "cuepr",        0x22DE,
         "cuesc",        0x22DF,
         "cularr",       0x21B6,
+        "cularrp",          0x293D,
         "cup",          0x222A,
         "Cup",          0x22D3,
-        "cupre",        0x227C,
+        "cupbrcap",         0x2A48,
+        "CupCap",           0x224D,
+        "cupcap",           0x2A46,
+        "cupcup",           0x2A4A,
+        "cupdot",           0x228D,
+        "cupor",            0x2A45,
+//      "cups",             0x0222A;0xFE00,
         "curarr",       0x21B7,
+        "curarrm",          0x293C,
+        "curlyeqprec",      0x22DE,
+        "curlyeqsucc",      0x22DF,
+        "curlyvee",         0x22CE,
+        "curlywedge",       0x22CF,
         "curren",       0x00A4,
+        "curvearrowleft",   0x21B6,
+        "curvearrowright",  0x21B7,
         "cuvee",        0x22CE,
         "cuwed",        0x22CF,
+        "cwconint",         0x2232,
+        "cwint",            0x2231,
+        "cylcty",           0x232D,
         NULL,           0
 };
 
@@ -206,47 +424,122 @@
         "Dagger",       0x2021,
         "daleth",       0x2138,
         "darr",         0x2193,
+        "Darr",             0x21A1,
         "dArr",         0x21D3,
-        "darr2",        0x21CA,
         "dash",         0x2010,
         "dashv",        0x22A3,
+        "Dashv",            0x2AE4,
+        "dbkarow",          0x290F,
         "dblac",        0x02DD,
         "Dcaron",       0x010E,
         "dcaron",       0x010F,
         "Dcy",          0x0414,
         "dcy",          0x0434,
+        "DD",               0x2145,
+        "dd",               0x2146,
+        "ddagger",          0x2021,
+        "ddarr",            0x21CA,
+        "DDotrahd",         0x2911,
+        "ddotseq",          0x2A77,
         "deg",          0x00B0,
+        "Del",              0x2207,
         "Delta",        0x0394,
         "delta",        0x03B4,
+        "demptyv",          0x29B1,
+        "dfisht",           0x297F,
+        "Dfr",              0x1D507,
+        "dfr",              0x1D521,
         "Dgr",          0x0394,
         "dgr",          0x03B4,
+        "dHar",             0x2965,
         "dharl",        0x21C3,
         "dharr",        0x21C2,
+        "DiacriticalAcute", 0x00B4,
+        "DiacriticalDot",   0x02D9,
+        "DiacriticalDoubleAcute", 0x02DD,
+        "DiacriticalGrave", 0x0060,
+        "DiacriticalTilde", 0x02DC,
         "diam",         0x22C4,
+        "diamond",          0x22C4,
+        "Diamond",          0x22C4,
+        "diamondsuit",      0x2666,
         "diams",        0x2666,
         "die",          0x00A8,
+        "DifferentialD",    0x2146,
+        "digamma",          0x03DD,
+        "disin",            0x22F2,
+        "div",              0x00F7,
         "divide",       0x00F7,
+        "divideontimes",    0x22C7,
         "divonx",       0x22C7,
         "DJcy",         0x0402,
         "djcy",         0x0452,
-        "dlarr",        0x2199,
         "dlcorn",       0x231E,
         "dlcrop",       0x230D,
         "dollar",       0x0024,
+        "Dopf",             0x1D53B,
+        "dopf",             0x1D555,
         "Dot",          0x00A8,
         "dot",          0x02D9,
         "DotDot",       0x20DC,
-        "drarr",        0x2198,
+        "doteq",            0x2250,
+        "doteqdot",         0x2251,
+        "DotEqual",         0x2250,
+        "dotminus",         0x2238,
+        "dotplus",          0x2214,
+        "dotsquare",        0x22A1,
+        "doublebarwedge",   0x2306,
+        "DoubleContourIntegral", 0x222F,
+        "DoubleDot",        0x00A8,
+        "DoubleDownArrow",  0x21D3,
+        "DoubleLeftArrow",  0x21D0,
+        "DoubleLeftRightArrow", 0x21D4,
+        "DoubleLeftTee",    0x2AE4,
+        "DoubleLongLeftArrow", 0x27F8,
+        "DoubleLongLeftRightArrow", 0x27FA,
+        "DoubleLongRightArrow", 0x27F9,
+        "DoubleRightArrow", 0x21D2,
+        "DoubleRightTee",   0x22A8,
+        "DoubleUpArrow",    0x21D1,
+        "DoubleUpDownArrow", 0x21D5,
+        "DoubleVerticalBar", 0x2225,
+        "downarrow",        0x2193,
+        "DownArrow",        0x2193,
+        "Downarrow",        0x21D3,
+        "DownArrowBar",     0x2913,
+        "DownArrowUpArrow", 0x21F5,
+        "DownBreve",        0x0311,
+        "downdownarrows",   0x21CA,
+        "downharpoonleft",  0x21C3,
+        "downharpoonright", 0x21C2,
+        "DownLeftRightVector", 0x2950,
+        "DownLeftTeeVector", 0x295E,
+        "DownLeftVector",   0x21BD,
+        "DownLeftVectorBar", 0x2956,
+        "DownRightTeeVector", 0x295F,
+        "DownRightVector",  0x21C1,
+        "DownRightVectorBar", 0x2957,
+        "DownTee",          0x22A4,
+        "DownTeeArrow",     0x21A7,
+        "drbkarow",         0x2910,
         "drcorn",       0x231F,
         "drcrop",       0x230C,
+        "Dscr",             0x1D49F,
+        "dscr",             0x1D4B9,
         "DScy",         0x0405,
         "dscy",         0x0455,
+        "dsol",             0x29F6,
         "Dstrok",       0x0110,
         "dstrok",       0x0111,
+        "dtdot",            0x22F1,
         "dtri",         0x25BF,
         "dtrif",        0x25BE,
+        "duarr",            0x21F5,
+        "duhar",            0x296F,
+        "dwangle",          0x29A6,
         "DZcy",         0x040F,
         "dzcy",         0x045F,
+        "dzigrarr",         0x27FF,
         NULL,           0
 };
 
@@ -255,6 +548,7 @@
         "eacgr",        0x03AD,
         "Eacute",       0x00C9,
         "eacute",       0x00E9,
+        "easter",           0x2A6E,
         "Ecaron",       0x011A,
         "ecaron",       0x011B,
         "ecir",         0x2256,
@@ -263,43 +557,75 @@
         "ecolon",       0x2255,
         "Ecy",          0x042D,
         "ecy",          0x044D,
+        "eDDot",            0x2A77,
         "Edot",         0x0116,
         "edot",         0x0117,
         "eDot",         0x2251,
+        "ee",               0x2147,
         "EEacgr",       0x0389,
         "eeacgr",       0x03AE,
         "EEgr",         0x0397,
         "eegr",         0x03B7,
         "efDot",        0x2252,
+        "Efr",              0x1D508,
+        "efr",              0x1D522,
+        "eg",               0x2A9A,
         "Egr",          0x0395,
         "egr",          0x03B5,
         "Egrave",       0x00C8,
         "egrave",       0x00E8,
-        "egs",          0x22DD,
+        "egs",              0x2A96,
+        "egsdot",           0x2A98,
+        "el",               0x2A99,
+        "Element",          0x2208,
+        "elinters",         0x23E7,
         "ell",          0x2113,
-        "els",          0x22DC,
+        "els",              0x2A95,
+        "elsdot",           0x2A97,
         "Emacr",        0x0112,
         "emacr",        0x0113,
-        "emdash",       0x2014,
         "empty",        0x2205,
+        "emptyset",         0x2205,
+        "EmptySmallSquare", 0x25FB,
+        "emptyv",           0x2205,
+        "EmptyVerySmallSquare", 0x25AB,
         "emsp",         0x2003,
         "emsp13",       0x2004,
         "emsp14",       0x2005,
-        "endash",       0x2013,
         "ENG",          0x014A,
         "eng",          0x014B,
         "ensp",         0x2002,
         "Eogon",        0x0118,
         "eogon",        0x0119,
+        "Eopf",             0x1D53C,
+        "eopf",             0x1D556,
+        "epar",             0x22D5,
+        "eparsl",           0x29E3,
+        "eplus",            0x2A71,
         "epsi",         0x03B5,
         "Epsilon",      0x0395,
         "epsilon",      0x03B5,
-        "epsis",        0x220A,
-        "epsiv",        0x03B5,
+        "epsiv",            0x03F5,
+        "eqcirc",           0x2256,
+        "eqcolon",          0x2255,
+        "eqsim",            0x2242,
+        "eqslantgtr",       0x2A96,
+        "eqslantless",      0x2A95,
+        "Equal",            0x2A75,
         "equals",       0x003D,
+        "EqualTilde",       0x2242,
+        "equest",           0x225F,
+        "Equilibrium",      0x21CC,
         "equiv",        0x2261,
+        "equivDD",          0x2A78,
+        "eqvparsl",         0x29E5,
+        "erarr",            0x2971,
         "erDot",        0x2253,
+        "escr",             0x212F,
+        "Escr",             0x2130,
         "esdot",        0x2250,
+        "esim",             0x2242,
+        "Esim",             0x2A73,
         "Eta",          0x0397,
         "eta",          0x03B7,
         "ETH",          0x00D0,
@@ -309,22 +635,39 @@
         "euro",         0x20AC,
         "excl",         0x0021,
         "exist",        0x2203,
+        "Exists",           0x2203,
+        "expectation",      0x2130,
+        "exponentiale",     0x2147,
+        "ExponentialE",     0x2147,
         NULL,           0
 };
 
 static NameId namesF[]={
+        "fallingdotseq",    0x2252,
         "Fcy",          0x0424,
         "fcy",          0x0444,
         "female",       0x2640,
         "ffilig",       0xFB03,
         "fflig",        0xFB00,
         "ffllig",       0xFB04,
+        "Ffr",              0x1D509,
+        "ffr",              0x1D523,
         "filig",        0xFB01,
+        "FilledSmallSquare", 0x25FC,
+        "FilledVerySmallSquare", 0x25AA,
+//      "fjlig",            0x00066;0x006A,
         "flat",         0x266D,
         "fllig",        0xFB02,
+        "fltns",            0x25B1,
         "fnof",         0x0192,
+        "Fopf",             0x1D53D,
+        "fopf",             0x1D557,
         "forall",       0x2200,
+        "ForAll",           0x2200,
         "fork",         0x22D4,
+        "forkv",            0x2AD9,
+        "Fouriertrf",       0x2131,
+        "fpartint",         0x2A0D,
         "frac12",       0x00BD,
         "frac13",       0x2153,
         "frac14",       0x00BC,
@@ -342,6 +685,8 @@
         "frac78",       0x215E,
         "frasl",        0x2044,
         "frown",        0x2322,
+        "Fscr",             0x2131,
+        "fscr",             0x1D4BB,
         NULL,           0
 };
 
@@ -349,12 +694,12 @@
         "gacute",       0x01F5,
         "Gamma",        0x0393,
         "gamma",        0x03B3,
-        "gammad",       0x03DC,
-        "gap",          0x2273,
+        "Gammad",           0x03DC,
+        "gammad",           0x03DD,
+        "gap",              0x2A86,
         "Gbreve",       0x011E,
         "gbreve",       0x011F,
         "Gcedil",       0x0122,
-        "gcedil",       0x0123,
         "Gcirc",        0x011C,
         "gcirc",        0x011D,
         "Gcy",          0x0413,
@@ -364,29 +709,75 @@
         "ge",           0x2265,
         "gE",           0x2267,
         "gel",          0x22DB,
-        "gEl",          0x22DB,
-        "ges",          0x2265,
+        "gEl",              0x2A8C,
+        "geq",              0x2265,
+        "geqq",             0x2267,
+        "geqslant",         0x2A7E,
+        "ges",              0x2A7E,
+        "gescc",            0x2AA9,
+        "gesdot",           0x2A80,
+        "gesdoto",          0x2A82,
+        "gesdotol",         0x2A84,
+//      "gesl",             0x022DB;0xFE00,
+        "gesles",           0x2A94,
+        "Gfr",              0x1D50A,
+        "gfr",              0x1D524,
+        "gg",               0x226B,
         "Gg",           0x22D9,
+        "ggg",              0x22D9,
         "Ggr",          0x0393,
         "ggr",          0x03B3,
         "gimel",        0x2137,
         "GJcy",         0x0403,
         "gjcy",         0x0453,
         "gl",           0x2277,
-        "gnap",         0xE411,
-        "gne",          0x2269,
+        "gla",              0x2AA5,
+        "glE",              0x2A92,
+        "glj",              0x2AA4,
+        "gnap",             0x2A8A,
+        "gnapprox",         0x2A8A,
         "gnE",          0x2269,
+        "gne",              0x2A88,
+        "gneq",             0x2A88,
+        "gneqq",            0x2269,
         "gnsim",        0x22E7,
+        "Gopf",             0x1D53E,
+        "gopf",             0x1D558,
         "grave",        0x0060,
-        "gsdot",        0x22D7,
+        "GreaterEqual",     0x2265,
+        "GreaterEqualLess", 0x22DB,
+        "GreaterFullEqual", 0x2267,
+        "GreaterGreater",   0x2AA2,
+        "GreaterLess",      0x2277,
+        "GreaterSlantEqual", 0x2A7E,
+        "GreaterTilde",     0x2273,
+        "gscr",             0x210A,
+        "Gscr",             0x1D4A2,
         "gsim",         0x2273,
+        "gsime",            0x2A8E,
+        "gsiml",            0x2A90,
         "gt",           0x003E,
+        "GT",               0x003E,
         "Gt",           0x226B,
-        "gvnE",         0x2269,
+        "gtcc",             0x2AA7,
+        "gtcir",            0x2A7A,
+        "gtdot",            0x22D7,
+        "gtlPar",           0x2995,
+        "gtquest",          0x2A7C,
+        "gtrapprox",        0x2A86,
+        "gtrarr",           0x2978,
+        "gtrdot",           0x22D7,
+        "gtreqless",        0x22DB,
+        "gtreqqless",       0x2A8C,
+        "gtrless",          0x2277,
+        "gtrsim",           0x2273,
+//      "gvertneqq",        0x02269;0xFE00,
+//      "gvnE",             0x02269;0xFE00,
         NULL,           0
 };
 
 static NameId namesH[]={
+        "Hacek",            0x02C7,
         "hairsp",       0x200A,
         "half",         0x00BD,
         "hamilt",       0x210B,
@@ -394,17 +785,38 @@
         "hardcy",       0x044A,
         "harr",         0x2194,
         "hArr",         0x21D4,
+        "harrcir",          0x2948,
         "harrw",        0x21AD,
+        "Hat",              0x005E,
+        "hbar",             0x210F,
         "Hcirc",        0x0124,
         "hcirc",        0x0125,
         "hearts",       0x2665,
+        "heartsuit",        0x2665,
         "hellip",       0x2026,
-        "hibar",        0x00AF,
+        "hercon",           0x22B9,
+        "Hfr",              0x210C,
+        "hfr",              0x1D525,
+        "HilbertSpace",     0x210B,
+        "hksearow",         0x2925,
+        "hkswarow",         0x2926,
+        "hoarr",            0x21FF,
+        "homtht",           0x223B,
+        "hookleftarrow",    0x21A9,
+        "hookrightarrow",   0x21AA,
+        "Hopf",             0x210D,
+        "hopf",             0x1D559,
         "horbar",       0x2015,
+        "HorizontalLine",   0x2500,
+        "Hscr",             0x210B,
+        "hscr",             0x1D4BD,
+        "hslash",           0x210F,
         "Hstrok",       0x0126,
         "hstrok",       0x0127,
+        "HumpDownHump",     0x224E,
+        "HumpEqual",        0x224F,
         "hybull",       0x2043,
-        "hyphen",       0x002D,
+        "hyphen",           0x2010,
         NULL,           0
 };
 
@@ -413,6 +825,7 @@
         "iacgr",        0x03AF,
         "Iacute",       0x00CD,
         "iacute",       0x00ED,
+        "ic",               0x2063,
         "Icirc",        0x00CE,
         "icirc",        0x00EE,
         "Icy",          0x0418,
@@ -425,28 +838,65 @@
         "iecy",         0x0435,
         "iexcl",        0x00A1,
         "iff",          0x21D4,
+        "Ifr",              0x2111,
+        "ifr",              0x1D526,
         "Igr",          0x0399,
         "igr",          0x03B9,
         "Igrave",       0x00CC,
         "igrave",       0x00EC,
+        "ii",               0x2148,
+        "iiiint",           0x2A0C,
+        "iiint",            0x222D,
+        "iinfin",           0x29DC,
+        "iiota",            0x2129,
         "IJlig",        0x0132,
         "ijlig",        0x0133,
+        "Im",               0x2111,
         "Imacr",        0x012A,
         "imacr",        0x012B,
         "image",        0x2111,
+        "ImaginaryI",       0x2148,
+        "imagline",         0x2110,
+        "imagpart",         0x2111,
+        "imath",            0x0131,
+        "imof",             0x22B7,
+        "imped",            0x01B5,
+        "Implies",          0x21D2,
+        "in",               0x2208,
         "incare",       0x2105,
         "infin",        0x221E,
+        "infintie",         0x29DD,
         "inodot",       0x0131,
         "int",          0x222B,
+        "Int",              0x222C,
         "intcal",       0x22BA,
+        "integers",         0x2124,
+        "Integral",         0x222B,
+        "intercal",         0x22BA,
+        "Intersection",     0x22C2,
+        "intlarhk",         0x2A17,
+        "intprod",          0x2A3C,
+        "InvisibleComma",   0x2063,
+        "InvisibleTimes",   0x2062,
         "IOcy",         0x0401,
         "iocy",         0x0451,
         "Iogon",        0x012E,
         "iogon",        0x012F,
+        "Iopf",             0x1D540,
+        "iopf",             0x1D55A,
         "Iota",         0x0399,
         "iota",         0x03B9,
+        "iprod",            0x2A3C,
         "iquest",       0x00BF,
+        "Iscr",             0x2110,
+        "iscr",             0x1D4BE,
         "isin",         0x2208,
+        "isindot",          0x22F5,
+        "isinE",            0x22F9,
+        "isins",            0x22F4,
+        "isinsv",           0x22F3,
+        "isinv",            0x2208,
+        "it",               0x2062,
         "Itilde",       0x0128,
         "itilde",       0x0129,
         "Iukcy",        0x0406,
@@ -461,6 +911,13 @@
         "jcirc",        0x0135,
         "Jcy",          0x0419,
         "jcy",          0x0439,
+        "Jfr",              0x1D50D,
+        "jfr",              0x1D527,
+        "jmath",            0x0237,
+        "Jopf",             0x1D541,
+        "jopf",             0x1D55B,
+        "Jscr",             0x1D4A5,
+        "jscr",             0x1D4BF,
         "Jsercy",       0x0408,
         "jsercy",       0x0458,
         "Jukcy",        0x0404,
@@ -476,6 +933,8 @@
         "kcedil",       0x0137,
         "Kcy",          0x041A,
         "kcy",          0x043A,
+        "Kfr",              0x1D50E,
+        "kfr",              0x1D528,
         "Kgr",          0x039A,
         "kgr",          0x03BA,
         "kgreen",       0x0138,
@@ -485,6 +944,10 @@
         "khgr",         0x03C7,
         "KJcy",         0x040C,
         "kjcy",         0x045C,
+        "Kopf",             0x1D542,
+        "kopf",             0x1D55C,
+        "Kscr",             0x1D4A6,
+        "kscr",             0x1D4C0,
         NULL,           0
 };
 
@@ -492,19 +955,41 @@
         "lAarr",        0x21DA,
         "Lacute",       0x0139,
         "lacute",       0x013A,
+        "laemptyv",         0x29B4,
         "lagran",       0x2112,
         "Lambda",       0x039B,
         "lambda",       0x03BB,
-        "lang",         0x2329,
-        "lap",          0x2272,
+        "lang",             0x27E8,
+        "Lang",             0x27EA,
+        "langd",            0x2991,
+        "langle",           0x27E8,
+        "lap",              0x2A85,
+        "Laplacetrf",       0x2112,
         "laquo",        0x00AB,
         "larr",         0x2190,
         "Larr",         0x219E,
         "lArr",         0x21D0,
-        "larr2",        0x21C7,
+        "larrb",            0x21E4,
+        "larrbfs",          0x291F,
+        "larrfs",           0x291D,
         "larrhk",       0x21A9,
         "larrlp",       0x21AB,
+        "larrpl",           0x2939,
+        "larrsim",          0x2973,
         "larrtl",       0x21A2,
+        "lat",              0x2AAB,
+        "latail",           0x2919,
+        "lAtail",           0x291B,
+        "late",             0x2AAD,
+//      "lates",            0x02AAD;0xFE00,
+        "lbarr",            0x290C,
+        "lBarr",            0x290E,
+        "lbbrk",            0x2772,
+        "lbrace",           0x007B,
+        "lbrack",           0x005B,
+        "lbrke",            0x298B,
+        "lbrksld",          0x298F,
+        "lbrkslu",          0x298D,
         "Lcaron",       0x013D,
         "lcaron",       0x013E,
         "Lcedil",       0x013B,
@@ -513,54 +998,173 @@
         "lcub",         0x007B,
         "Lcy",          0x041B,
         "lcy",          0x043B,
-        "ldot",         0x22D6,
+        "ldca",             0x2936,
         "ldquo",        0x201C,
         "ldquor",       0x201E,
+        "ldrdhar",          0x2967,
+        "ldrushar",         0x294B,
+        "ldsh",             0x21B2,
         "le",           0x2264,
         "lE",           0x2266,
+        "LeftAngleBracket", 0x27E8,
+        "leftarrow",        0x2190,
+        "LeftArrow",        0x2190,
+        "Leftarrow",        0x21D0,
+        "LeftArrowBar",     0x21E4,
+        "LeftArrowRightArrow", 0x21C6,
+        "leftarrowtail",    0x21A2,
+        "LeftCeiling",      0x2308,
+        "LeftDoubleBracket", 0x27E6,
+        "LeftDownTeeVector", 0x2961,
+        "LeftDownVector",   0x21C3,
+        "LeftDownVectorBar", 0x2959,
+        "LeftFloor",        0x230A,
+        "leftharpoondown",  0x21BD,
+        "leftharpoonup",    0x21BC,
+        "leftleftarrows",   0x21C7,
+        "leftrightarrow",   0x2194,
+        "LeftRightArrow",   0x2194,
+        "Leftrightarrow",   0x21D4,
+        "leftrightarrows",  0x21C6,
+        "leftrightharpoons", 0x21CB,
+        "leftrightsquigarrow", 0x21AD,
+        "LeftRightVector",  0x294E,
+        "LeftTee",          0x22A3,
+        "LeftTeeArrow",     0x21A4,
+        "LeftTeeVector",    0x295A,
+        "leftthreetimes",   0x22CB,
+        "LeftTriangle",     0x22B2,
+        "LeftTriangleBar",  0x29CF,
+        "LeftTriangleEqual", 0x22B4,
+        "LeftUpDownVector", 0x2951,
+        "LeftUpTeeVector",  0x2960,
+        "LeftUpVector",     0x21BF,
+        "LeftUpVectorBar",  0x2958,
+        "LeftVector",       0x21BC,
+        "LeftVectorBar",    0x2952,
         "leg",          0x22DA,
-        "lEg",          0x22DA,
-        "les",          0x2264,
+        "lEg",              0x2A8B,
+        "leq",              0x2264,
+        "leqq",             0x2266,
+        "leqslant",         0x2A7D,
+        "les",              0x2A7D,
+        "lescc",            0x2AA8,
+        "lesdot",           0x2A7F,
+        "lesdoto",          0x2A81,
+        "lesdotor",         0x2A83,
+//      "lesg",             0x022DA;0xFE00,
+        "lesges",           0x2A93,
+        "lessapprox",       0x2A85,
+        "lessdot",          0x22D6,
+        "lesseqgtr",        0x22DA,
+        "lesseqqgtr",       0x2A8B,
+        "LessEqualGreater", 0x22DA,
+        "LessFullEqual",    0x2266,
+        "LessGreater",      0x2276,
+        "lessgtr",          0x2276,
+        "LessLess",         0x2AA1,
+        "lesssim",          0x2272,
+        "LessSlantEqual",   0x2A7D,
+        "LessTilde",        0x2272,
+        "lfisht",           0x297C,
         "lfloor",       0x230A,
+        "Lfr",              0x1D50F,
+        "lfr",              0x1D529,
         "lg",           0x2276,
+        "lgE",              0x2A91,
         "Lgr",          0x039B,
         "lgr",          0x03BB,
+        "lHar",             0x2962,
         "lhard",        0x21BD,
         "lharu",        0x21BC,
+        "lharul",           0x296A,
         "lhblk",        0x2584,
         "LJcy",         0x0409,
         "ljcy",         0x0459,
+        "ll",               0x226A,
         "Ll",           0x22D8,
+        "llarr",            0x21C7,
+        "llcorner",         0x231E,
+        "Lleftarrow",       0x21DA,
+        "llhard",           0x296B,
+        "lltri",            0x25FA,
         "Lmidot",       0x013F,
         "lmidot",       0x0140,
-        "lnap",         0xE2A2,
-        "lne",          0x2268,
+        "lmoust",           0x23B0,
+        "lmoustache",       0x23B0,
+        "lnap",             0x2A89,
+        "lnapprox",         0x2A89,
         "lnE",          0x2268,
+        "lne",              0x2A87,
+        "lneq",             0x2A87,
+        "lneqq",            0x2268,
         "lnsim",        0x22E6,
+        "loang",            0x27EC,
+        "loarr",            0x21FD,
+        "lobrk",            0x27E6,
+        "longleftarrow",    0x27F5,
+        "LongLeftArrow",    0x27F5,
+        "Longleftarrow",    0x27F8,
+        "longleftrightarrow", 0x27F7,
+        "LongLeftRightArrow", 0x27F7,
+        "Longleftrightarrow", 0x27FA,
+        "longmapsto",       0x27FC,
+        "longrightarrow",   0x27F6,
+        "LongRightArrow",   0x27F6,
+        "Longrightarrow",   0x27F9,
+        "looparrowleft",    0x21AB,
+        "looparrowright",   0x21AC,
+        "lopar",            0x2985,
+        "Lopf",             0x1D543,
+        "lopf",             0x1D55D,
+        "loplus",           0x2A2D,
+        "lotimes",          0x2A34,
         "lowast",       0x2217,
         "lowbar",       0x005F,
+        "LowerLeftArrow",   0x2199,
+        "LowerRightArrow",  0x2198,
         "loz",          0x25CA,
-        "lozf",         0x2726,
+        "lozenge",          0x25CA,
+        "lozf",             0x29EB,
         "lpar",         0x0028,
-        "lrarr2",       0x21C6,
-        "lrhar2",       0x21CB,
+        "lparlt",           0x2993,
+        "lrarr",            0x21C6,
+        "lrcorner",         0x231F,
+        "lrhar",            0x21CB,
+        "lrhard",           0x296D,
         "lrm",          0x200E,
+        "lrtri",            0x22BF,
         "lsaquo",       0x2039,
+        "Lscr",             0x2112,
+        "lscr",             0x1D4C1,
         "lsh",          0x21B0,
+        "Lsh",              0x21B0,
         "lsim",         0x2272,
+        "lsime",            0x2A8D,
+        "lsimg",            0x2A8F,
         "lsqb",         0x005B,
         "lsquo",        0x2018,
         "lsquor",       0x201A,
         "Lstrok",       0x0141,
         "lstrok",       0x0142,
         "lt",           0x003C,
+        "LT",               0x003C,
         "Lt",           0x226A,
+        "ltcc",             0x2AA6,
+        "ltcir",            0x2A79,
+        "ltdot",            0x22D6,
         "lthree",       0x22CB,
         "ltimes",       0x22C9,
+        "ltlarr",           0x2976,
+        "ltquest",          0x2A7B,
         "ltri",         0x25C3,
         "ltrie",        0x22B4,
         "ltrif",        0x25C2,
-        "lvnE",         0x2268,
+        "ltrPar",           0x2996,
+        "lurdshar",         0x294A,
+        "luruhar",          0x2966,
+//      "lvertneqq",        0x02268;0xFE00,
+//      "lvnE",             0x02268;0xFE00,
         NULL,           0
 };
 
@@ -568,23 +1172,50 @@
         "macr",         0x00AF,
         "male",         0x2642,
         "malt",         0x2720,
+        "maltese",          0x2720,
         "map",          0x21A6,
+        "Map",              0x2905,
+        "mapsto",           0x21A6,
+        "mapstodown",       0x21A7,
+        "mapstoleft",       0x21A4,
+        "mapstoup",         0x21A5,
         "marker",       0x25AE,
+        "mcomma",           0x2A29,
         "Mcy",          0x041C,
         "mcy",          0x043C,
         "mdash",        0x2014,
+        "mDDot",            0x223A,
+        "measuredangle",    0x2221,
+        "MediumSpace",      0x205F,
+        "Mellintrf",        0x2133,
+        "Mfr",              0x1D510,
+        "mfr",              0x1D52A,
         "Mgr",          0x039C,
         "mgr",          0x03BC,
+        "mho",              0x2127,
         "micro",        0x00B5,
         "mid",          0x2223,
+        "midast",           0x002A,
+        "midcir",           0x2AF0,
         "middot",       0x00B7,
         "minus",        0x2212,
         "minusb",       0x229F,
+        "minusd",           0x2238,
+        "minusdu",          0x2A2A,
+        "MinusPlus",        0x2213,
+        "mlcp",             0x2ADB,
         "mldr",         0x2026,
         "mnplus",       0x2213,
         "models",       0x22A7,
+        "Mopf",             0x1D544,
+        "mopf",             0x1D55E,
+        "mp",               0x2213,
+        "Mscr",             0x2133,
+        "mscr",             0x1D4C2,
+        "mstpos",           0x223E,
         "Mu",           0x039C,
         "mu",           0x03BC,
+        "multimap",         0x22B8,
         "mumap",        0x22B8,
         NULL,           0
 };
@@ -593,76 +1224,241 @@
         "nabla",        0x2207,
         "Nacute",       0x0143,
         "nacute",       0x0144,
+//      "nang",             0x02220;0x20D2,
         "nap",          0x2249,
+//      "napE",             0x02A70;0x0338,
+//      "napid",            0x0224B;0x0338,
         "napos",        0x0149,
+        "napprox",          0x2249,
         "natur",        0x266E,
+        "natural",          0x266E,
+        "naturals",         0x2115,
         "nbsp",         0x00A0,
+//      "nbump",            0x0224E;0x0338,
+//      "nbumpe",           0x0224F;0x0338,
+        "ncap",             0x2A43,
         "Ncaron",       0x0147,
         "ncaron",       0x0148,
         "Ncedil",       0x0145,
         "ncedil",       0x0146,
         "ncong",        0x2247,
+//      "ncongdot",         0x02A6D;0x0338,
+        "ncup",             0x2A42,
         "Ncy",          0x041D,
         "ncy",          0x043D,
         "ndash",        0x2013,
         "ne",           0x2260,
+        "nearhk",           0x2924,
         "nearr",        0x2197,
+        "neArr",            0x21D7,
+        "nearrow",          0x2197,
+//      "nedot",            0x02250;0x0338,
+        "NegativeMediumSpace", 0x200B,
+        "NegativeThickSpace", 0x200B,
+        "NegativeThinSpace", 0x200B,
+        "NegativeVeryThinSpace", 0x200B,
         "nequiv",       0x2262,
+        "nesear",           0x2928,
+//      "nesim",            0x02242;0x0338,
+        "NestedGreaterGreater", 0x226B,
+        "NestedLessLess",   0x226A,
+        "NewLine",          0x000A,
         "nexist",       0x2204,
+        "nexists",          0x2204,
+        "Nfr",              0x1D511,
+        "nfr",              0x1D52B,
+//      "ngE",              0x02267;0x0338,
         "nge",          0x2271,
-        "ngE",          0x2271,
-        "nges",         0x2271,
+        "ngeq",             0x2271,
+//      "ngeqq",            0x02267;0x0338,
+//      "ngeqslant",        0x02A7E;0x0338,
+//      "nges",             0x02A7E;0x0338,
+//      "nGg",              0x022D9;0x0338,
         "Ngr",          0x039D,
         "ngr",          0x03BD,
+        "ngsim",            0x2275,
+//      "nGt",              0x0226B;0x20D2,
         "ngt",          0x226F,
+        "ngtr",             0x226F,
+//      "nGtv",             0x0226B;0x0338,
         "nharr",        0x21AE,
         "nhArr",        0x21CE,
+        "nhpar",            0x2AF2,
         "ni",           0x220B,
+        "nis",              0x22FC,
+        "nisd",             0x22FA,
+        "niv",              0x220B,
         "NJcy",         0x040A,
         "njcy",         0x045A,
         "nlarr",        0x219A,
         "nlArr",        0x21CD,
         "nldr",         0x2025,
+//      "nlE",              0x02266;0x0338,
         "nle",          0x2270,
-        "nlE",          0x2270,
-        "nles",         0x2270,
+        "nleftarrow",       0x219A,
+        "nLeftarrow",       0x21CD,
+        "nleftrightarrow",  0x21AE,
+        "nLeftrightarrow",  0x21CE,
+        "nleq",             0x2270,
+//      "nleqq",            0x02266;0x0338,
+//      "nleqslant",        0x02A7D;0x0338,
+//      "nles",             0x02A7D;0x0338,
+        "nless",            0x226E,
+//      "nLl",              0x022D8;0x0338,
+        "nlsim",            0x2274,
+//      "nLt",              0x0226A;0x20D2,
         "nlt",          0x226E,
         "nltri",        0x22EA,
         "nltrie",       0x22EC,
+//      "nLtv",             0x0226A;0x0338,
         "nmid",         0x2224,
+        "NoBreak",          0x2060,
+        "NonBreakingSpace", 0x00A0,
+        "Nopf",             0x2115,
+        "nopf",             0x1D55F,
         "not",          0x00AC,
+        "Not",              0x2AEC,
+        "NotCongruent",     0x2262,
+        "NotCupCap",        0x226D,
+        "NotDoubleVerticalBar", 0x2226,
+        "NotElement",       0x2209,
+        "NotEqual",         0x2260,
+//      "NotEqualTilde",    0x02242;0x0338,
+        "NotExists",        0x2204,
+        "NotGreater",       0x226F,
+        "NotGreaterEqual",  0x2271,
+//      "NotGreaterFullEqual", 0x02267;0x0338,
+//      "NotGreaterGreater", 0x0226B;0x0338,
+        "NotGreaterLess",   0x2279,
+//      "NotGreaterSlantEqual", 0x02A7E;0x0338,
+        "NotGreaterTilde",  0x2275,
+//      "NotHumpDownHump",  0x0224E;0x0338,
+//      "NotHumpEqual",     0x0224F;0x0338,
         "notin",        0x2209,
+//      "notindot",         0x022F5;0x0338,
+//      "notinE",           0x022F9;0x0338,
+        "notinva",          0x2209,
+        "notinvb",          0x22F7,
+        "notinvc",          0x22F6,
+        "NotLeftTriangle",  0x22EA,
+//      "NotLeftTriangleBar", 0x029CF;0x0338,
+        "NotLeftTriangleEqual", 0x22EC,
+        "NotLess",          0x226E,
+        "NotLessEqual",     0x2270,
+        "NotLessGreater",   0x2278,
+//      "NotLessLess",      0x0226A;0x0338,
+//      "NotLessSlantEqual", 0x02A7D;0x0338,
+        "NotLessTilde",     0x2274,
+//      "NotNestedGreaterGreater", 0x02AA2;0x0338,
+//      "NotNestedLessLess", 0x02AA1;0x0338,
+        "notni",            0x220C,
+        "notniva",          0x220C,
+        "notnivb",          0x22FE,
+        "notnivc",          0x22FD,
+        "NotPrecedes",      0x2280,
+//      "NotPrecedesEqual", 0x02AAF;0x0338,
+        "NotPrecedesSlantEqual", 0x22E0,
+        "NotReverseElement", 0x220C,
+        "NotRightTriangle", 0x22EB,
+//      "NotRightTriangleBar", 0x029D0;0x0338,
+        "NotRightTriangleEqual", 0x22ED,
+//      "NotSquareSubset",  0x0228F;0x0338,
+        "NotSquareSubsetEqual", 0x22E2,
+//      "NotSquareSuperset", 0x02290;0x0338,
+        "NotSquareSupersetEqual", 0x22E3,
+//      "NotSubset",        0x02282;0x20D2,
+        "NotSubsetEqual",   0x2288,
+        "NotSucceeds",      0x2281,
+//      "NotSucceedsEqual", 0x02AB0;0x0338,
+        "NotSucceedsSlantEqual", 0x22E1,
+//      "NotSucceedsTilde", 0x0227F;0x0338,
+//      "NotSuperset",      0x02283;0x20D2,
+        "NotSupersetEqual", 0x2289,
+        "NotTilde",         0x2241,
+        "NotTildeEqual",    0x2244,
+        "NotTildeFullEqual", 0x2247,
+        "NotTildeTilde",    0x2249,
+        "NotVerticalBar",   0x2224,
         "npar",         0x2226,
+        "nparallel",        0x2226,
+//      "nparsl",           0x02AFD;0x20E5,
+//      "npart",            0x02202;0x0338,
+        "npolint",          0x2A14,
         "npr",          0x2280,
-        "npre",         0x22E0,
+        "nprcue",           0x22E0,
+//      "npre",             0x02AAF;0x0338,
+        "nprec",            0x2280,
+//      "npreceq",          0x02AAF;0x0338,
         "nrarr",        0x219B,
         "nrArr",        0x21CF,
+//      "nrarrc",           0x02933;0x0338,
+//      "nrarrw",           0x0219D;0x0338,
+        "nrightarrow",      0x219B,
+        "nRightarrow",      0x21CF,
         "nrtri",        0x22EB,
         "nrtrie",       0x22ED,
         "nsc",          0x2281,
-        "nsce",         0x22E1,
+        "nsccue",           0x22E1,
+//      "nsce",             0x02AB0;0x0338,
+        "Nscr",             0x1D4A9,
+        "nscr",             0x1D4C3,
+        "nshortmid",        0x2224,
+        "nshortparallel",   0x2226,
         "nsim",         0x2241,
         "nsime",        0x2244,
-        "nsmid",        0xE2AA,
+        "nsimeq",           0x2244,
+        "nsmid",            0x2224,
         "nspar",        0x2226,
+        "nsqsube",          0x22E2,
+        "nsqsupe",          0x22E3,
         "nsub",         0x2284,
         "nsube",        0x2288,
-        "nsubE",        0x2288,
+//      "nsubE",            0x02AC5;0x0338,
+//      "nsubset",          0x02282;0x20D2,
+        "nsubseteq",        0x2288,
+//      "nsubseteqq",       0x02AC5;0x0338,
+        "nsucc",            0x2281,
+//      "nsucceq",          0x02AB0;0x0338,
         "nsup",         0x2285,
         "nsupe",        0x2289,
-        "nsupE",        0x2289,
+//      "nsupE",            0x02AC6;0x0338,
+//      "nsupset",          0x02283;0x20D2,
+        "nsupseteq",        0x2289,
+//      "nsupseteqq",       0x02AC6;0x0338,
+        "ntgl",             0x2279,
         "Ntilde",       0x00D1,
         "ntilde",       0x00F1,
+        "ntlg",             0x2278,
+        "ntriangleleft",    0x22EA,
+        "ntrianglelefteq",  0x22EC,
+        "ntriangleright",   0x22EB,
+        "ntrianglerighteq", 0x22ED,
         "Nu",           0x039D,
         "nu",           0x03BD,
         "num",          0x0023,
         "numero",       0x2116,
         "numsp",        0x2007,
+//      "nvap",             0x0224D;0x20D2,
         "nvdash",       0x22AC,
         "nvDash",       0x22AD,
         "nVdash",       0x22AE,
         "nVDash",       0x22AF,
+//      "nvge",             0x02265;0x20D2,
+//      "nvgt",             0x0003E;0x20D2,
+        "nvHarr",           0x2904,
+        "nvinfin",          0x29DE,
+        "nvlArr",           0x2902,
+//      "nvle",             0x02264;0x20D2,
+//      "nvlt",             0x0003C;0x20D2,
+//      "nvltrie",          0x022B4;0x20D2,
+        "nvrArr",           0x2903,
+//      "nvrtrie",          0x022B5;0x20D2,
+//      "nvsim",            0x0223C;0x20D2,
+        "nwarhk",           0x2923,
         "nwarr",        0x2196,
+        "nwArr",            0x21D6,
+        "nwarrow",          0x2196,
+        "nwnear",           0x2927,
         NULL,           0
 };
 
@@ -680,86 +1476,167 @@
         "odash",        0x229D,
         "Odblac",       0x0150,
         "odblac",       0x0151,
+        "odiv",             0x2A38,
         "odot",         0x2299,
+        "odsold",           0x29BC,
         "OElig",        0x0152,
         "oelig",        0x0153,
+        "ofcir",            0x29BF,
+        "Ofr",              0x1D512,
+        "ofr",              0x1D52C,
         "ogon",         0x02DB,
         "Ogr",          0x039F,
         "ogr",          0x03BF,
         "Ograve",       0x00D2,
         "ograve",       0x00F2,
+        "ogt",              0x29C1,
         "OHacgr",       0x038F,
         "ohacgr",       0x03CE,
+        "ohbar",            0x29B5,
         "OHgr",         0x03A9,
         "ohgr",         0x03C9,
-        "ohm",          0x2126,
+        "ohm",              0x03A9,
+        "oint",             0x222E,
         "olarr",        0x21BA,
+        "olcir",            0x29BE,
+        "olcross",          0x29BB,
         "oline",        0x203E,
+        "olt",              0x29C0,
         "Omacr",        0x014C,
         "omacr",        0x014D,
         "Omega",        0x03A9,
         "omega",        0x03C9,
         "Omicron",      0x039F,
         "omicron",      0x03BF,
+        "omid",             0x29B6,
         "ominus",       0x2296,
+        "Oopf",             0x1D546,
+        "oopf",             0x1D560,
+        "opar",             0x29B7,
+        "OpenCurlyDoubleQuote", 0x201C,
+        "OpenCurlyQuote",   0x2018,
+        "operp",            0x29B9,
         "oplus",        0x2295,
         "or",           0x2228,
+        "Or",               0x2A54,
         "orarr",        0x21BB,
+        "ord",              0x2A5D,
         "order",        0x2134,
+        "orderof",          0x2134,
         "ordf",         0x00AA,
         "ordm",         0x00BA,
+        "origof",           0x22B6,
+        "oror",             0x2A56,
+        "orslope",          0x2A57,
+        "orv",              0x2A5B,
         "oS",           0x24C8,
+        "oscr",             0x2134,
+        "Oscr",             0x1D4AA,
         "Oslash",       0x00D8,
         "oslash",       0x00F8,
         "osol",         0x2298,
         "Otilde",       0x00D5,
         "otilde",       0x00F5,
         "otimes",       0x2297,
+        "Otimes",           0x2A37,
+        "otimesas",         0x2A36,
         "Ouml",         0x00D6,
         "ouml",         0x00F6,
+        "ovbar",            0x233D,
+        "OverBar",          0x203E,
+        "OverBrace",        0x23DE,
+        "OverBracket",      0x23B4,
+        "OverParenthesis",  0x23DC,
         NULL,           0
 };
 
 static NameId namesP[]={
         "par",          0x2225,
         "para",         0x00B6,
+        "parallel",         0x2225,
+        "parsim",           0x2AF3,
+        "parsl",            0x2AFD,
         "part",         0x2202,
+        "PartialD",         0x2202,
         "Pcy",          0x041F,
         "pcy",          0x043F,
         "percnt",       0x0025,
         "period",       0x002E,
         "permil",       0x2030,
         "perp",         0x22A5,
+        "pertenk",          0x2031,
+        "Pfr",              0x1D513,
+        "pfr",              0x1D52D,
         "Pgr",          0x03A0,
         "pgr",          0x03C0,
         "PHgr",         0x03A6,
         "phgr",         0x03C6,
         "Phi",          0x03A6,
         "phi",          0x03C6,
-        "phis",         0x03C6,
         "phiv",         0x03D5,
         "phmmat",       0x2133,
         "phone",        0x260E,
         "Pi",           0x03A0,
         "pi",           0x03C0,
+        "pitchfork",        0x22D4,
         "piv",          0x03D6,
         "planck",       0x210F,
+        "planckh",          0x210E,
+        "plankv",           0x210F,
         "plus",         0x002B,
+        "plusacir",         0x2A23,
         "plusb",        0x229E,
+        "pluscir",          0x2A22,
         "plusdo",       0x2214,
+        "plusdu",           0x2A25,
+        "pluse",            0x2A72,
+        "PlusMinus",        0x00B1,
         "plusmn",       0x00B1,
+        "plussim",          0x2A26,
+        "plustwo",          0x2A27,
+        "pm",               0x00B1,
+        "Poincareplane",    0x210C,
+        "pointint",         0x2A15,
+        "Popf",             0x2119,
+        "popf",             0x1D561,
         "pound",        0x00A3,
         "pr",           0x227A,
-        "prap",         0x227E,
-        "pre",          0x227C,
+        "Pr",               0x2ABB,
+        "prap",             0x2AB7,
+        "prcue",            0x227C,
+        "pre",              0x2AAF,
+        "prE",              0x2AB3,
+        "prec",             0x227A,
+        "precapprox",       0x2AB7,
+        "preccurlyeq",      0x227C,
+        "Precedes",         0x227A,
+        "PrecedesEqual",    0x2AAF,
+        "PrecedesSlantEqual", 0x227C,
+        "PrecedesTilde",    0x227E,
+        "preceq",           0x2AAF,
+        "precnapprox",      0x2AB9,
+        "precneqq",         0x2AB5,
+        "precnsim",         0x22E8,
+        "precsim",          0x227E,
         "prime",        0x2032,
         "Prime",        0x2033,
-        "prnap",        0x22E8,
-        "prnE",         0xE2B3,
+        "primes",           0x2119,
+        "prnap",            0x2AB9,
+        "prnE",             0x2AB5,
         "prnsim",       0x22E8,
         "prod",         0x220F,
+        "Product",          0x220F,
+        "profalar",         0x232E,
+        "profline",         0x2312,
+        "profsurf",         0x2313,
         "prop",         0x221D,
+        "Proportion",       0x2237,
+        "Proportional",     0x221D,
+        "propto",           0x221D,
         "prsim",        0x227E,
+        "prurel",           0x22B0,
+        "Pscr",             0x1D4AB,
+        "pscr",             0x1D4C5,
         "PSgr",         0x03A8,
         "psgr",         0x03C8,
         "Psi",          0x03A8,
@@ -769,26 +1646,64 @@
 };
 
 static NameId namesQ[]={
+        "Qfr",              0x1D514,
+        "qfr",              0x1D52E,
+        "qint",             0x2A0C,
+        "Qopf",             0x211A,
+        "qopf",             0x1D562,
+        "qprime",           0x2057,
+        "Qscr",             0x1D4AC,
+        "qscr",             0x1D4C6,
+        "quaternions",      0x210D,
+        "quatint",          0x2A16,
         "quest",        0x003F,
+        "questeq",          0x225F,
         "quot",         0x0022,
+        "QUOT",             0x0022,
         NULL,           0
 };
 
 static NameId namesR[]={
         "rAarr",        0x21DB,
+//      "race",             0x0223D;0x0331,
         "Racute",       0x0154,
         "racute",       0x0155,
         "radic",        0x221A,
-        "rang",         0x232A,
+        "raemptyv",         0x29B3,
+        "rang",             0x27E9,
+        "Rang",             0x27EB,
+        "rangd",            0x2992,
+        "range",            0x29A5,
+        "rangle",           0x27E9,
         "raquo",        0x00BB,
         "rarr",         0x2192,
         "Rarr",         0x21A0,
         "rArr",         0x21D2,
-        "rarr2",        0x21C9,
+        "rarrap",           0x2975,
+        "rarrb",            0x21E5,
+        "rarrbfs",          0x2920,
+        "rarrc",            0x2933,
+        "rarrfs",           0x291E,
         "rarrhk",       0x21AA,
         "rarrlp",       0x21AC,
+        "rarrpl",           0x2945,
+        "rarrsim",          0x2974,
         "rarrtl",       0x21A3,
+        "Rarrtl",           0x2916,
         "rarrw",        0x219D,
+        "ratail",           0x291A,
+        "rAtail",           0x291C,
+        "ratio",            0x2236,
+        "rationals",        0x211A,
+        "rbarr",            0x290D,
+        "rBarr",            0x290F,
+        "RBarr",            0x2910,
+        "rbbrk",            0x2773,
+        "rbrace",           0x007D,
+        "rbrack",           0x005D,
+        "rbrke",            0x298C,
+        "rbrksld",          0x298E,
+        "rbrkslu",          0x2990,
         "Rcaron",       0x0158,
         "rcaron",       0x0159,
         "Rcedil",       0x0156,
@@ -797,35 +1712,105 @@
         "rcub",         0x007D,
         "Rcy",          0x0420,
         "rcy",          0x0440,
+        "rdca",             0x2937,
+        "rdldhar",          0x2969,
         "rdquo",        0x201D,
-        "rdquor",       0x201C,
+        "rdquor",           0x201D,
+        "rdsh",             0x21B3,
+        "Re",               0x211C,
         "real",         0x211C,
+        "realine",          0x211B,
+        "realpart",         0x211C,
+        "reals",            0x211D,
         "rect",         0x25AD,
         "reg",          0x00AE,
+        "REG",              0x00AE,
+        "ReverseElement",   0x220B,
+        "ReverseEquilibrium", 0x21CB,
+        "ReverseUpEquilibrium", 0x296F,
+        "rfisht",           0x297D,
         "rfloor",       0x230B,
+        "Rfr",              0x211C,
+        "rfr",              0x1D52F,
         "Rgr",          0x03A1,
         "rgr",          0x03C1,
+        "rHar",             0x2964,
         "rhard",        0x21C1,
         "rharu",        0x21C0,
+        "rharul",           0x296C,
         "Rho",          0x03A1,
         "rho",          0x03C1,
         "rhov",         0x03F1,
+        "RightAngleBracket", 0x27E9,
+        "rightarrow",       0x2192,
+        "RightArrow",       0x2192,
+        "Rightarrow",       0x21D2,
+        "RightArrowBar",    0x21E5,
+        "RightArrowLeftArrow", 0x21C4,
+        "rightarrowtail",   0x21A3,
+        "RightCeiling",     0x2309,
+        "RightDoubleBracket", 0x27E7,
+        "RightDownTeeVector", 0x295D,
+        "RightDownVector",  0x21C2,
+        "RightDownVectorBar", 0x2955,
+        "RightFloor",       0x230B,
+        "rightharpoondown", 0x21C1,
+        "rightharpoonup",   0x21C0,
+        "rightleftarrows",  0x21C4,
+        "rightleftharpoons", 0x21CC,
+        "rightrightarrows", 0x21C9,
+        "rightsquigarrow",  0x219D,
+        "RightTee",         0x22A2,
+        "RightTeeArrow",    0x21A6,
+        "RightTeeVector",   0x295B,
+        "rightthreetimes",  0x22CC,
+        "RightTriangle",    0x22B3,
+        "RightTriangleBar", 0x29D0,
+        "RightTriangleEqual", 0x22B5,
+        "RightUpDownVector", 0x294F,
+        "RightUpTeeVector", 0x295C,
+        "RightUpVector",    0x21BE,
+        "RightUpVectorBar", 0x2954,
+        "RightVector",      0x21C0,
+        "RightVectorBar",   0x2953,
         "ring",         0x02DA,
-        "rlarr2",       0x21C4,
-        "rlhar2",       0x21CC,
+        "risingdotseq",     0x2253,
+        "rlarr",            0x21C4,
+        "rlhar",            0x21CC,
         "rlm",          0x200F,
+        "rmoust",           0x23B1,
+        "rmoustache",       0x23B1,
+        "rnmid",            0x2AEE,
+        "roang",            0x27ED,
+        "roarr",            0x21FE,
+        "robrk",            0x27E7,
+        "ropar",            0x2986,
+        "Ropf",             0x211D,
+        "ropf",             0x1D563,
+        "roplus",           0x2A2E,
+        "rotimes",          0x2A35,
+        "RoundImplies",     0x2970,
         "rpar",         0x0029,
-        "rpargt",       0xE291,
+        "rpargt",           0x2994,
+        "rppolint",         0x2A12,
+        "rrarr",            0x21C9,
+        "Rrightarrow",      0x21DB,
         "rsaquo",       0x203A,
+        "Rscr",             0x211B,
+        "rscr",             0x1D4C7,
         "rsh",          0x21B1,
+        "Rsh",              0x21B1,
         "rsqb",         0x005D,
         "rsquo",        0x2019,
-        "rsquor",       0x2018,
+        "rsquor",           0x2019,
         "rthree",       0x22CC,
         "rtimes",       0x22CA,
         "rtri",         0x25B9,
         "rtrie",        0x22B5,
         "rtrif",        0x25B8,
+        "rtriltri",         0x29CE,
+        "RuleDelayed",      0x29F4,
+        "ruluhar",          0x2968,
         "rx",           0x211E,
         NULL,           0
 };
@@ -833,32 +1818,42 @@
 static NameId namesS[]={
         "Sacute",       0x015A,
         "sacute",       0x015B,
-        "samalg",       0x2210,
         "sbquo",        0x201A,
-        "sbsol",        0xFE68,
         "sc",           0x227B,
-        "scap",         0x227F,
+        "Sc",               0x2ABC,
+        "scap",             0x2AB8,
         "Scaron",       0x0160,
         "scaron",       0x0161,
         "sccue",        0x227D,
-        "sce",          0x227D,
+        "sce",              0x2AB0,
+        "scE",              0x2AB4,
         "Scedil",       0x015E,
         "scedil",       0x015F,
         "Scirc",        0x015C,
         "scirc",        0x015D,
-        "scnap",        0x22E9,
-        "scnE",         0xE2B5,
+        "scnap",            0x2ABA,
+        "scnE",             0x2AB6,
         "scnsim",       0x22E9,
+        "scpolint",         0x2A13,
         "scsim",        0x227F,
         "Scy",          0x0421,
         "scy",          0x0441,
         "sdot",         0x22C5,
         "sdotb",        0x22A1,
+        "sdote",            0x2A66,
+        "searhk",           0x2925,
+        "searr",            0x2198,
+        "seArr",            0x21D8,
+        "searrow",          0x2198,
         "sect",         0x00A7,
         "semi",         0x003B,
+        "seswar",           0x2929,
+        "setminus",         0x2216,
         "setmn",        0x2216,
         "sext",         0x2736,
         "sfgr",         0x03C2,
+        "Sfr",              0x1D516,
+        "sfr",              0x1D530,
         "sfrown",       0x2322,
         "Sgr",          0x03A3,
         "sgr",          0x03C3,
@@ -867,59 +1862,164 @@
         "shchcy",       0x0449,
         "SHcy",         0x0428,
         "shcy",         0x0448,
+        "ShortDownArrow",   0x2193,
+        "ShortLeftArrow",   0x2190,
+        "shortmid",         0x2223,
+        "shortparallel",    0x2225,
+        "ShortRightArrow",  0x2192,
+        "ShortUpArrow",     0x2191,
         "shy",          0x00AD,
         "Sigma",        0x03A3,
         "sigma",        0x03C3,
         "sigmaf",       0x03C2,
         "sigmav",       0x03C2,
         "sim",          0x223C,
+        "simdot",           0x2A6A,
         "sime",         0x2243,
-        "smid",         0xE301,
+        "simeq",            0x2243,
+        "simg",             0x2A9E,
+        "simgE",            0x2AA0,
+        "siml",             0x2A9D,
+        "simlE",            0x2A9F,
+        "simne",            0x2246,
+        "simplus",          0x2A24,
+        "simrarr",          0x2972,
+        "slarr",            0x2190,
+        "SmallCircle",      0x2218,
+        "smallsetminus",    0x2216,
+        "smashp",           0x2A33,
+        "smeparsl",         0x29E4,
+        "smid",             0x2223,
         "smile",        0x2323,
+        "smt",              0x2AAA,
+        "smte",             0x2AAC,
+//      "smtes",            0x02AAC;0xFE00,
         "SOFTcy",       0x042C,
         "softcy",       0x044C,
         "sol",          0x002F,
+        "solb",             0x29C4,
+        "solbar",           0x233F,
+        "Sopf",             0x1D54A,
+        "sopf",             0x1D564,
         "spades",       0x2660,
+        "spadesuit",        0x2660,
         "spar",         0x2225,
         "sqcap",        0x2293,
+//      "sqcaps",           0x02293;0xFE00,
         "sqcup",        0x2294,
+//      "sqcups",           0x02294;0xFE00,
+        "Sqrt",             0x221A,
         "sqsub",        0x228F,
         "sqsube",       0x2291,
+        "sqsubset",         0x228F,
+        "sqsubseteq",       0x2291,
         "sqsup",        0x2290,
         "sqsupe",       0x2292,
+        "sqsupset",         0x2290,
+        "sqsupseteq",       0x2292,
         "squ",          0x25A1,
         "square",       0x25A1,
+        "Square",           0x25A1,
+        "SquareIntersection", 0x2293,
+        "SquareSubset",     0x228F,
+        "SquareSubsetEqual", 0x2291,
+        "SquareSuperset",   0x2290,
+        "SquareSupersetEqual", 0x2292,
+        "SquareUnion",      0x2294,
+        "squarf",           0x25AA,
         "squf",         0x25AA,
+        "srarr",            0x2192,
+        "Sscr",             0x1D4AE,
+        "sscr",             0x1D4C8,
         "ssetmn",       0x2216,
         "ssmile",       0x2323,
         "sstarf",       0x22C6,
+        "Star",             0x22C6,
         "star",         0x2606,
         "starf",        0x2605,
+        "straightepsilon",  0x03F5,
+        "straightphi",      0x03D5,
+        "strns",            0x00AF,
         "sub",          0x2282,
         "Sub",          0x22D0,
+        "subdot",           0x2ABD,
         "sube",         0x2286,
-        "subE",         0x2286,
+        "subE",             0x2AC5,
+        "subedot",          0x2AC3,
+        "submult",          0x2AC1,
         "subne",        0x228A,
-        "subnE",        0x228A,
+        "subnE",            0x2ACB,
+        "subplus",          0x2ABF,
+        "subrarr",          0x2979,
+        "subset",           0x2282,
+        "Subset",           0x22D0,
+        "subseteq",         0x2286,
+        "subseteqq",        0x2AC5,
+        "SubsetEqual",      0x2286,
+        "subsetneq",        0x228A,
+        "subsetneqq",       0x2ACB,
+        "subsim",           0x2AC7,
+        "subsub",           0x2AD5,
+        "subsup",           0x2AD3,
+        "succ",             0x227B,
+        "succapprox",       0x2AB8,
+        "succcurlyeq",      0x227D,
+        "Succeeds",         0x227B,
+        "SucceedsEqual",    0x2AB0,
+        "SucceedsSlantEqual", 0x227D,
+        "SucceedsTilde",    0x227F,
+        "succeq",           0x2AB0,
+        "succnapprox",      0x2ABA,
+        "succneqq",         0x2AB6,
+        "succnsim",         0x22E9,
+        "succsim",          0x227F,
+        "SuchThat",         0x220B,
         "sum",          0x2211,
+        "Sum",              0x2211,
         "sung",         0x266A,
         "sup",          0x2283,
         "Sup",          0x22D1,
         "sup1",         0x00B9,
         "sup2",         0x00B2,
         "sup3",         0x00B3,
+        "supdot",           0x2ABE,
+        "supdsub",          0x2AD8,
         "supe",         0x2287,
-        "supE",         0x2287,
+        "supE",             0x2AC6,
+        "supedot",          0x2AC4,
+        "Superset",         0x2283,
+        "SupersetEqual",    0x2287,
+        "suphsol",          0x27C9,
+        "suphsub",          0x2AD7,
+        "suplarr",          0x297B,
+        "supmult",          0x2AC2,
         "supne",        0x228B,
-        "supnE",        0x228B,
+        "supnE",            0x2ACC,
+        "supplus",          0x2AC0,
+        "supset",           0x2283,
+        "Supset",           0x22D1,
+        "supseteq",         0x2287,
+        "supseteqq",        0x2AC6,
+        "supsetneq",        0x228B,
+        "supsetneqq",       0x2ACC,
+        "supsim",           0x2AC8,
+        "supsub",           0x2AD4,
+        "supsup",           0x2AD6,
+        "swarhk",           0x2926,
+        "swarr",            0x2199,
+        "swArr",            0x21D9,
+        "swarrow",          0x2199,
+        "swnwar",           0x292A,
         "szlig",        0x00DF,
         NULL,           0
 };
 
 static NameId namesT[]={
+        "Tab",              0x0009,
         "target",       0x2316,
         "Tau",          0x03A4,
         "tau",          0x03C4,
+        "tbrk",             0x23B4,
         "Tcaron",       0x0164,
         "tcaron",       0x0165,
         "Tcedil",       0x0162,
@@ -928,28 +2028,66 @@
         "tcy",          0x0442,
         "tdot",         0x20DB,
         "telrec",       0x2315,
+        "Tfr",              0x1D517,
+        "tfr",              0x1D531,
         "Tgr",          0x03A4,
         "tgr",          0x03C4,
         "there4",       0x2234,
+        "therefore",        0x2234,
+        "Therefore",        0x2234,
         "Theta",        0x0398,
         "theta",        0x03B8,
-        "thetas",       0x03B8,
         "thetasym",     0x03D1,
         "thetav",       0x03D1,
         "THgr",         0x0398,
         "thgr",         0x03B8,
+        "thickapprox",      0x2248,
+        "thicksim",         0x223C,
+//      "ThickSpace",       0x0205F;0x200A,
         "thinsp",       0x2009,
+        "ThinSpace",        0x2009,
         "thkap",        0x2248,
         "thksim",       0x223C,
         "THORN",        0x00DE,
         "thorn",        0x00FE,
         "tilde",        0x02DC,
+        "Tilde",            0x223C,
+        "TildeEqual",       0x2243,
+        "TildeFullEqual",   0x2245,
+        "TildeTilde",       0x2248,
         "times",        0x00D7,
         "timesb",       0x22A0,
+        "timesbar",         0x2A31,
+        "timesd",           0x2A30,
+        "tint",             0x222D,
+        "toea",             0x2928,
         "top",          0x22A4,
+        "topbot",           0x2336,
+        "topcir",           0x2AF1,
+        "Topf",             0x1D54B,
+        "topf",             0x1D565,
+        "topfork",          0x2ADA,
+        "tosa",             0x2929,
         "tprime",       0x2034,
         "trade",        0x2122,
+        "TRADE",            0x2122,
+        "triangle",         0x25B5,
+        "triangledown",     0x25BF,
+        "triangleleft",     0x25C3,
+        "trianglelefteq",   0x22B4,
+        "triangleq",        0x225C,
+        "triangleright",    0x25B9,
+        "trianglerighteq",  0x22B5,
+        "tridot",           0x25EC,
         "trie",         0x225C,
+        "triminus",         0x2A3A,
+        "TripleDot",        0x20DB,
+        "triplus",          0x2A39,
+        "trisb",            0x29CD,
+        "tritime",          0x2A3B,
+        "trpezium",         0x23E2,
+        "Tscr",             0x1D4AF,
+        "tscr",             0x1D4C9,
         "TScy",         0x0426,
         "tscy",         0x0446,
         "TSHcy",        0x040B,
@@ -957,6 +2095,8 @@
         "Tstrok",       0x0166,
         "tstrok",       0x0167,
         "twixt",        0x226C,
+        "twoheadleftarrow", 0x219E,
+        "twoheadrightarrow", 0x21A0,
         NULL,           0
 };
 
@@ -966,8 +2106,9 @@
         "Uacute",       0x00DA,
         "uacute",       0x00FA,
         "uarr",         0x2191,
+        "Uarr",             0x219F,
         "uArr",         0x21D1,
-        "uarr2",        0x21C8,
+        "Uarrocir",         0x2949,
         "Ubrcy",        0x040E,
         "ubrcy",        0x045E,
         "Ubreve",       0x016C,
@@ -976,89 +2117,197 @@
         "ucirc",        0x00FB,
         "Ucy",          0x0423,
         "ucy",          0x0443,
+        "udarr",            0x21C5,
         "Udblac",       0x0170,
         "udblac",       0x0171,
+        "udhar",            0x296E,
         "udiagr",       0x03B0,
         "Udigr",        0x03AB,
         "udigr",        0x03CB,
+        "ufisht",           0x297E,
+        "Ufr",              0x1D518,
+        "ufr",              0x1D532,
         "Ugr",          0x03A5,
         "ugr",          0x03C5,
         "Ugrave",       0x00D9,
         "ugrave",       0x00F9,
+        "uHar",             0x2963,
         "uharl",        0x21BF,
         "uharr",        0x21BE,
         "uhblk",        0x2580,
         "ulcorn",       0x231C,
+        "ulcorner",         0x231C,
         "ulcrop",       0x230F,
+        "ultri",            0x25F8,
         "Umacr",        0x016A,
         "umacr",        0x016B,
         "uml",          0x00A8,
+        "UnderBar",         0x005F,
+        "UnderBrace",       0x23DF,
+        "UnderBracket",     0x23B5,
+        "UnderParenthesis", 0x23DD,
+        "Union",            0x22C3,
+        "UnionPlus",        0x228E,
         "Uogon",        0x0172,
         "uogon",        0x0173,
+        "Uopf",             0x1D54C,
+        "uopf",             0x1D566,
+        "uparrow",          0x2191,
+        "UpArrow",          0x2191,
+        "Uparrow",          0x21D1,
+        "UpArrowBar",       0x2912,
+        "UpArrowDownArrow", 0x21C5,
+        "updownarrow",      0x2195,
+        "UpDownArrow",      0x2195,
+        "Updownarrow",      0x21D5,
+        "UpEquilibrium",    0x296E,
+        "upharpoonleft",    0x21BF,
+        "upharpoonright",   0x21BE,
         "uplus",        0x228E,
-        "Upsi",         0x03A5,
+        "UpperLeftArrow",   0x2196,
+        "UpperRightArrow",  0x2197,
         "upsi",         0x03C5,
+        "Upsi",             0x03D2,
         "upsih",        0x03D2,
         "Upsilon",      0x03A5,
         "upsilon",      0x03C5,
+        "UpTee",            0x22A5,
+        "UpTeeArrow",       0x21A5,
+        "upuparrows",       0x21C8,
         "urcorn",       0x231D,
+        "urcorner",         0x231D,
         "urcrop",       0x230E,
         "Uring",        0x016E,
         "uring",        0x016F,
+        "urtri",            0x25F9,
+        "Uscr",             0x1D4B0,
+        "uscr",             0x1D4CA,
+        "utdot",            0x22F0,
         "Utilde",       0x0168,
         "utilde",       0x0169,
         "utri",         0x25B5,
         "utrif",        0x25B4,
+        "uuarr",            0x21C8,
         "Uuml",         0x00DC,
         "uuml",         0x00FC,
+        "uwangle",          0x29A7,
         NULL,           0
 };
 
 static NameId namesV[]={
+        "vangrt",           0x299C,
+        "varepsilon",       0x03F5,
+        "varkappa",         0x03F0,
+        "varnothing",       0x2205,
+        "varphi",           0x03D5,
+        "varpi",            0x03D6,
+        "varpropto",        0x221D,
         "varr",         0x2195,
         "vArr",         0x21D5,
+        "varrho",           0x03F1,
+        "varsigma",         0x03C2,
+//      "varsubsetneq",     0x0228A;0xFE00,
+//      "varsubsetneqq",    0x02ACB;0xFE00,
+//      "varsupsetneq",     0x0228B;0xFE00,
+//      "varsupsetneqq",    0x02ACC;0xFE00,
+        "vartheta",         0x03D1,
+        "vartriangleleft",  0x22B2,
+        "vartriangleright", 0x22B3,
+        "vBar",             0x2AE8,
+        "Vbar",             0x2AEB,
+        "vBarv",            0x2AE9,
         "Vcy",          0x0412,
         "vcy",          0x0432,
         "vdash",        0x22A2,
         "vDash",        0x22A8,
         "Vdash",        0x22A9,
+        "VDash",            0x22AB,
+        "Vdashl",           0x2AE6,
+        "vee",              0x2228,
+        "Vee",              0x22C1,
         "veebar",       0x22BB,
+        "veeeq",            0x225A,
         "vellip",       0x22EE,
         "verbar",       0x007C,
         "Verbar",       0x2016,
+        "vert",             0x007C,
+        "Vert",             0x2016,
+        "VerticalBar",      0x2223,
+        "VerticalLine",     0x007C,
+        "VerticalSeparator", 0x2758,
+        "VerticalTilde",    0x2240,
+        "VeryThinSpace",    0x200A,
+        "Vfr",              0x1D519,
+        "vfr",              0x1D533,
         "vltri",        0x22B2,
-        "vprime",       0x2032,
+//      "vnsub",            0x02282;0x20D2,
+//      "vnsup",            0x02283;0x20D2,
+        "Vopf",             0x1D54D,
+        "vopf",             0x1D567,
         "vprop",        0x221D,
         "vrtri",        0x22B3,
-        "vsubne",       0x228A,
-        "vsubnE",       0xE2B8,
-        "vsupne",       0x228B,
-        "vsupnE",       0x228B,
+        "Vscr",             0x1D4B1,
+        "vscr",             0x1D4CB,
+//      "vsubne",           0x0228A;0xFE00,
+//      "vsubnE",           0x02ACB;0xFE00,
+//      "vsupne",           0x0228B;0xFE00,
+//      "vsupnE",           0x02ACC;0xFE00,
         "Vvdash",       0x22AA,
+        "vzigzag",          0x299A,
         NULL,           0
 };
 
 static NameId namesW[]={
         "Wcirc",        0x0174,
         "wcirc",        0x0175,
+        "wedbar",           0x2A5F,
+        "wedge",            0x2227,
+        "Wedge",            0x22C0,
         "wedgeq",       0x2259,
         "weierp",       0x2118,
+        "Wfr",              0x1D51A,
+        "wfr",              0x1D534,
+        "Wopf",             0x1D54E,
+        "wopf",             0x1D568,
+        "wp",               0x2118,
+        "wr",               0x2240,
         "wreath",       0x2240,
+        "Wscr",             0x1D4B2,
+        "wscr",             0x1D4CC,
         NULL,           0
 };
 
 static NameId namesX[]={
-        "xcirc",        0x25CB,
+        "xcap",             0x22C2,
+        "xcirc",            0x25EF,
+        "xcup",             0x22C3,
         "xdtri",        0x25BD,
+        "Xfr",              0x1D51B,
+        "xfr",              0x1D535,
         "Xgr",          0x039E,
         "xgr",          0x03BE,
-        "xharr",        0x2194,
-        "xhArr",        0x2194,
+        "xharr",            0x27F7,
+        "xhArr",            0x27FA,
         "Xi",           0x039E,
         "xi",           0x03BE,
-        "xlArr",        0x21D0,
-        "xrArr",        0x21D2,
+        "xlarr",            0x27F5,
+        "xlArr",            0x27F8,
+        "xmap",             0x27FC,
+        "xnis",             0x22FB,
+        "xodot",            0x2A00,
+        "Xopf",             0x1D54F,
+        "xopf",             0x1D569,
+        "xoplus",           0x2A01,
+        "xotime",           0x2A02,
+        "xrarr",            0x27F6,
+        "xrArr",            0x27F9,
+        "Xscr",             0x1D4B3,
+        "xscr",             0x1D4CD,
+        "xsqcup",           0x2A06,
+        "xuplus",           0x2A04,
         "xutri",        0x25B3,
+        "xvee",             0x22C1,
+        "xwedge",           0x22C0,
         NULL,           0
 };
 
@@ -1072,8 +2321,14 @@
         "Ycy",          0x042B,
         "ycy",          0x044B,
         "yen",          0x00A5,
+        "Yfr",              0x1D51C,
+        "yfr",              0x1D536,
         "YIcy",         0x0407,
         "yicy",         0x0457,
+        "Yopf",             0x1D550,
+        "yopf",             0x1D56A,
+        "Yscr",             0x1D4B4,
+        "yscr",             0x1D4CE,
         "YUcy",         0x042E,
         "yucy",         0x044E,
         "yuml",         0x00FF,
@@ -1090,12 +2345,21 @@
         "zcy",          0x0437,
         "Zdot",         0x017B,
         "zdot",         0x017C,
+        "zeetrf",           0x2128,
+        "ZeroWidthSpace",   0x200B,
         "Zeta",         0x0396,
         "zeta",         0x03B6,
+        "Zfr",              0x2128,
+        "zfr",              0x1D537,
         "Zgr",          0x0396,
         "zgr",          0x03B6,
         "ZHcy",         0x0416,
         "zhcy",         0x0436,
+        "zigrarr",          0x21DD,
+        "Zopf",             0x2124,
+        "zopf",             0x1D56B,
+        "Zscr",             0x1D4B5,
+        "zscr",             0x1D4CF,
         "zwj",          0x200D,
         "zwnj",         0x200C,
         NULL, 0
