Index: trunk/translators/BibTeX.js
===================================================================
--- trunk/translators/BibTeX.js	(revision 3496)
+++ trunk/translators/BibTeX.js	(working copy)
@@ -96,13 +96,14 @@
 };
 
 var bibtex2zoteroTypeMap = {
-	"book":"book", // or booklet,  proceedings
+	"book":"book", // or booklet, proceedings
 	"inbook":"bookSection",
 	"incollection":"bookSection",
 	"article":"journalArticle", // or magazineArticle or newspaperArticle
 	"phdthesis":"thesis",
 	"unpublished":"manuscript",
 	"inproceedings":"conferencePaper", // check for conference also
+  "conference":"conferencePaper",
 	"techreport":"report",
 	"booklet":"book",
 	"incollection":"bookSection",
@@ -206,7 +207,7 @@
     "\u2012":"-", // FIGURE DASH
     "\u2013":"{\\textendash}", // EN DASH
     "\u2014":"{\\textemdash}", // EM DASH
-    "\u2015":"--", // HORIZONTAL BAR
+    "\u2015":"{\\textemdash}", // HORIZONTAL BAR or QUOTATION DASH (not in LaTeX -- use EM DASH)
     "\u2016":"{\\textbardbl}", // DOUBLE VERTICAL LINE
     "\u2017":"{\\textunderscore}", // DOUBLE LOW LINE
     "\u2018":"{\\textquoteleft}", // LEFT SINGLE QUOTATION MARK
@@ -1045,468 +1046,470 @@
 
 /* unfortunately the mapping isn't reversible - hence this second table - sigh! */
 var reversemappingTable = {
-    "\u00A0":"~", // NO-BREAK SPACE
-    "\u00A1":"{\\textexclamdown}", // INVERTED EXCLAMATION MARK
-    "\u00A2":"{\\textcent}", // CENT SIGN
-    "\u00A3":"{\\textsterling}", // POUND SIGN
-    "\u00A5":"{\\textyen}", // YEN SIGN
-    "\u00A6":"{\\textbrokenbar}", // BROKEN BAR
-    "\u00A7":"{\\textsection}", // SECTION SIGN
-    "\u00A8":"{\\textasciidieresis}", // DIAERESIS
-    "\u00A9":"{\\textcopyright}", // COPYRIGHT SIGN
-    "\u00AA":"{\\textordfeminine}", // FEMININE ORDINAL INDICATOR
-    "\u00AB":"{\\guillemotleft}", // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-    "\u00AC":"{\\textlnot}", // NOT SIGN
-    "\u00AE":"{\\textregistered}", // REGISTERED SIGN
-    "\u00AF":"{\\textasciimacron}", // MACRON
-    "\u00B0":"{\\textdegree}", // DEGREE SIGN
-    "\u00B1":"{\\textpm}", // PLUS-MINUS SIGN
-    "\u00B2":"{\\texttwosuperior}", // SUPERSCRIPT TWO
-    "\u00B3":"{\\textthreesuperior}", // SUPERSCRIPT THREE
-    "\u00B4":"{\\textasciiacute}", // ACUTE ACCENT
-    "\u00B5":"{\\textmu}", // MICRO SIGN
-    "\u00B6":"{\\textparagraph}", // PILCROW SIGN
-    "\u00B7":"{\\textperiodcentered}", // MIDDLE DOT
-    "\u00B8":"{\\c\\ }", // CEDILLA
-    "\u00B9":"{\\textonesuperior}", // SUPERSCRIPT ONE
-    "\u00BA":"{\\textordmasculine}", // MASCULINE ORDINAL INDICATOR
-    "\u00BB":"{\\guillemotright}", // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-    "\u00BC":"{\\textonequarter}", // VULGAR FRACTION ONE QUARTER
-    "\u00BD":"{\\textonehalf}", // VULGAR FRACTION ONE HALF
-    "\u00BE":"{\\textthreequarters}", // VULGAR FRACTION THREE QUARTERS
-    "\u00BF":"{\\textquestiondown}", // INVERTED QUESTION MARK
-    "\u00C6":"{\\AE}", // LATIN CAPITAL LETTER AE
-    "\u00D0":"{\\DH}", // LATIN CAPITAL LETTER ETH
-    "\u00D7":"{\\texttimes}", // MULTIPLICATION SIGN
-    "\u00DE":"{\\TH}", // LATIN CAPITAL LETTER THORN
-    "\u00DF":"{\\ss}", // LATIN SMALL LETTER SHARP S
-    "\u00E6":"{\\ae}", // LATIN SMALL LETTER AE
-    "\u00F0":"{\\dh}", // LATIN SMALL LETTER ETH
-    "\u00F7":"{\\textdiv}", // DIVISION SIGN
-    "\u00FE":"{\\th}", // LATIN SMALL LETTER THORN
-    "\u0131":"{\\i}", // LATIN SMALL LETTER DOTLESS I
-    "\u0149":"'n", // LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
-    "\u014A":"{\\NG}", // LATIN CAPITAL LETTER ENG
-    "\u014B":"{\\ng}", // LATIN SMALL LETTER ENG
-    "\u0152":"{\\OE}", // LATIN CAPITAL LIGATURE OE
-    "\u0153":"{\\oe}", // LATIN SMALL LIGATURE OE
-    "\u02C6":"{\\textasciicircum}", // MODIFIER LETTER CIRCUMFLEX ACCENT
-    "\u02DC":"\\~{}", // SMALL TILDE
-    "\u02DD":"{\\textacutedbl}", // DOUBLE ACUTE ACCENT
-    "\u2013":"{\\textendash}", // EN DASH
-    "\u2014":"{\\textemdash}", // EM DASH
-    "\u2015":"--", // HORIZONTAL BAR
-    "\u2016":"{\\textbardbl}", // DOUBLE VERTICAL LINE
-    "\u2017":"{\\textunderscore}", // DOUBLE LOW LINE
-    "\u2018":"{\\textquoteleft}", // LEFT SINGLE QUOTATION MARK
-    "\u2019":"{\\textquoteright}", // RIGHT SINGLE QUOTATION MARK
-    "\u201A":"{\\quotesinglbase}", // SINGLE LOW-9 QUOTATION MARK
-    "\u201C":"{\\textquotedblleft}", // LEFT DOUBLE QUOTATION MARK
-    "\u201D":"{\\textquotedblright}", // RIGHT DOUBLE QUOTATION MARK
-    "\u201E":"{\\quotedblbase}", // DOUBLE LOW-9 QUOTATION MARK
-    "\u201F":"{\\quotedblbase}", // DOUBLE HIGH-REVERSED-9 QUOTATION MARK
-    "\u2020":"{\\textdagger}", // DAGGER
-    "\u2021":"{\\textdaggerdbl}", // DOUBLE DAGGER
-    "\u2022":"{\\textbullet}", // BULLET
-    "\u2026":"{\\textellipsis}", // HORIZONTAL ELLIPSIS
-    "\u2030":"{\\textperthousand}", // PER MILLE SIGN
-    "\u2034":"'''", // TRIPLE PRIME
-    "\u201D":"''", // RIGHT DOUBLE QUOTATION MARK (could be a double prime)
-    "\u201C":"``", // LEFT DOUBLE QUOTATION MARK (could be a reversed double prime)
-    "\u2037":"```", // REVERSED TRIPLE PRIME
-    "\u2039":"{\\guilsinglleft}", // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-    "\u203A":"{\\guilsinglright}", // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-    "\u203C":"!!", // DOUBLE EXCLAMATION MARK
-    "\u2044":"{\\textfractionsolidus}", // FRACTION SLASH
-    "\u2048":"?!", // QUESTION EXCLAMATION MARK
-    "\u2049":"!?", // EXCLAMATION QUESTION MARK
-    "\u2070":"$^{0}$", // SUPERSCRIPT ZERO
-    "\u2074":"$^{4}$", // SUPERSCRIPT FOUR
-    "\u2075":"$^{5}$", // SUPERSCRIPT FIVE
-    "\u2076":"$^{6}$", // SUPERSCRIPT SIX
-    "\u2077":"$^{7}$", // SUPERSCRIPT SEVEN
-    "\u2078":"$^{8}$", // SUPERSCRIPT EIGHT
-    "\u2079":"$^{9}$", // SUPERSCRIPT NINE
-    "\u207A":"$^{+}$", // SUPERSCRIPT PLUS SIGN
-    "\u207B":"$^{-}$", // SUPERSCRIPT MINUS
-    "\u207C":"$^{=}$", // SUPERSCRIPT EQUALS SIGN
-    "\u207D":"$^{(}$", // SUPERSCRIPT LEFT PARENTHESIS
-    "\u207E":"$^{)}$", // SUPERSCRIPT RIGHT PARENTHESIS
-    "\u207F":"$^{n}$", // SUPERSCRIPT LATIN SMALL LETTER N
-    "\u2080":"$_{0}$", // SUBSCRIPT ZERO
-    "\u2081":"$_{1}$", // SUBSCRIPT ONE
-    "\u2082":"$_{2}$", // SUBSCRIPT TWO
-    "\u2083":"$_{3}$", // SUBSCRIPT THREE
-    "\u2084":"$_{4}$", // SUBSCRIPT FOUR
-    "\u2085":"$_{5}$", // SUBSCRIPT FIVE
-    "\u2086":"$_{6}$", // SUBSCRIPT SIX
-    "\u2087":"$_{7}$", // SUBSCRIPT SEVEN
-    "\u2088":"$_{8}$", // SUBSCRIPT EIGHT
-    "\u2089":"$_{9}$", // SUBSCRIPT NINE
-    "\u208A":"$_{+}$", // SUBSCRIPT PLUS SIGN
-    "\u208B":"$_{-}$", // SUBSCRIPT MINUS
-    "\u208C":"$_{=}$", // SUBSCRIPT EQUALS SIGN
-    "\u208D":"$_{(}$", // SUBSCRIPT LEFT PARENTHESIS
-    "\u208E":"$_{)}$", // SUBSCRIPT RIGHT PARENTHESIS
-    "\u20AC":"{\\texteuro}", // EURO SIGN
-    "\u2100":"a/c", // ACCOUNT OF
-    "\u2101":"a/s", // ADDRESSED TO THE SUBJECT
-    "\u2103":"{\\textcelsius}", // DEGREE CELSIUS
-    "\u2105":"c/o", // CARE OF
-    "\u2106":"c/u", // CADA UNA
-    "\u2116":"{\\textnumero}", // NUMERO SIGN
-    "\u2117":"{\\textcircledP}", // SOUND RECORDING COPYRIGHT
-    "\u2120":"{\\textservicemark}", // SERVICE MARK
-    "\u2121":"{TEL}", // TELEPHONE SIGN
-    "\u2122":"{\\texttrademark}", // TRADE MARK SIGN
-    "\u2126":"{\\textohm}", // OHM SIGN
-    "\u212E":"{\\textestimated}", // ESTIMATED SYMBOL
-    "\u2153":" 1/3", // VULGAR FRACTION ONE THIRD
-    "\u2154":" 2/3", // VULGAR FRACTION TWO THIRDS
-    "\u2155":" 1/5", // VULGAR FRACTION ONE FIFTH
-    "\u2156":" 2/5", // VULGAR FRACTION TWO FIFTHS
-    "\u2157":" 3/5", // VULGAR FRACTION THREE FIFTHS
-    "\u2158":" 4/5", // VULGAR FRACTION FOUR FIFTHS
-    "\u2159":" 1/6", // VULGAR FRACTION ONE SIXTH
-    "\u215A":" 5/6", // VULGAR FRACTION FIVE SIXTHS
-    "\u215B":" 1/8", // VULGAR FRACTION ONE EIGHTH
-    "\u215C":" 3/8", // VULGAR FRACTION THREE EIGHTHS
-    "\u215D":" 5/8", // VULGAR FRACTION FIVE EIGHTHS
-    "\u215E":" 7/8", // VULGAR FRACTION SEVEN EIGHTHS
-    "\u215F":" 1/", // FRACTION NUMERATOR ONE
-    "\u2190":"{\\textleftarrow}", // LEFTWARDS ARROW
-    "\u2191":"{\\textuparrow}", // UPWARDS ARROW
-    "\u2192":"{\\textrightarrow}", // RIGHTWARDS ARROW
-    "\u2193":"{\\textdownarrow}", // DOWNWARDS ARROW
-    "\u2194":"<->", // LEFT RIGHT ARROW
-    "\u21D0":"<=", // LEFTWARDS DOUBLE ARROW
-    "\u21D2":"=>", // RIGHTWARDS DOUBLE ARROW
-    "\u21D4":"<=>", // LEFT RIGHT DOUBLE ARROW
-    "\u221E":"$\\infty$", // INFINITY
-    "\u2225":"||", // PARALLEL TO
-    "\u223C":"\\~{}", // TILDE OPERATOR
-    "\u2260":"/=", // NOT EQUAL TO
-    "\u2264":"<=", // LESS-THAN OR EQUAL TO
-    "\u2265":">=", // GREATER-THAN OR EQUAL TO
-    "\u226A":"<<", // MUCH LESS-THAN
-    "\u226B":">>", // MUCH GREATER-THAN
-    "\u2295":"(+)", // CIRCLED PLUS
-    "\u2296":"(-)", // CIRCLED MINUS
-    "\u2297":"(x)", // CIRCLED TIMES
-    "\u2298":"(/)", // CIRCLED DIVISION SLASH
-    "\u22A2":"|-", // RIGHT TACK
-    "\u22A3":"-|", // LEFT TACK
-    "\u22A6":"|-", // ASSERTION
-    "\u22A7":"|=", // MODELS
-    "\u22A8":"|=", // TRUE
-    "\u22A9":"||-", // FORCES
-    "\u22D5":"$\\#$", // EQUAL AND PARALLEL TO
-    "\u22D8":"<<<", // VERY MUCH LESS-THAN
-    "\u22D9":">>>", // VERY MUCH GREATER-THAN
-    "\u22EF":"...", // MIDLINE HORIZONTAL ELLIPSIS
-    "\u2329":"{\\textlangle}", // LEFT-POINTING ANGLE BRACKET
-    "\u232A":"{\\textrangle}", // RIGHT-POINTING ANGLE BRACKET
-    "\u2423":"{\\textvisiblespace}", // OPEN BOX
-    "\u2425":"///", // SYMBOL FOR DELETE FORM TWO
-    "\u25E6":"{\\textopenbullet}", // WHITE BULLET
-    "\u2639":":-(", // WHITE FROWNING FACE
-    "\u263A":":-)", // WHITE SMILING FACE
-    "\u263B":"(-:", // BLACK SMILING FACE
-    "\u266F":"$\\#$", // MUSIC SHARP SIGN
-    "\u2701":"$\\%<$", // UPPER BLADE SCISSORS
-    "\u2702":"$\\%<$", // BLACK SCISSORS
-    "\u2703":"$\\%<$", // LOWER BLADE SCISSORS
-    "\u2704":"$\\%<$", // WHITE SCISSORS
+    "\\url"                           : "",       // strip 'url'
+    "\\href"                          : "",       // strip 'href'
+    "~"                               : "\u00A0", // NO-BREAK SPACE
+    "{\\textexclamdown}"              : "\u00A1", // INVERTED EXCLAMATION MARK
+    "{\\textcent}"                    : "\u00A2", // CENT SIGN
+    "{\\textsterling}"                : "\u00A3", // POUND SIGN
+    "{\\textyen}"                     : "\u00A5", // YEN SIGN
+    "{\\textbrokenbar}"               : "\u00A6", // BROKEN BAR
+    "{\\textsection}"                 : "\u00A7", // SECTION SIGN
+    "{\\textasciidieresis}"           : "\u00A8", // DIAERESIS
+    "{\\textcopyright}"               : "\u00A9", // COPYRIGHT SIGN
+    "{\\textordfeminine}"             : "\u00AA", // FEMININE ORDINAL INDICATOR
+    "{\\guillemotleft}"               : "\u00AB", // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+    "{\\textlnot}"                    : "\u00AC", // NOT SIGN
+    "{\\textregistered}"              : "\u00AE", // REGISTERED SIGN
+    "{\\textasciimacron}"             : "\u00AF", // MACRON
+    "{\\textdegree}"                  : "\u00B0", // DEGREE SIGN
+    "{\\textpm}"                      : "\u00B1", // PLUS-MINUS SIGN
+    "{\\texttwosuperior}"             : "\u00B2", // SUPERSCRIPT TWO
+    "{\\textthreesuperior}"           : "\u00B3", // SUPERSCRIPT THREE
+    "{\\textasciiacute}"              : "\u00B4", // ACUTE ACCENT
+    "{\\textmu}"                      : "\u00B5", // MICRO SIGN
+    "{\\textparagraph}"               : "\u00B6", // PILCROW SIGN
+    "{\\textperiodcentered}"          : "\u00B7", // MIDDLE DOT
+    "{\\c\\ }"                        : "\u00B8", // CEDILLA
+    "{\\textonesuperior}"             : "\u00B9", // SUPERSCRIPT ONE
+    "{\\textordmasculine}"            : "\u00BA", // MASCULINE ORDINAL INDICATOR
+    "{\\guillemotright}"              : "\u00BB", // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+    "{\\textonequarter}"              : "\u00BC", // VULGAR FRACTION ONE QUARTER
+    "{\\textonehalf}"                 : "\u00BD", // VULGAR FRACTION ONE HALF
+    "{\\textthreequarters}"           : "\u00BE", // VULGAR FRACTION THREE QUARTERS
+    "{\\textquestiondown}"            : "\u00BF", // INVERTED QUESTION MARK
+    "{\\AE}"                          : "\u00C6", // LATIN CAPITAL LETTER AE
+    "{\\DH}"                          : "\u00D0", // LATIN CAPITAL LETTER ETH
+    "{\\texttimes}"                   : "\u00D7", // MULTIPLICATION SIGN
+    "{\\TH}"                          : "\u00DE", // LATIN CAPITAL LETTER THORN
+    "{\\ss}"                          : "\u00DF", // LATIN SMALL LETTER SHARP S
+    "{\\ae}"                          : "\u00E6", // LATIN SMALL LETTER AE
+    "{\\dh}"                          : "\u00F0", // LATIN SMALL LETTER ETH
+    "{\\textdiv}"                     : "\u00F7", // DIVISION SIGN
+    "{\\th}"                          : "\u00FE", // LATIN SMALL LETTER THORN
+    "{\\i}"                           : "\u0131", // LATIN SMALL LETTER DOTLESS I
+    "'n"                              : "\u0149", // LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+    "{\\NG}"                          : "\u014A", // LATIN CAPITAL LETTER ENG
+    "{\\ng}"                          : "\u014B", // LATIN SMALL LETTER ENG
+    "{\\OE}"                          : "\u0152", // LATIN CAPITAL LIGATURE OE
+    "{\\oe}"                          : "\u0153", // LATIN SMALL LIGATURE OE
+    "{\\textasciicircum}"             : "\u02C6", // MODIFIER LETTER CIRCUMFLEX ACCENT
+    "\\~{}"                           : "\u02DC", // SMALL TILDE
+    "{\\textacutedbl}"                : "\u02DD", // DOUBLE ACUTE ACCENT
+    "{\\textendash}"                  : "\u2013", // EN DASH
+    "{\\textemdash}"                  : "\u2014", // EM DASH
+    "---"                             : "\u2014", // EM DASH
+    "--"                              : "\u2013", // EN DASH
+    "{\\textbardbl}"                  : "\u2016", // DOUBLE VERTICAL LINE
+    "{\\textunderscore}"              : "\u2017", // DOUBLE LOW LINE
+    "{\\textquoteleft}"               : "\u2018", // LEFT SINGLE QUOTATION MARK
+    "{\\textquoteright}"              : "\u2019", // RIGHT SINGLE QUOTATION MARK
+    "{\\quotesinglbase}"              : "\u201A", // SINGLE LOW-9 QUOTATION MARK
+    "{\\textquotedblleft}"            : "\u201C", // LEFT DOUBLE QUOTATION MARK
+    "{\\textquotedblright}"           : "\u201D", // RIGHT DOUBLE QUOTATION MARK
+    "{\\quotedblbase}"                : "\u201E", // DOUBLE LOW-9 QUOTATION MARK
+    "{\\quotedblbase}"                : "\u201F", // DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+    "{\\textdagger}"                  : "\u2020", // DAGGER
+    "{\\textdaggerdbl}"               : "\u2021", // DOUBLE DAGGER
+    "{\\textbullet}"                  : "\u2022", // BULLET
+    "{\\textellipsis}"                : "\u2026", // HORIZONTAL ELLIPSIS
+    "{\\textperthousand}"             : "\u2030", // PER MILLE SIGN
+    "'''"                             : "\u2034", // TRIPLE PRIME
+    "''"                              : "\u201D", // RIGHT DOUBLE QUOTATION MARK (could be a double prime)
+    "``"                              : "\u201C", // LEFT DOUBLE QUOTATION MARK (could be a reversed double prime)
+    "```"                             : "\u2037", // REVERSED TRIPLE PRIME
+    "{\\guilsinglleft}"               : "\u2039", // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+    "{\\guilsinglright}"              : "\u203A", // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+    "!!"                              : "\u203C", // DOUBLE EXCLAMATION MARK
+    "{\\textfractionsolidus}"         : "\u2044", // FRACTION SLASH
+    "?!"                              : "\u2048", // QUESTION EXCLAMATION MARK
+    "!?"                              : "\u2049", // EXCLAMATION QUESTION MARK
+    "$^{0}$"                          : "\u2070", // SUPERSCRIPT ZERO
+    "$^{4}$"                          : "\u2074", // SUPERSCRIPT FOUR
+    "$^{5}$"                          : "\u2075", // SUPERSCRIPT FIVE
+    "$^{6}$"                          : "\u2076", // SUPERSCRIPT SIX
+    "$^{7}$"                          : "\u2077", // SUPERSCRIPT SEVEN
+    "$^{8}$"                          : "\u2078", // SUPERSCRIPT EIGHT
+    "$^{9}$"                          : "\u2079", // SUPERSCRIPT NINE
+    "$^{+}$"                          : "\u207A", // SUPERSCRIPT PLUS SIGN
+    "$^{-}$"                          : "\u207B", // SUPERSCRIPT MINUS
+    "$^{=}$"                          : "\u207C", // SUPERSCRIPT EQUALS SIGN
+    "$^{(}$"                          : "\u207D", // SUPERSCRIPT LEFT PARENTHESIS
+    "$^{)}$"                          : "\u207E", // SUPERSCRIPT RIGHT PARENTHESIS
+    "$^{n}$"                          : "\u207F", // SUPERSCRIPT LATIN SMALL LETTER N
+    "$_{0}$"                          : "\u2080", // SUBSCRIPT ZERO
+    "$_{1}$"                          : "\u2081", // SUBSCRIPT ONE
+    "$_{2}$"                          : "\u2082", // SUBSCRIPT TWO
+    "$_{3}$"                          : "\u2083", // SUBSCRIPT THREE
+    "$_{4}$"                          : "\u2084", // SUBSCRIPT FOUR
+    "$_{5}$"                          : "\u2085", // SUBSCRIPT FIVE
+    "$_{6}$"                          : "\u2086", // SUBSCRIPT SIX
+    "$_{7}$"                          : "\u2087", // SUBSCRIPT SEVEN
+    "$_{8}$"                          : "\u2088", // SUBSCRIPT EIGHT
+    "$_{9}$"                          : "\u2089", // SUBSCRIPT NINE
+    "$_{+}$"                          : "\u208A", // SUBSCRIPT PLUS SIGN
+    "$_{-}$"                          : "\u208B", // SUBSCRIPT MINUS
+    "$_{=}$"                          : "\u208C", // SUBSCRIPT EQUALS SIGN
+    "$_{(}$"                          : "\u208D", // SUBSCRIPT LEFT PARENTHESIS
+    "$_{)}$"                          : "\u208E", // SUBSCRIPT RIGHT PARENTHESIS
+    "{\\texteuro}"                    : "\u20AC", // EURO SIGN
+    "a/c"                             : "\u2100", // ACCOUNT OF
+    "a/s"                             : "\u2101", // ADDRESSED TO THE SUBJECT
+    "{\\textcelsius}"                 : "\u2103", // DEGREE CELSIUS
+    "c/o"                             : "\u2105", // CARE OF
+    "c/u"                             : "\u2106", // CADA UNA
+    "{\\textnumero}"                  : "\u2116", // NUMERO SIGN
+    "{\\textcircledP}"                : "\u2117", // SOUND RECORDING COPYRIGHT
+    "{\\textservicemark}"             : "\u2120", // SERVICE MARK
+    "{TEL}"                           : "\u2121", // TELEPHONE SIGN
+    "{\\texttrademark}"               : "\u2122", // TRADE MARK SIGN
+    "{\\textohm}"                     : "\u2126", // OHM SIGN
+    "{\\textestimated}"               : "\u212E", // ESTIMATED SYMBOL
+    " 1/3"                            : "\u2153", // VULGAR FRACTION ONE THIRD
+    " 2/3"                            : "\u2154", // VULGAR FRACTION TWO THIRDS
+    " 1/5"                            : "\u2155", // VULGAR FRACTION ONE FIFTH
+    " 2/5"                            : "\u2156", // VULGAR FRACTION TWO FIFTHS
+    " 3/5"                            : "\u2157", // VULGAR FRACTION THREE FIFTHS
+    " 4/5"                            : "\u2158", // VULGAR FRACTION FOUR FIFTHS
+    " 1/6"                            : "\u2159", // VULGAR FRACTION ONE SIXTH
+    " 5/6"                            : "\u215A", // VULGAR FRACTION FIVE SIXTHS
+    " 1/8"                            : "\u215B", // VULGAR FRACTION ONE EIGHTH
+    " 3/8"                            : "\u215C", // VULGAR FRACTION THREE EIGHTHS
+    " 5/8"                            : "\u215D", // VULGAR FRACTION FIVE EIGHTHS
+    " 7/8"                            : "\u215E", // VULGAR FRACTION SEVEN EIGHTHS
+    " 1/"                             : "\u215F", // FRACTION NUMERATOR ONE
+    "{\\textleftarrow}"               : "\u2190", // LEFTWARDS ARROW
+    "{\\textuparrow}"                 : "\u2191", // UPWARDS ARROW
+    "{\\textrightarrow}"              : "\u2192", // RIGHTWARDS ARROW
+    "{\\textdownarrow}"               : "\u2193", // DOWNWARDS ARROW
+    "<->"                             : "\u2194", // LEFT RIGHT ARROW
+    "<="                              : "\u21D0", // LEFTWARDS DOUBLE ARROW
+    "=>"                              : "\u21D2", // RIGHTWARDS DOUBLE ARROW
+    "<=>"                             : "\u21D4", // LEFT RIGHT DOUBLE ARROW
+    "$\\infty$"                       : "\u221E", // INFINITY
+    "||"                              : "\u2225", // PARALLEL TO
+    "\\~{}"                           : "\u223C", // TILDE OPERATOR
+    "/="                              : "\u2260", // NOT EQUAL TO
+    "<="                              : "\u2264", // LESS-THAN OR EQUAL TO
+    ">="                              : "\u2265", // GREATER-THAN OR EQUAL TO
+    "<<"                              : "\u226A", // MUCH LESS-THAN
+    ">>"                              : "\u226B", // MUCH GREATER-THAN
+    "(+)"                             : "\u2295", // CIRCLED PLUS
+    "(-)"                             : "\u2296", // CIRCLED MINUS
+    "(x)"                             : "\u2297", // CIRCLED TIMES
+    "(/)"                             : "\u2298", // CIRCLED DIVISION SLASH
+    "|-"                              : "\u22A2", // RIGHT TACK
+    "-|"                              : "\u22A3", // LEFT TACK
+    "|-"                              : "\u22A6", // ASSERTION
+    "|="                              : "\u22A7", // MODELS
+    "|="                              : "\u22A8", // TRUE
+    "||-"                             : "\u22A9", // FORCES
+    "$\\#$"                           : "\u22D5", // EQUAL AND PARALLEL TO
+    "<<<"                             : "\u22D8", // VERY MUCH LESS-THAN
+    ">>>"                             : "\u22D9", // VERY MUCH GREATER-THAN
+    "..."                             : "\u22EF", // MIDLINE HORIZONTAL ELLIPSIS
+    "{\\textlangle}"                  : "\u2329", // LEFT-POINTING ANGLE BRACKET
+    "{\\textrangle}"                  : "\u232A", // RIGHT-POINTING ANGLE BRACKET
+    "{\\textvisiblespace}"            : "\u2423", // OPEN BOX
+    "///"                             : "\u2425", // SYMBOL FOR DELETE FORM TWO
+    "{\\textopenbullet}"              : "\u25E6", // WHITE BULLET
+    ":-("                             : "\u2639", // WHITE FROWNING FACE
+    ":-)"                             : "\u263A", // WHITE SMILING FACE
+    "(-: "                            : "\u263B", // BLACK SMILING FACE
+    "$\\#$"                           : "\u266F", // MUSIC SHARP SIGN
+    "$\\%<$"                          : "\u2701", // UPPER BLADE SCISSORS
+    "$\\%<$"                          : "\u2702", // BLACK SCISSORS
+    "$\\%<$"                          : "\u2703", // LOWER BLADE SCISSORS
+    "$\\%<$"                          : "\u2704", // WHITE SCISSORS
 /* Derived accented characters */
-    "\u00C0":"\\`{A}", // LATIN CAPITAL LETTER A WITH GRAVE
-    "\u00C1":"\\'{A}", // LATIN CAPITAL LETTER A WITH ACUTE
-    "\u00C2":"\\^{A}", // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-    "\u00C3":"\\~{A}", // LATIN CAPITAL LETTER A WITH TILDE
-    "\u00C4":"\\\"{A}", // LATIN CAPITAL LETTER A WITH DIAERESIS
-    "\u00C7":"\\c{C}", // LATIN CAPITAL LETTER C WITH CEDILLA
-    "\u00C8":"\\`{E}", // LATIN CAPITAL LETTER E WITH GRAVE
-    "\u00C9":"\\'{E}", // LATIN CAPITAL LETTER E WITH ACUTE
-    "\u00CA":"\\^{E}", // LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-    "\u00CB":"\\\"{E}", // LATIN CAPITAL LETTER E WITH DIAERESIS
-    "\u00CC":"\\`{I}", // LATIN CAPITAL LETTER I WITH GRAVE
-    "\u00CD":"\\'{I}", // LATIN CAPITAL LETTER I WITH ACUTE
-    "\u00CE":"\\^{I}", // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-    "\u00CF":"\\\"{I}", // LATIN CAPITAL LETTER I WITH DIAERESIS
-    "\u00D1":"\\~{N}", // LATIN CAPITAL LETTER N WITH TILDE
-    "\u00D2":"\\`{O}", // LATIN CAPITAL LETTER O WITH GRAVE
-    "\u00D3":"\\'{O}", // LATIN CAPITAL LETTER O WITH ACUTE
-    "\u00D4":"\\^{O}", // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-    "\u00D5":"\\~{O}", // LATIN CAPITAL LETTER O WITH TILDE
-    "\u00D6":"\\\"{O}", // LATIN CAPITAL LETTER O WITH DIAERESIS
-    "\u00D9":"\\`{U}", // LATIN CAPITAL LETTER U WITH GRAVE
-    "\u00DA":"\\'{U}", // LATIN CAPITAL LETTER U WITH ACUTE
-    "\u00DB":"\\^{U}", // LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-    "\u00DC":"\\\"{U}", // LATIN CAPITAL LETTER U WITH DIAERESIS
-    "\u00DD":"\\'{Y}", // LATIN CAPITAL LETTER Y WITH ACUTE
-    "\u00E0":"\\`{a}", // LATIN SMALL LETTER A WITH GRAVE
-    "\u00E1":"\\'{a}", // LATIN SMALL LETTER A WITH ACUTE
-    "\u00E2":"\\^{a}", // LATIN SMALL LETTER A WITH CIRCUMFLEX
-    "\u00E3":"\\~{a}", // LATIN SMALL LETTER A WITH TILDE
-    "\u00E4":"\\\"{a}", // LATIN SMALL LETTER A WITH DIAERESIS
-    "\u00E7":"\\c{c}", // LATIN SMALL LETTER C WITH CEDILLA
-    "\u00E8":"\\`{e}", // LATIN SMALL LETTER E WITH GRAVE
-    "\u00E9":"\\'{e}", // LATIN SMALL LETTER E WITH ACUTE
-    "\u00EA":"\\^{e}", // LATIN SMALL LETTER E WITH CIRCUMFLEX
-    "\u00EB":"\\\"{e}", // LATIN SMALL LETTER E WITH DIAERESIS
-    "\u00EC":"\\`{i}", // LATIN SMALL LETTER I WITH GRAVE
-    "\u00ED":"\\'{i}", // LATIN SMALL LETTER I WITH ACUTE
-    "\u00EE":"\\^{i}", // LATIN SMALL LETTER I WITH CIRCUMFLEX
-    "\u00EF":"\\\"{i}", // LATIN SMALL LETTER I WITH DIAERESIS
-    "\u00F1":"\\~{n}", // LATIN SMALL LETTER N WITH TILDE
-    "\u00F2":"\\`{o}", // LATIN SMALL LETTER O WITH GRAVE
-    "\u00F3":"\\'{o}", // LATIN SMALL LETTER O WITH ACUTE
-    "\u00F4":"\\^{o}", // LATIN SMALL LETTER O WITH CIRCUMFLEX
-    "\u00F5":"\\~{o}", // LATIN SMALL LETTER O WITH TILDE
-    "\u00F6":"\\\"{o}", // LATIN SMALL LETTER O WITH DIAERESIS
-    "\u00F9":"\\`{u}", // LATIN SMALL LETTER U WITH GRAVE
-    "\u00FA":"\\'{u}", // LATIN SMALL LETTER U WITH ACUTE
-    "\u00FB":"\\^{u}", // LATIN SMALL LETTER U WITH CIRCUMFLEX
-    "\u00FC":"\\\"{u}", // LATIN SMALL LETTER U WITH DIAERESIS
-    "\u00FD":"\\'{y}", // LATIN SMALL LETTER Y WITH ACUTE
-    "\u00FF":"\\\"{y}", // LATIN SMALL LETTER Y WITH DIAERESIS
-    "\u0100":"\\={A}", // LATIN CAPITAL LETTER A WITH MACRON
-    "\u0101":"\\={a}", // LATIN SMALL LETTER A WITH MACRON
-    "\u0102":"\\u{A}", // LATIN CAPITAL LETTER A WITH BREVE
-    "\u0103":"\\u{a}", // LATIN SMALL LETTER A WITH BREVE
-    "\u0104":"\\k{A}", // LATIN CAPITAL LETTER A WITH OGONEK
-    "\u0105":"\\k{a}", // LATIN SMALL LETTER A WITH OGONEK
-    "\u0106":"\\'{C}", // LATIN CAPITAL LETTER C WITH ACUTE
-    "\u0107":"\\'{c}", // LATIN SMALL LETTER C WITH ACUTE
-    "\u0108":"\\^{C}", // LATIN CAPITAL LETTER C WITH CIRCUMFLEX
-    "\u0109":"\\^{c}", // LATIN SMALL LETTER C WITH CIRCUMFLEX
-    "\u010A":"\\.{C}", // LATIN CAPITAL LETTER C WITH DOT ABOVE
-    "\u010B":"\\.{c}", // LATIN SMALL LETTER C WITH DOT ABOVE
-    "\u010C":"\\v{C}", // LATIN CAPITAL LETTER C WITH CARON
-    "\u010D":"\\v{c}", // LATIN SMALL LETTER C WITH CARON
-    "\u010E":"\\v{D}", // LATIN CAPITAL LETTER D WITH CARON
-    "\u010F":"\\v{d}", // LATIN SMALL LETTER D WITH CARON
-    "\u0112":"\\={E}", // LATIN CAPITAL LETTER E WITH MACRON
-    "\u0113":"\\={e}", // LATIN SMALL LETTER E WITH MACRON
-    "\u0114":"\\u{E}", // LATIN CAPITAL LETTER E WITH BREVE
-    "\u0115":"\\u{e}", // LATIN SMALL LETTER E WITH BREVE
-    "\u0116":"\\.{E}", // LATIN CAPITAL LETTER E WITH DOT ABOVE
-    "\u0117":"\\.{e}", // LATIN SMALL LETTER E WITH DOT ABOVE
-    "\u0118":"\\k{E}", // LATIN CAPITAL LETTER E WITH OGONEK
-    "\u0119":"\\k{e}", // LATIN SMALL LETTER E WITH OGONEK
-    "\u011A":"\\v{E}", // LATIN CAPITAL LETTER E WITH CARON
-    "\u011B":"\\v{e}", // LATIN SMALL LETTER E WITH CARON
-    "\u011C":"\\^{G}", // LATIN CAPITAL LETTER G WITH CIRCUMFLEX
-    "\u011D":"\\^{g}", // LATIN SMALL LETTER G WITH CIRCUMFLEX
-    "\u011E":"\\u{G}", // LATIN CAPITAL LETTER G WITH BREVE
-    "\u011F":"\\u{g}", // LATIN SMALL LETTER G WITH BREVE
-    "\u0120":"\\.{G}", // LATIN CAPITAL LETTER G WITH DOT ABOVE
-    "\u0121":"\\.{g}", // LATIN SMALL LETTER G WITH DOT ABOVE
-    "\u0122":"\\c{G}", // LATIN CAPITAL LETTER G WITH CEDILLA
-    "\u0123":"\\c{g}", // LATIN SMALL LETTER G WITH CEDILLA
-    "\u0124":"\\^{H}", // LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-    "\u0125":"\\^{h}", // LATIN SMALL LETTER H WITH CIRCUMFLEX
-    "\u0128":"\\~{I}", // LATIN CAPITAL LETTER I WITH TILDE
-    "\u0129":"\\~{i}", // LATIN SMALL LETTER I WITH TILDE
-    "\u012A":"\\={I}", // LATIN CAPITAL LETTER I WITH MACRON
-    "\u012B":"\\={i}", // LATIN SMALL LETTER I WITH MACRON
-    "\u012C":"\\u{I}", // LATIN CAPITAL LETTER I WITH BREVE
-    "\u012D":"\\u{i}", // LATIN SMALL LETTER I WITH BREVE
-    "\u012E":"\\k{I}", // LATIN CAPITAL LETTER I WITH OGONEK
-    "\u012F":"\\k{i}", // LATIN SMALL LETTER I WITH OGONEK
-    "\u0130":"\\.{I}", // LATIN CAPITAL LETTER I WITH DOT ABOVE
-    "\u0134":"\\^{J}", // LATIN CAPITAL LETTER J WITH CIRCUMFLEX
-    "\u0135":"\\^{j}", // LATIN SMALL LETTER J WITH CIRCUMFLEX
-    "\u0136":"\\c{K}", // LATIN CAPITAL LETTER K WITH CEDILLA
-    "\u0137":"\\c{k}", // LATIN SMALL LETTER K WITH CEDILLA
-    "\u0139":"\\'{L}", // LATIN CAPITAL LETTER L WITH ACUTE
-    "\u013A":"\\'{l}", // LATIN SMALL LETTER L WITH ACUTE
-    "\u013B":"\\c{L}", // LATIN CAPITAL LETTER L WITH CEDILLA
-    "\u013C":"\\c{l}", // LATIN SMALL LETTER L WITH CEDILLA
-    "\u013D":"\\v{L}", // LATIN CAPITAL LETTER L WITH CARON
-    "\u013E":"\\v{l}", // LATIN SMALL LETTER L WITH CARON
-    "\u0143":"\\'{N}", // LATIN CAPITAL LETTER N WITH ACUTE
-    "\u0144":"\\'{n}", // LATIN SMALL LETTER N WITH ACUTE
-    "\u0145":"\\c{N}", // LATIN CAPITAL LETTER N WITH CEDILLA
-    "\u0146":"\\c{n}", // LATIN SMALL LETTER N WITH CEDILLA
-    "\u0147":"\\v{N}", // LATIN CAPITAL LETTER N WITH CARON
-    "\u0148":"\\v{n}", // LATIN SMALL LETTER N WITH CARON
-    "\u014C":"\\={O}", // LATIN CAPITAL LETTER O WITH MACRON
-    "\u014D":"\\={o}", // LATIN SMALL LETTER O WITH MACRON
-    "\u014E":"\\u{O}", // LATIN CAPITAL LETTER O WITH BREVE
-    "\u014F":"\\u{o}", // LATIN SMALL LETTER O WITH BREVE
-    "\u0150":"\\H{O}", // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
-    "\u0151":"\\H{o}", // LATIN SMALL LETTER O WITH DOUBLE ACUTE
-    "\u0154":"\\'{R}", // LATIN CAPITAL LETTER R WITH ACUTE
-    "\u0155":"\\'{r}", // LATIN SMALL LETTER R WITH ACUTE
-    "\u0156":"\\c{R}", // LATIN CAPITAL LETTER R WITH CEDILLA
-    "\u0157":"\\c{r}", // LATIN SMALL LETTER R WITH CEDILLA
-    "\u0158":"\\v{R}", // LATIN CAPITAL LETTER R WITH CARON
-    "\u0159":"\\v{r}", // LATIN SMALL LETTER R WITH CARON
-    "\u015A":"\\'{S}", // LATIN CAPITAL LETTER S WITH ACUTE
-    "\u015B":"\\'{s}", // LATIN SMALL LETTER S WITH ACUTE
-    "\u015C":"\\^{S}", // LATIN CAPITAL LETTER S WITH CIRCUMFLEX
-    "\u015D":"\\^{s}", // LATIN SMALL LETTER S WITH CIRCUMFLEX
-    "\u015E":"\\c{S}", // LATIN CAPITAL LETTER S WITH CEDILLA
-    "\u015F":"\\c{s}", // LATIN SMALL LETTER S WITH CEDILLA
-    "\u0160":"\\v{S}", // LATIN CAPITAL LETTER S WITH CARON
-    "\u0161":"\\v{s}", // LATIN SMALL LETTER S WITH CARON
-    "\u0162":"\\c{T}", // LATIN CAPITAL LETTER T WITH CEDILLA
-    "\u0163":"\\c{t}", // LATIN SMALL LETTER T WITH CEDILLA
-    "\u0164":"\\v{T}", // LATIN CAPITAL LETTER T WITH CARON
-    "\u0165":"\\v{t}", // LATIN SMALL LETTER T WITH CARON
-    "\u0168":"\\~{U}", // LATIN CAPITAL LETTER U WITH TILDE
-    "\u0169":"\\~{u}", // LATIN SMALL LETTER U WITH TILDE
-    "\u016A":"\\={U}", // LATIN CAPITAL LETTER U WITH MACRON
-    "\u016B":"\\={u}", // LATIN SMALL LETTER U WITH MACRON
-    "\u016C":"\\u{U}", // LATIN CAPITAL LETTER U WITH BREVE
-    "\u016D":"\\u{u}", // LATIN SMALL LETTER U WITH BREVE
-    "\u0170":"\\H{U}", // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
-    "\u0171":"\\H{u}", // LATIN SMALL LETTER U WITH DOUBLE ACUTE
-    "\u0172":"\\k{U}", // LATIN CAPITAL LETTER U WITH OGONEK
-    "\u0173":"\\k{u}", // LATIN SMALL LETTER U WITH OGONEK
-    "\u0174":"\\^{W}", // LATIN CAPITAL LETTER W WITH CIRCUMFLEX
-    "\u0175":"\\^{w}", // LATIN SMALL LETTER W WITH CIRCUMFLEX
-    "\u0176":"\\^{Y}", // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
-    "\u0177":"\\^{y}", // LATIN SMALL LETTER Y WITH CIRCUMFLEX
-    "\u0178":"\\\"{Y}", // LATIN CAPITAL LETTER Y WITH DIAERESIS
-    "\u0179":"\\'{Z}", // LATIN CAPITAL LETTER Z WITH ACUTE
-    "\u017A":"\\'{z}", // LATIN SMALL LETTER Z WITH ACUTE
-    "\u017B":"\\.{Z}", // LATIN CAPITAL LETTER Z WITH DOT ABOVE
-    "\u017C":"\\.{z}", // LATIN SMALL LETTER Z WITH DOT ABOVE
-    "\u017D":"\\v{Z}", // LATIN CAPITAL LETTER Z WITH CARON
-    "\u017E":"\\v{z}", // LATIN SMALL LETTER Z WITH CARON
-    "\u01CD":"\\v{A}", // LATIN CAPITAL LETTER A WITH CARON
-    "\u01CE":"\\v{a}", // LATIN SMALL LETTER A WITH CARON
-    "\u01CF":"\\v{I}", // LATIN CAPITAL LETTER I WITH CARON
-    "\u01D0":"\\v{i}", // LATIN SMALL LETTER I WITH CARON
-    "\u01D1":"\\v{O}", // LATIN CAPITAL LETTER O WITH CARON
-    "\u01D2":"\\v{o}", // LATIN SMALL LETTER O WITH CARON
-    "\u01D3":"\\v{U}", // LATIN CAPITAL LETTER U WITH CARON
-    "\u01D4":"\\v{u}", // LATIN SMALL LETTER U WITH CARON
-    "\u01E6":"\\v{G}", // LATIN CAPITAL LETTER G WITH CARON
-    "\u01E7":"\\v{g}", // LATIN SMALL LETTER G WITH CARON
-    "\u01E8":"\\v{K}", // LATIN CAPITAL LETTER K WITH CARON
-    "\u01E9":"\\v{k}", // LATIN SMALL LETTER K WITH CARON
-    "\u01EA":"\\k{O}", // LATIN CAPITAL LETTER O WITH OGONEK
-    "\u01EB":"\\k{o}", // LATIN SMALL LETTER O WITH OGONEK
-    "\u01F0":"\\v{j}", // LATIN SMALL LETTER J WITH CARON
-    "\u01F4":"\\'{G}", // LATIN CAPITAL LETTER G WITH ACUTE
-    "\u01F5":"\\'{g}", // LATIN SMALL LETTER G WITH ACUTE
-    "\u1E02":"\\.{B}", // LATIN CAPITAL LETTER B WITH DOT ABOVE
-    "\u1E03":"\\.{b}", // LATIN SMALL LETTER B WITH DOT ABOVE
-    "\u1E04":"\\d{B}", // LATIN CAPITAL LETTER B WITH DOT BELOW
-    "\u1E05":"\\d{b}", // LATIN SMALL LETTER B WITH DOT BELOW
-    "\u1E06":"\\b{B}", // LATIN CAPITAL LETTER B WITH LINE BELOW
-    "\u1E07":"\\b{b}", // LATIN SMALL LETTER B WITH LINE BELOW
-    "\u1E0A":"\\.{D}", // LATIN CAPITAL LETTER D WITH DOT ABOVE
-    "\u1E0B":"\\.{d}", // LATIN SMALL LETTER D WITH DOT ABOVE
-    "\u1E0C":"\\d{D}", // LATIN CAPITAL LETTER D WITH DOT BELOW
-    "\u1E0D":"\\d{d}", // LATIN SMALL LETTER D WITH DOT BELOW
-    "\u1E0E":"\\b{D}", // LATIN CAPITAL LETTER D WITH LINE BELOW
-    "\u1E0F":"\\b{d}", // LATIN SMALL LETTER D WITH LINE BELOW
-    "\u1E10":"\\c{D}", // LATIN CAPITAL LETTER D WITH CEDILLA
-    "\u1E11":"\\c{d}", // LATIN SMALL LETTER D WITH CEDILLA
-    "\u1E1E":"\\.{F}", // LATIN CAPITAL LETTER F WITH DOT ABOVE
-    "\u1E1F":"\\.{f}", // LATIN SMALL LETTER F WITH DOT ABOVE
-    "\u1E20":"\\={G}", // LATIN CAPITAL LETTER G WITH MACRON
-    "\u1E21":"\\={g}", // LATIN SMALL LETTER G WITH MACRON
-    "\u1E22":"\\.{H}", // LATIN CAPITAL LETTER H WITH DOT ABOVE
-    "\u1E23":"\\.{h}", // LATIN SMALL LETTER H WITH DOT ABOVE
-    "\u1E24":"\\d{H}", // LATIN CAPITAL LETTER H WITH DOT BELOW
-    "\u1E25":"\\d{h}", // LATIN SMALL LETTER H WITH DOT BELOW
-    "\u1E26":"\\\"{H}", // LATIN CAPITAL LETTER H WITH DIAERESIS
-    "\u1E27":"\\\"{h}", // LATIN SMALL LETTER H WITH DIAERESIS
-    "\u1E28":"\\c{H}", // LATIN CAPITAL LETTER H WITH CEDILLA
-    "\u1E29":"\\c{h}", // LATIN SMALL LETTER H WITH CEDILLA
-    "\u1E30":"\\'{K}", // LATIN CAPITAL LETTER K WITH ACUTE
-    "\u1E31":"\\'{k}", // LATIN SMALL LETTER K WITH ACUTE
-    "\u1E32":"\\d{K}", // LATIN CAPITAL LETTER K WITH DOT BELOW
-    "\u1E33":"\\d{k}", // LATIN SMALL LETTER K WITH DOT BELOW
-    "\u1E34":"\\b{K}", // LATIN CAPITAL LETTER K WITH LINE BELOW
-    "\u1E35":"\\b{k}", // LATIN SMALL LETTER K WITH LINE BELOW
-    "\u1E36":"\\d{L}", // LATIN CAPITAL LETTER L WITH DOT BELOW
-    "\u1E37":"\\d{l}", // LATIN SMALL LETTER L WITH DOT BELOW
-    "\u1E3A":"\\b{L}", // LATIN CAPITAL LETTER L WITH LINE BELOW
-    "\u1E3B":"\\b{l}", // LATIN SMALL LETTER L WITH LINE BELOW
-    "\u1E3E":"\\'{M}", // LATIN CAPITAL LETTER M WITH ACUTE
-    "\u1E3F":"\\'{m}", // LATIN SMALL LETTER M WITH ACUTE
-    "\u1E40":"\\.{M}", // LATIN CAPITAL LETTER M WITH DOT ABOVE
-    "\u1E41":"\\.{m}", // LATIN SMALL LETTER M WITH DOT ABOVE
-    "\u1E42":"\\d{M}", // LATIN CAPITAL LETTER M WITH DOT BELOW
-    "\u1E43":"\\d{m}", // LATIN SMALL LETTER M WITH DOT BELOW
-    "\u1E44":"\\.{N}", // LATIN CAPITAL LETTER N WITH DOT ABOVE
-    "\u1E45":"\\.{n}", // LATIN SMALL LETTER N WITH DOT ABOVE
-    "\u1E46":"\\d{N}", // LATIN CAPITAL LETTER N WITH DOT BELOW
-    "\u1E47":"\\d{n}", // LATIN SMALL LETTER N WITH DOT BELOW
-    "\u1E48":"\\b{N}", // LATIN CAPITAL LETTER N WITH LINE BELOW
-    "\u1E49":"\\b{n}", // LATIN SMALL LETTER N WITH LINE BELOW
-    "\u1E54":"\\'{P}", // LATIN CAPITAL LETTER P WITH ACUTE
-    "\u1E55":"\\'{p}", // LATIN SMALL LETTER P WITH ACUTE
-    "\u1E56":"\\.{P}", // LATIN CAPITAL LETTER P WITH DOT ABOVE
-    "\u1E57":"\\.{p}", // LATIN SMALL LETTER P WITH DOT ABOVE
-    "\u1E58":"\\.{R}", // LATIN CAPITAL LETTER R WITH DOT ABOVE
-    "\u1E59":"\\.{r}", // LATIN SMALL LETTER R WITH DOT ABOVE
-    "\u1E5A":"\\d{R}", // LATIN CAPITAL LETTER R WITH DOT BELOW
-    "\u1E5B":"\\d{r}", // LATIN SMALL LETTER R WITH DOT BELOW
-    "\u1E5E":"\\b{R}", // LATIN CAPITAL LETTER R WITH LINE BELOW
-    "\u1E5F":"\\b{r}", // LATIN SMALL LETTER R WITH LINE BELOW
-    "\u1E60":"\\.{S}", // LATIN CAPITAL LETTER S WITH DOT ABOVE
-    "\u1E61":"\\.{s}", // LATIN SMALL LETTER S WITH DOT ABOVE
-    "\u1E62":"\\d{S}", // LATIN CAPITAL LETTER S WITH DOT BELOW
-    "\u1E63":"\\d{s}", // LATIN SMALL LETTER S WITH DOT BELOW
-    "\u1E6A":"\\.{T}", // LATIN CAPITAL LETTER T WITH DOT ABOVE
-    "\u1E6B":"\\.{t}", // LATIN SMALL LETTER T WITH DOT ABOVE
-    "\u1E6C":"\\d{T}", // LATIN CAPITAL LETTER T WITH DOT BELOW
-    "\u1E6D":"\\d{t}", // LATIN SMALL LETTER T WITH DOT BELOW
-    "\u1E6E":"\\b{T}", // LATIN CAPITAL LETTER T WITH LINE BELOW
-    "\u1E6F":"\\b{t}", // LATIN SMALL LETTER T WITH LINE BELOW
-    "\u1E7C":"\\~{V}", // LATIN CAPITAL LETTER V WITH TILDE
-    "\u1E7D":"\\~{v}", // LATIN SMALL LETTER V WITH TILDE
-    "\u1E7E":"\\d{V}", // LATIN CAPITAL LETTER V WITH DOT BELOW
-    "\u1E7F":"\\d{v}", // LATIN SMALL LETTER V WITH DOT BELOW
-    "\u1E80":"\\`{W}", // LATIN CAPITAL LETTER W WITH GRAVE
-    "\u1E81":"\\`{w}", // LATIN SMALL LETTER W WITH GRAVE
-    "\u1E82":"\\'{W}", // LATIN CAPITAL LETTER W WITH ACUTE
-    "\u1E83":"\\'{w}", // LATIN SMALL LETTER W WITH ACUTE
-    "\u1E84":"\\\"{W}", // LATIN CAPITAL LETTER W WITH DIAERESIS
-    "\u1E85":"\\\"{w}", // LATIN SMALL LETTER W WITH DIAERESIS
-    "\u1E86":"\\.{W}", // LATIN CAPITAL LETTER W WITH DOT ABOVE
-    "\u1E87":"\\.{w}", // LATIN SMALL LETTER W WITH DOT ABOVE
-    "\u1E88":"\\d{W}", // LATIN CAPITAL LETTER W WITH DOT BELOW
-    "\u1E89":"\\d{w}", // LATIN SMALL LETTER W WITH DOT BELOW
-    "\u1E8A":"\\.{X}", // LATIN CAPITAL LETTER X WITH DOT ABOVE
-    "\u1E8B":"\\.{x}", // LATIN SMALL LETTER X WITH DOT ABOVE
-    "\u1E8C":"\\\"{X}", // LATIN CAPITAL LETTER X WITH DIAERESIS
-    "\u1E8D":"\\\"{x}", // LATIN SMALL LETTER X WITH DIAERESIS
-    "\u1E8E":"\\.{Y}", // LATIN CAPITAL LETTER Y WITH DOT ABOVE
-    "\u1E8F":"\\.{y}", // LATIN SMALL LETTER Y WITH DOT ABOVE
-    "\u1E90":"\\^{Z}", // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-    "\u1E91":"\\^{z}", // LATIN SMALL LETTER Z WITH CIRCUMFLEX
-    "\u1E92":"\\d{Z}", // LATIN CAPITAL LETTER Z WITH DOT BELOW
-    "\u1E93":"\\d{z}", // LATIN SMALL LETTER Z WITH DOT BELOW
-    "\u1E94":"\\b{Z}", // LATIN CAPITAL LETTER Z WITH LINE BELOW
-    "\u1E95":"\\b{z}", // LATIN SMALL LETTER Z WITH LINE BELOW
-    "\u1E96":"\\b{h}", // LATIN SMALL LETTER H WITH LINE BELOW
-    "\u1E97":"\\\"{t}", // LATIN SMALL LETTER T WITH DIAERESIS
-    "\u1EA0":"\\d{A}", // LATIN CAPITAL LETTER A WITH DOT BELOW
-    "\u1EA1":"\\d{a}", // LATIN SMALL LETTER A WITH DOT BELOW
-    "\u1EB8":"\\d{E}", // LATIN CAPITAL LETTER E WITH DOT BELOW
-    "\u1EB9":"\\d{e}", // LATIN SMALL LETTER E WITH DOT BELOW
-    "\u1EBC":"\\~{E}", // LATIN CAPITAL LETTER E WITH TILDE
-    "\u1EBD":"\\~{e}", // LATIN SMALL LETTER E WITH TILDE
-    "\u1ECA":"\\d{I}", // LATIN CAPITAL LETTER I WITH DOT BELOW
-    "\u1ECB":"\\d{i}", // LATIN SMALL LETTER I WITH DOT BELOW
-    "\u1ECC":"\\d{O}", // LATIN CAPITAL LETTER O WITH DOT BELOW
-    "\u1ECD":"\\d{o}", // LATIN SMALL LETTER O WITH DOT BELOW
-    "\u1EE4":"\\d{U}", // LATIN CAPITAL LETTER U WITH DOT BELOW
-    "\u1EE5":"\\d{u}", // LATIN SMALL LETTER U WITH DOT BELOW
-    "\u1EF2":"\\`{Y}", // LATIN CAPITAL LETTER Y WITH GRAVE
-    "\u1EF3":"\\`{y}", // LATIN SMALL LETTER Y WITH GRAVE
-    "\u1EF4":"\\d{Y}", // LATIN CAPITAL LETTER Y WITH DOT BELOW
-    "\u1EF5":"\\d{y}", // LATIN SMALL LETTER Y WITH DOT BELOW
-    "\u1EF8":"\\~{Y}", // LATIN CAPITAL LETTER Y WITH TILDE
-    "\u1EF9":"\\~{y}", // LATIN SMALL LETTER Y WITH TILDE
-	
+    "\\`{A}"                          : "\u00C0", // LATIN CAPITAL LETTER A WITH GRAVE
+    "\\'{A}"                          : "\u00C1", // LATIN CAPITAL LETTER A WITH ACUTE
+    "\\^{A}"                          : "\u00C2", // LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+    "\\~{A}"                          : "\u00C3", // LATIN CAPITAL LETTER A WITH TILDE
+    "\\\"{A}"                         : "\u00C4", // LATIN CAPITAL LETTER A WITH DIAERESIS
+    "\\c{C}"                          : "\u00C7", // LATIN CAPITAL LETTER C WITH CEDILLA
+    "\\`{E}"                          : "\u00C8", // LATIN CAPITAL LETTER E WITH GRAVE
+    "\\'{E}"                          : "\u00C9", // LATIN CAPITAL LETTER E WITH ACUTE
+    "\\^{E}"                          : "\u00CA", // LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+    "\\\"{E}"                         : "\u00CB", // LATIN CAPITAL LETTER E WITH DIAERESIS
+    "\\`{I}"                          : "\u00CC", // LATIN CAPITAL LETTER I WITH GRAVE
+    "\\'{I}"                          : "\u00CD", // LATIN CAPITAL LETTER I WITH ACUTE
+    "\\^{I}"                          : "\u00CE", // LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+    "\\\"{I}"                         : "\u00CF", // LATIN CAPITAL LETTER I WITH DIAERESIS
+    "\\~{N}"                          : "\u00D1", // LATIN CAPITAL LETTER N WITH TILDE
+    "\\`{O}"                          : "\u00D2", // LATIN CAPITAL LETTER O WITH GRAVE
+    "\\'{O}"                          : "\u00D3", // LATIN CAPITAL LETTER O WITH ACUTE
+    "\\^{O}"                          : "\u00D4", // LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+    "\\~{O}"                          : "\u00D5", // LATIN CAPITAL LETTER O WITH TILDE
+    "\\\"{O}"                         : "\u00D6", // LATIN CAPITAL LETTER O WITH DIAERESIS
+    "\\`{U}"                          : "\u00D9", // LATIN CAPITAL LETTER U WITH GRAVE
+    "\\'{U}"                          : "\u00DA", // LATIN CAPITAL LETTER U WITH ACUTE
+    "\\^{U}"                          : "\u00DB", // LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+    "\\\"{U}"                         : "\u00DC", // LATIN CAPITAL LETTER U WITH DIAERESIS
+    "\\'{Y}"                          : "\u00DD", // LATIN CAPITAL LETTER Y WITH ACUTE
+    "\\`{a}"                          : "\u00E0", // LATIN SMALL LETTER A WITH GRAVE
+    "\\'{a}"                          : "\u00E1", // LATIN SMALL LETTER A WITH ACUTE
+    "\\^{a}"                          : "\u00E2", // LATIN SMALL LETTER A WITH CIRCUMFLEX
+    "\\~{a}"                          : "\u00E3", // LATIN SMALL LETTER A WITH TILDE
+    "\\\"{a}"                         : "\u00E4", // LATIN SMALL LETTER A WITH DIAERESIS
+    "\\c{c}"                          : "\u00E7", // LATIN SMALL LETTER C WITH CEDILLA
+    "\\`{e}"                          : "\u00E8", // LATIN SMALL LETTER E WITH GRAVE
+    "\\'{e}"                          : "\u00E9", // LATIN SMALL LETTER E WITH ACUTE
+    "\\^{e}"                          : "\u00EA", // LATIN SMALL LETTER E WITH CIRCUMFLEX
+    "\\\"{e}"                         : "\u00EB", // LATIN SMALL LETTER E WITH DIAERESIS
+    "\\`{i}"                          : "\u00EC", // LATIN SMALL LETTER I WITH GRAVE
+    "\\'{i}"                          : "\u00ED", // LATIN SMALL LETTER I WITH ACUTE
+    "\\^{i}"                          : "\u00EE", // LATIN SMALL LETTER I WITH CIRCUMFLEX
+    "\\\"{i}"                         : "\u00EF", // LATIN SMALL LETTER I WITH DIAERESIS
+    "\\~{n}"                          : "\u00F1", // LATIN SMALL LETTER N WITH TILDE
+    "\\`{o}"                          : "\u00F2", // LATIN SMALL LETTER O WITH GRAVE
+    "\\'{o}"                          : "\u00F3", // LATIN SMALL LETTER O WITH ACUTE
+    "\\^{o}"                          : "\u00F4", // LATIN SMALL LETTER O WITH CIRCUMFLEX
+    "\\~{o}"                          : "\u00F5", // LATIN SMALL LETTER O WITH TILDE
+    "\\\"{o}"                         : "\u00F6", // LATIN SMALL LETTER O WITH DIAERESIS
+    "\\`{u}"                          : "\u00F9", // LATIN SMALL LETTER U WITH GRAVE
+    "\\'{u}"                          : "\u00FA", // LATIN SMALL LETTER U WITH ACUTE
+    "\\^{u}"                          : "\u00FB", // LATIN SMALL LETTER U WITH CIRCUMFLEX
+    "\\\"{u}"                         : "\u00FC", // LATIN SMALL LETTER U WITH DIAERESIS
+    "\\'{y}"                          : "\u00FD", // LATIN SMALL LETTER Y WITH ACUTE
+    "\\\"{y}"                         : "\u00FF", // LATIN SMALL LETTER Y WITH DIAERESIS
+    "\\={A}"                          : "\u0100", // LATIN CAPITAL LETTER A WITH MACRON
+    "\\={a}"                          : "\u0101", // LATIN SMALL LETTER A WITH MACRON
+    "\\u{A}"                          : "\u0102", // LATIN CAPITAL LETTER A WITH BREVE
+    "\\u{a}"                          : "\u0103", // LATIN SMALL LETTER A WITH BREVE
+    "\\k{A}"                          : "\u0104", // LATIN CAPITAL LETTER A WITH OGONEK
+    "\\k{a}"                          : "\u0105", // LATIN SMALL LETTER A WITH OGONEK
+    "\\'{C}"                          : "\u0106", // LATIN CAPITAL LETTER C WITH ACUTE
+    "\\'{c}"                          : "\u0107", // LATIN SMALL LETTER C WITH ACUTE
+    "\\^{C}"                          : "\u0108", // LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+    "\\^{c}"                          : "\u0109", // LATIN SMALL LETTER C WITH CIRCUMFLEX
+    "\\.{C}"                          : "\u010A", // LATIN CAPITAL LETTER C WITH DOT ABOVE
+    "\\.{c}"                          : "\u010B", // LATIN SMALL LETTER C WITH DOT ABOVE
+    "\\v{C}"                          : "\u010C", // LATIN CAPITAL LETTER C WITH CARON
+    "\\v{c}"                          : "\u010D", // LATIN SMALL LETTER C WITH CARON
+    "\\v{D}"                          : "\u010E", // LATIN CAPITAL LETTER D WITH CARON
+    "\\v{d}"                          : "\u010F", // LATIN SMALL LETTER D WITH CARON
+    "\\={E}"                          : "\u0112", // LATIN CAPITAL LETTER E WITH MACRON
+    "\\={e}"                          : "\u0113", // LATIN SMALL LETTER E WITH MACRON
+    "\\u{E}"                          : "\u0114", // LATIN CAPITAL LETTER E WITH BREVE
+    "\\u{e}"                          : "\u0115", // LATIN SMALL LETTER E WITH BREVE
+    "\\.{E}"                          : "\u0116", // LATIN CAPITAL LETTER E WITH DOT ABOVE
+    "\\.{e}"                          : "\u0117", // LATIN SMALL LETTER E WITH DOT ABOVE
+    "\\k{E}"                          : "\u0118", // LATIN CAPITAL LETTER E WITH OGONEK
+    "\\k{e}"                          : "\u0119", // LATIN SMALL LETTER E WITH OGONEK
+    "\\v{E}"                          : "\u011A", // LATIN CAPITAL LETTER E WITH CARON
+    "\\v{e}"                          : "\u011B", // LATIN SMALL LETTER E WITH CARON
+    "\\^{G}"                          : "\u011C", // LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+    "\\^{g}"                          : "\u011D", // LATIN SMALL LETTER G WITH CIRCUMFLEX
+    "\\u{G}"                          : "\u011E", // LATIN CAPITAL LETTER G WITH BREVE
+    "\\u{g}"                          : "\u011F", // LATIN SMALL LETTER G WITH BREVE
+    "\\.{G}"                          : "\u0120", // LATIN CAPITAL LETTER G WITH DOT ABOVE
+    "\\.{g}"                          : "\u0121", // LATIN SMALL LETTER G WITH DOT ABOVE
+    "\\c{G}"                          : "\u0122", // LATIN CAPITAL LETTER G WITH CEDILLA
+    "\\c{g}"                          : "\u0123", // LATIN SMALL LETTER G WITH CEDILLA
+    "\\^{H}"                          : "\u0124", // LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+    "\\^{h}"                          : "\u0125", // LATIN SMALL LETTER H WITH CIRCUMFLEX
+    "\\~{I}"                          : "\u0128", // LATIN CAPITAL LETTER I WITH TILDE
+    "\\~{i}"                          : "\u0129", // LATIN SMALL LETTER I WITH TILDE
+    "\\={I}"                          : "\u012A", // LATIN CAPITAL LETTER I WITH MACRON
+    "\\={i}"                          : "\u012B", // LATIN SMALL LETTER I WITH MACRON
+    "\\u{I}"                          : "\u012C", // LATIN CAPITAL LETTER I WITH BREVE
+    "\\u{i}"                          : "\u012D", // LATIN SMALL LETTER I WITH BREVE
+    "\\k{I}"                          : "\u012E", // LATIN CAPITAL LETTER I WITH OGONEK
+    "\\k{i}"                          : "\u012F", // LATIN SMALL LETTER I WITH OGONEK
+    "\\.{I}"                          : "\u0130", // LATIN CAPITAL LETTER I WITH DOT ABOVE
+    "\\^{J}"                          : "\u0134", // LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+    "\\^{j}"                          : "\u0135", // LATIN SMALL LETTER J WITH CIRCUMFLEX
+    "\\c{K}"                          : "\u0136", // LATIN CAPITAL LETTER K WITH CEDILLA
+    "\\c{k}"                          : "\u0137", // LATIN SMALL LETTER K WITH CEDILLA
+    "\\'{L}"                          : "\u0139", // LATIN CAPITAL LETTER L WITH ACUTE
+    "\\'{l}"                          : "\u013A", // LATIN SMALL LETTER L WITH ACUTE
+    "\\c{L}"                          : "\u013B", // LATIN CAPITAL LETTER L WITH CEDILLA
+    "\\c{l}"                          : "\u013C", // LATIN SMALL LETTER L WITH CEDILLA
+    "\\v{L}"                          : "\u013D", // LATIN CAPITAL LETTER L WITH CARON
+    "\\v{l}"                          : "\u013E", // LATIN SMALL LETTER L WITH CARON
+    "\\'{N}"                          : "\u0143", // LATIN CAPITAL LETTER N WITH ACUTE
+    "\\'{n}"                          : "\u0144", // LATIN SMALL LETTER N WITH ACUTE
+    "\\c{N}"                          : "\u0145", // LATIN CAPITAL LETTER N WITH CEDILLA
+    "\\c{n}"                          : "\u0146", // LATIN SMALL LETTER N WITH CEDILLA
+    "\\v{N}"                          : "\u0147", // LATIN CAPITAL LETTER N WITH CARON
+    "\\v{n}"                          : "\u0148", // LATIN SMALL LETTER N WITH CARON
+    "\\={O}"                          : "\u014C", // LATIN CAPITAL LETTER O WITH MACRON
+    "\\={o}"                          : "\u014D", // LATIN SMALL LETTER O WITH MACRON
+    "\\u{O}"                          : "\u014E", // LATIN CAPITAL LETTER O WITH BREVE
+    "\\u{o}"                          : "\u014F", // LATIN SMALL LETTER O WITH BREVE
+    "\\H{O}"                          : "\u0150", // LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+    "\\H{o}"                          : "\u0151", // LATIN SMALL LETTER O WITH DOUBLE ACUTE
+    "\\'{R}"                          : "\u0154", // LATIN CAPITAL LETTER R WITH ACUTE
+    "\\'{r}"                          : "\u0155", // LATIN SMALL LETTER R WITH ACUTE
+    "\\c{R}"                          : "\u0156", // LATIN CAPITAL LETTER R WITH CEDILLA
+    "\\c{r}"                          : "\u0157", // LATIN SMALL LETTER R WITH CEDILLA
+    "\\v{R}"                          : "\u0158", // LATIN CAPITAL LETTER R WITH CARON
+    "\\v{r}"                          : "\u0159", // LATIN SMALL LETTER R WITH CARON
+    "\\'{S}"                          : "\u015A", // LATIN CAPITAL LETTER S WITH ACUTE
+    "\\'{s}"                          : "\u015B", // LATIN SMALL LETTER S WITH ACUTE
+    "\\^{S}"                          : "\u015C", // LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+    "\\^{s}"                          : "\u015D", // LATIN SMALL LETTER S WITH CIRCUMFLEX
+    "\\c{S}"                          : "\u015E", // LATIN CAPITAL LETTER S WITH CEDILLA
+    "\\c{s}"                          : "\u015F", // LATIN SMALL LETTER S WITH CEDILLA
+    "\\v{S}"                          : "\u0160", // LATIN CAPITAL LETTER S WITH CARON
+    "\\v{s}"                          : "\u0161", // LATIN SMALL LETTER S WITH CARON
+    "\\c{T}"                          : "\u0162", // LATIN CAPITAL LETTER T WITH CEDILLA
+    "\\c{t}"                          : "\u0163", // LATIN SMALL LETTER T WITH CEDILLA
+    "\\v{T}"                          : "\u0164", // LATIN CAPITAL LETTER T WITH CARON
+    "\\v{t}"                          : "\u0165", // LATIN SMALL LETTER T WITH CARON
+    "\\~{U}"                          : "\u0168", // LATIN CAPITAL LETTER U WITH TILDE
+    "\\~{u}"                          : "\u0169", // LATIN SMALL LETTER U WITH TILDE
+    "\\={U}"                          : "\u016A", // LATIN CAPITAL LETTER U WITH MACRON
+    "\\={u}"                          : "\u016B", // LATIN SMALL LETTER U WITH MACRON
+    "\\u{U}"                          : "\u016C", // LATIN CAPITAL LETTER U WITH BREVE
+    "\\u{u}"                          : "\u016D", // LATIN SMALL LETTER U WITH BREVE
+    "\\H{U}"                          : "\u0170", // LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+    "\\H{u}"                          : "\u0171", // LATIN SMALL LETTER U WITH DOUBLE ACUTE
+    "\\k{U}"                          : "\u0172", // LATIN CAPITAL LETTER U WITH OGONEK
+    "\\k{u}"                          : "\u0173", // LATIN SMALL LETTER U WITH OGONEK
+    "\\^{W}"                          : "\u0174", // LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+    "\\^{w}"                          : "\u0175", // LATIN SMALL LETTER W WITH CIRCUMFLEX
+    "\\^{Y}"                          : "\u0176", // LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+    "\\^{y}"                          : "\u0177", // LATIN SMALL LETTER Y WITH CIRCUMFLEX
+    "\\\"{Y}"                         : "\u0178", // LATIN CAPITAL LETTER Y WITH DIAERESIS
+    "\\'{Z}"                          : "\u0179", // LATIN CAPITAL LETTER Z WITH ACUTE
+    "\\'{z}"                          : "\u017A", // LATIN SMALL LETTER Z WITH ACUTE
+    "\\.{Z}"                          : "\u017B", // LATIN CAPITAL LETTER Z WITH DOT ABOVE
+    "\\.{z}"                          : "\u017C", // LATIN SMALL LETTER Z WITH DOT ABOVE
+    "\\v{Z}"                          : "\u017D", // LATIN CAPITAL LETTER Z WITH CARON
+    "\\v{z}"                          : "\u017E", // LATIN SMALL LETTER Z WITH CARON
+    "\\v{A}"                          : "\u01CD", // LATIN CAPITAL LETTER A WITH CARON
+    "\\v{a}"                          : "\u01CE", // LATIN SMALL LETTER A WITH CARON
+    "\\v{I}"                          : "\u01CF", // LATIN CAPITAL LETTER I WITH CARON
+    "\\v{i}"                          : "\u01D0", // LATIN SMALL LETTER I WITH CARON
+    "\\v{O}"                          : "\u01D1", // LATIN CAPITAL LETTER O WITH CARON
+    "\\v{o}"                          : "\u01D2", // LATIN SMALL LETTER O WITH CARON
+    "\\v{U}"                          : "\u01D3", // LATIN CAPITAL LETTER U WITH CARON
+    "\\v{u}"                          : "\u01D4", // LATIN SMALL LETTER U WITH CARON
+    "\\v{G}"                          : "\u01E6", // LATIN CAPITAL LETTER G WITH CARON
+    "\\v{g}"                          : "\u01E7", // LATIN SMALL LETTER G WITH CARON
+    "\\v{K}"                          : "\u01E8", // LATIN CAPITAL LETTER K WITH CARON
+    "\\v{k}"                          : "\u01E9", // LATIN SMALL LETTER K WITH CARON
+    "\\k{O}"                          : "\u01EA", // LATIN CAPITAL LETTER O WITH OGONEK
+    "\\k{o}"                          : "\u01EB", // LATIN SMALL LETTER O WITH OGONEK
+    "\\v{j}"                          : "\u01F0", // LATIN SMALL LETTER J WITH CARON
+    "\\'{G}"                          : "\u01F4", // LATIN CAPITAL LETTER G WITH ACUTE
+    "\\'{g}"                          : "\u01F5", // LATIN SMALL LETTER G WITH ACUTE
+    "\\.{B}"                          : "\u1E02", // LATIN CAPITAL LETTER B WITH DOT ABOVE
+    "\\.{b}"                          : "\u1E03", // LATIN SMALL LETTER B WITH DOT ABOVE
+    "\\d{B}"                          : "\u1E04", // LATIN CAPITAL LETTER B WITH DOT BELOW
+    "\\d{b}"                          : "\u1E05", // LATIN SMALL LETTER B WITH DOT BELOW
+    "\\b{B}"                          : "\u1E06", // LATIN CAPITAL LETTER B WITH LINE BELOW
+    "\\b{b}"                          : "\u1E07", // LATIN SMALL LETTER B WITH LINE BELOW
+    "\\.{D}"                          : "\u1E0A", // LATIN CAPITAL LETTER D WITH DOT ABOVE
+    "\\.{d}"                          : "\u1E0B", // LATIN SMALL LETTER D WITH DOT ABOVE
+    "\\d{D}"                          : "\u1E0C", // LATIN CAPITAL LETTER D WITH DOT BELOW
+    "\\d{d}"                          : "\u1E0D", // LATIN SMALL LETTER D WITH DOT BELOW
+    "\\b{D}"                          : "\u1E0E", // LATIN CAPITAL LETTER D WITH LINE BELOW
+    "\\b{d}"                          : "\u1E0F", // LATIN SMALL LETTER D WITH LINE BELOW
+    "\\c{D}"                          : "\u1E10", // LATIN CAPITAL LETTER D WITH CEDILLA
+    "\\c{d}"                          : "\u1E11", // LATIN SMALL LETTER D WITH CEDILLA
+    "\\.{F}"                          : "\u1E1E", // LATIN CAPITAL LETTER F WITH DOT ABOVE
+    "\\.{f}"                          : "\u1E1F", // LATIN SMALL LETTER F WITH DOT ABOVE
+    "\\={G}"                          : "\u1E20", // LATIN CAPITAL LETTER G WITH MACRON
+    "\\={g}"                          : "\u1E21", // LATIN SMALL LETTER G WITH MACRON
+    "\\.{H}"                          : "\u1E22", // LATIN CAPITAL LETTER H WITH DOT ABOVE
+    "\\.{h}"                          : "\u1E23", // LATIN SMALL LETTER H WITH DOT ABOVE
+    "\\d{H}"                          : "\u1E24", // LATIN CAPITAL LETTER H WITH DOT BELOW
+    "\\d{h}"                          : "\u1E25", // LATIN SMALL LETTER H WITH DOT BELOW
+    "\\\"{H}"                         : "\u1E26", // LATIN CAPITAL LETTER H WITH DIAERESIS
+    "\\\"{h}"                         : "\u1E27", // LATIN SMALL LETTER H WITH DIAERESIS
+    "\\c{H}"                          : "\u1E28", // LATIN CAPITAL LETTER H WITH CEDILLA
+    "\\c{h}"                          : "\u1E29", // LATIN SMALL LETTER H WITH CEDILLA
+    "\\'{K}"                          : "\u1E30", // LATIN CAPITAL LETTER K WITH ACUTE
+    "\\'{k}"                          : "\u1E31", // LATIN SMALL LETTER K WITH ACUTE
+    "\\d{K}"                          : "\u1E32", // LATIN CAPITAL LETTER K WITH DOT BELOW
+    "\\d{k}"                          : "\u1E33", // LATIN SMALL LETTER K WITH DOT BELOW
+    "\\b{K}"                          : "\u1E34", // LATIN CAPITAL LETTER K WITH LINE BELOW
+    "\\b{k}"                          : "\u1E35", // LATIN SMALL LETTER K WITH LINE BELOW
+    "\\d{L}"                          : "\u1E36", // LATIN CAPITAL LETTER L WITH DOT BELOW
+    "\\d{l}"                          : "\u1E37", // LATIN SMALL LETTER L WITH DOT BELOW
+    "\\b{L}"                          : "\u1E3A", // LATIN CAPITAL LETTER L WITH LINE BELOW
+    "\\b{l}"                          : "\u1E3B", // LATIN SMALL LETTER L WITH LINE BELOW
+    "\\'{M}"                          : "\u1E3E", // LATIN CAPITAL LETTER M WITH ACUTE
+    "\\'{m}"                          : "\u1E3F", // LATIN SMALL LETTER M WITH ACUTE
+    "\\.{M}"                          : "\u1E40", // LATIN CAPITAL LETTER M WITH DOT ABOVE
+    "\\.{m}"                          : "\u1E41", // LATIN SMALL LETTER M WITH DOT ABOVE
+    "\\d{M}"                          : "\u1E42", // LATIN CAPITAL LETTER M WITH DOT BELOW
+    "\\d{m}"                          : "\u1E43", // LATIN SMALL LETTER M WITH DOT BELOW
+    "\\.{N}"                          : "\u1E44", // LATIN CAPITAL LETTER N WITH DOT ABOVE
+    "\\.{n}"                          : "\u1E45", // LATIN SMALL LETTER N WITH DOT ABOVE
+    "\\d{N}"                          : "\u1E46", // LATIN CAPITAL LETTER N WITH DOT BELOW
+    "\\d{n}"                          : "\u1E47", // LATIN SMALL LETTER N WITH DOT BELOW
+    "\\b{N}"                          : "\u1E48", // LATIN CAPITAL LETTER N WITH LINE BELOW
+    "\\b{n}"                          : "\u1E49", // LATIN SMALL LETTER N WITH LINE BELOW
+    "\\'{P}"                          : "\u1E54", // LATIN CAPITAL LETTER P WITH ACUTE
+    "\\'{p}"                          : "\u1E55", // LATIN SMALL LETTER P WITH ACUTE
+    "\\.{P}"                          : "\u1E56", // LATIN CAPITAL LETTER P WITH DOT ABOVE
+    "\\.{p}"                          : "\u1E57", // LATIN SMALL LETTER P WITH DOT ABOVE
+    "\\.{R}"                          : "\u1E58", // LATIN CAPITAL LETTER R WITH DOT ABOVE
+    "\\.{r}"                          : "\u1E59", // LATIN SMALL LETTER R WITH DOT ABOVE
+    "\\d{R}"                          : "\u1E5A", // LATIN CAPITAL LETTER R WITH DOT BELOW
+    "\\d{r}"                          : "\u1E5B", // LATIN SMALL LETTER R WITH DOT BELOW
+    "\\b{R}"                          : "\u1E5E", // LATIN CAPITAL LETTER R WITH LINE BELOW
+    "\\b{r}"                          : "\u1E5F", // LATIN SMALL LETTER R WITH LINE BELOW
+    "\\.{S}"                          : "\u1E60", // LATIN CAPITAL LETTER S WITH DOT ABOVE
+    "\\.{s}"                          : "\u1E61", // LATIN SMALL LETTER S WITH DOT ABOVE
+    "\\d{S}"                          : "\u1E62", // LATIN CAPITAL LETTER S WITH DOT BELOW
+    "\\d{s}"                          : "\u1E63", // LATIN SMALL LETTER S WITH DOT BELOW
+    "\\.{T}"                          : "\u1E6A", // LATIN CAPITAL LETTER T WITH DOT ABOVE
+    "\\.{t}"                          : "\u1E6B", // LATIN SMALL LETTER T WITH DOT ABOVE
+    "\\d{T}"                          : "\u1E6C", // LATIN CAPITAL LETTER T WITH DOT BELOW
+    "\\d{t}"                          : "\u1E6D", // LATIN SMALL LETTER T WITH DOT BELOW
+    "\\b{T}"                          : "\u1E6E", // LATIN CAPITAL LETTER T WITH LINE BELOW
+    "\\b{t}"                          : "\u1E6F", // LATIN SMALL LETTER T WITH LINE BELOW
+    "\\~{V}"                          : "\u1E7C", // LATIN CAPITAL LETTER V WITH TILDE
+    "\\~{v}"                          : "\u1E7D", // LATIN SMALL LETTER V WITH TILDE
+    "\\d{V}"                          : "\u1E7E", // LATIN CAPITAL LETTER V WITH DOT BELOW
+    "\\d{v}"                          : "\u1E7F", // LATIN SMALL LETTER V WITH DOT BELOW
+    "\\`{W}"                          : "\u1E80", // LATIN CAPITAL LETTER W WITH GRAVE
+    "\\`{w}"                          : "\u1E81", // LATIN SMALL LETTER W WITH GRAVE
+    "\\'{W}"                          : "\u1E82", // LATIN CAPITAL LETTER W WITH ACUTE
+    "\\'{w}"                          : "\u1E83", // LATIN SMALL LETTER W WITH ACUTE
+    "\\\"{W}"                         : "\u1E84", // LATIN CAPITAL LETTER W WITH DIAERESIS
+    "\\\"{w}"                         : "\u1E85", // LATIN SMALL LETTER W WITH DIAERESIS
+    "\\.{W}"                          : "\u1E86", // LATIN CAPITAL LETTER W WITH DOT ABOVE
+    "\\.{w}"                          : "\u1E87", // LATIN SMALL LETTER W WITH DOT ABOVE
+    "\\d{W}"                          : "\u1E88", // LATIN CAPITAL LETTER W WITH DOT BELOW
+    "\\d{w}"                          : "\u1E89", // LATIN SMALL LETTER W WITH DOT BELOW
+    "\\.{X}"                          : "\u1E8A", // LATIN CAPITAL LETTER X WITH DOT ABOVE
+    "\\.{x}"                          : "\u1E8B", // LATIN SMALL LETTER X WITH DOT ABOVE
+    "\\\"{X}"                         : "\u1E8C", // LATIN CAPITAL LETTER X WITH DIAERESIS
+    "\\\"{x}"                         : "\u1E8D", // LATIN SMALL LETTER X WITH DIAERESIS
+    "\\.{Y}"                          : "\u1E8E", // LATIN CAPITAL LETTER Y WITH DOT ABOVE
+    "\\.{y}"                          : "\u1E8F", // LATIN SMALL LETTER Y WITH DOT ABOVE
+    "\\^{Z}"                          : "\u1E90", // LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+    "\\^{z}"                          : "\u1E91", // LATIN SMALL LETTER Z WITH CIRCUMFLEX
+    "\\d{Z}"                          : "\u1E92", // LATIN CAPITAL LETTER Z WITH DOT BELOW
+    "\\d{z}"                          : "\u1E93", // LATIN SMALL LETTER Z WITH DOT BELOW
+    "\\b{Z}"                          : "\u1E94", // LATIN CAPITAL LETTER Z WITH LINE BELOW
+    "\\b{z}"                          : "\u1E95", // LATIN SMALL LETTER Z WITH LINE BELOW
+    "\\b{h}"                          : "\u1E96", // LATIN SMALL LETTER H WITH LINE BELOW
+    "\\\"{t}"                         : "\u1E97", // LATIN SMALL LETTER T WITH DIAERESIS
+    "\\d{A}"                          : "\u1EA0", // LATIN CAPITAL LETTER A WITH DOT BELOW
+    "\\d{a}"                          : "\u1EA1", // LATIN SMALL LETTER A WITH DOT BELOW
+    "\\d{E}"                          : "\u1EB8", // LATIN CAPITAL LETTER E WITH DOT BELOW
+    "\\d{e}"                          : "\u1EB9", // LATIN SMALL LETTER E WITH DOT BELOW
+    "\\~{E}"                          : "\u1EBC", // LATIN CAPITAL LETTER E WITH TILDE
+    "\\~{e}"                          : "\u1EBD", // LATIN SMALL LETTER E WITH TILDE
+    "\\d{I}"                          : "\u1ECA", // LATIN CAPITAL LETTER I WITH DOT BELOW
+    "\\d{i}"                          : "\u1ECB", // LATIN SMALL LETTER I WITH DOT BELOW
+    "\\d{O}"                          : "\u1ECC", // LATIN CAPITAL LETTER O WITH DOT BELOW
+    "\\d{o}"                          : "\u1ECD", // LATIN SMALL LETTER O WITH DOT BELOW
+    "\\d{U}"                          : "\u1EE4", // LATIN CAPITAL LETTER U WITH DOT BELOW
+    "\\d{u}"                          : "\u1EE5", // LATIN SMALL LETTER U WITH DOT BELOW
+    "\\`{Y}"                          : "\u1EF2", // LATIN CAPITAL LETTER Y WITH GRAVE
+    "\\`{y}"                          : "\u1EF3", // LATIN SMALL LETTER Y WITH GRAVE
+    "\\d{Y}"                          : "\u1EF4", // LATIN CAPITAL LETTER Y WITH DOT BELOW
+    "\\d{y}"                          : "\u1EF5", // LATIN SMALL LETTER Y WITH DOT BELOW
+    "\\~{Y}"                          : "\u1EF8", // LATIN CAPITAL LETTER Y WITH TILDE
+    "\\~{y}"                          : "\u1EF9", // LATIN SMALL LETTER Y WITH TILDE
 };
 
 var alwaysMap = {
@@ -1649,16 +1652,16 @@
 	if(value.length > 1) {
 		// replace accented characters (yucky slow)
 		value = value.replace(/{(\\[`"'^~=a-z])([A-Za-z])}/g, "$1{$2}");
-		for (var i in reversemappingTable) { // really really slow!
-			var mapped = reversemappingTable[i];
+		for (var mapped in reversemappingTable) { // really really slow!
+			var unicode = reversemappingTable[mapped];
 			if (value.indexOf(mapped) != -1) {
-				Zotero.debug("Replace " + mapped + " in " + value + " with " + i);
-				value = value.replace(mapped, i, "g");
+				Zotero.debug("Replace " + mapped + " in " + value + " with " + unicode);
+				value = value.replace(mapped, unicode, "g");
 			}
 			mapped = mapped.replace(/[{}]/, "");
 			if (value.indexOf(mapped) != -1) {
-				Zotero.debug("Replace(2) " + mapped + " in " + value + " with " + i);
-				value = value.replace(mapped, i, "g");
+				Zotero.debug("Replace(2) " + mapped + " in " + value + " with " + unicode);
+				value = value.replace(mapped, unicode, "g");
 			}
 		}
 		
@@ -1785,6 +1788,8 @@
 	if(!isMacro) Zotero.write("{");
 	// I hope these are all the escape characters!
 	value = value.replace(/[|\<\>\~\^\\]/g, mapEscape).replace(/([\#\$\%\&\_])/g, "\\$1");
+	// Case of words with uppercase characters in non-initial positions is preserved with braces.
+	if(!isMacro) value = value.replace(/([^\s]+[A-Z][^\s]*)/g, "{$1}");
 	if (!Zotero.getOption("UTF8")) {
 		value = value.replace(/[\u0080-\uFFFF]/g, mapAccent);
 	}
@@ -1990,4 +1995,4 @@
 		}		
 		Zotero.write("\n}");
 	}
-}
\ No newline at end of file
+}
