From 8e11cc3db0357bca5c63340fd90cc342ff9a6c13 Mon Sep 17 00:00:00 2001
From: Niklas Fasching <niklas.fasching@gmail.com>
Date: Thu, 28 Apr 2022 18:09:42 +0200
Subject: [PATCH] Fix html entities: support \<entity>{} and prevent partial
 replacements

---
 org/html_entity.go             | 853 +++++++++++++++++----------------
 org/testdata/inline.html       |   7 +
 org/testdata/inline.org        |   3 +
 org/testdata/inline.pretty_org |   3 +
 4 files changed, 447 insertions(+), 419 deletions(-)

diff --git a/org/html_entity.go b/org/html_entity.go
index 484059b..cbcd2d8 100644
--- a/org/html_entity.go
+++ b/org/html_entity.go
@@ -1,16 +1,28 @@
 package org
 
-import "strings"
+import (
+	"sort"
+	"strings"
+)
 
 var htmlEntityReplacer *strings.Replacer
 
 func init() {
 	htmlEntities = append(htmlEntities,
-		"---", "—",
-		"--", "–",
-		"...", "…",
+		[]string{"---", "—"},
+		[]string{"--", "–"},
+		[]string{"...", "…"},
 	)
-	htmlEntityReplacer = strings.NewReplacer(htmlEntities...)
+	// replace longer entities first to prevent partial replacements (e.g. \angle as \ang + le)
+	sort.Slice(htmlEntities, func(i, j int) bool {
+		return len(htmlEntities[i][0]) > len(htmlEntities[j][0])
+	})
+	xs := make([]string, len(htmlEntities)*2)
+	for _, kv := range htmlEntities {
+		// replace both \<entity> and \<entity>{}
+		xs = append(xs, kv[0]+"{}", kv[1], kv[0], kv[1])
+	}
+	htmlEntityReplacer = strings.NewReplacer(xs...)
 }
 
 /*
@@ -18,420 +30,423 @@ Generated & copied over using the following elisp
 (Setting up go generate seems like a waste for now - I call YAGNI on that one)
 
 (insert (mapconcat
-         (lambda (entity) (concat "`\\" (car entity) "`, `" (nth 6 entity) "`")) ; entity -> utf8
-         (remove-if-not 'listp org-entities)
+         (lambda (entity) (concat "{`\\" (car entity) "`, `" (nth 6 entity) "`}")) ; entity -> utf8
+         (cl-remove-if-not 'listp org-entities)
          ",\n"))
 */
-var htmlEntities = []string{
-	`\Agrave`, `À`,
-	`\agrave`, `à`,
-	`\Aacute`, `Á`,
-	`\aacute`, `á`,
-	`\Acirc`, `Â`,
-	`\acirc`, `â`,
-	`\Amacr`, `Ã`,
-	`\amacr`, `ã`,
-	`\Atilde`, `Ã`,
-	`\atilde`, `ã`,
-	`\Auml`, `Ä`,
-	`\auml`, `ä`,
-	`\Aring`, `Å`,
-	`\AA`, `Å`,
-	`\aring`, `å`,
-	`\AElig`, `Æ`,
-	`\aelig`, `æ`,
-	`\Ccedil`, `Ç`,
-	`\ccedil`, `ç`,
-	`\Egrave`, `È`,
-	`\egrave`, `è`,
-	`\Eacute`, `É`,
-	`\eacute`, `é`,
-	`\Ecirc`, `Ê`,
-	`\ecirc`, `ê`,
-	`\Euml`, `Ë`,
-	`\euml`, `ë`,
-	`\Igrave`, `Ì`,
-	`\igrave`, `ì`,
-	`\Iacute`, `Í`,
-	`\iacute`, `í`,
-	`\Icirc`, `Î`,
-	`\icirc`, `î`,
-	`\Iuml`, `Ï`,
-	`\iuml`, `ï`,
-	`\Ntilde`, `Ñ`,
-	`\ntilde`, `ñ`,
-	`\Ograve`, `Ò`,
-	`\ograve`, `ò`,
-	`\Oacute`, `Ó`,
-	`\oacute`, `ó`,
-	`\Ocirc`, `Ô`,
-	`\ocirc`, `ô`,
-	`\Otilde`, `Õ`,
-	`\otilde`, `õ`,
-	`\Ouml`, `Ö`,
-	`\ouml`, `ö`,
-	`\Oslash`, `Ø`,
-	`\oslash`, `ø`,
-	`\OElig`, `Œ`,
-	`\oelig`, `œ`,
-	`\Scaron`, `Š`,
-	`\scaron`, `š`,
-	`\szlig`, `ß`,
-	`\Ugrave`, `Ù`,
-	`\ugrave`, `ù`,
-	`\Uacute`, `Ú`,
-	`\uacute`, `ú`,
-	`\Ucirc`, `Û`,
-	`\ucirc`, `û`,
-	`\Uuml`, `Ü`,
-	`\uuml`, `ü`,
-	`\Yacute`, `Ý`,
-	`\yacute`, `ý`,
-	`\Yuml`, `Ÿ`,
-	`\yuml`, `ÿ`,
-	`\fnof`, `ƒ`,
-	`\real`, `ℜ`,
-	`\image`, `ℑ`,
-	`\weierp`, `℘`,
-	`\ell`, `ℓ`,
-	`\imath`, `ı`,
-	`\jmath`, `ȷ`,
-	`\Alpha`, `Α`,
-	`\alpha`, `α`,
-	`\Beta`, `Β`,
-	`\beta`, `β`,
-	`\Gamma`, `Γ`,
-	`\gamma`, `γ`,
-	`\Delta`, `Δ`,
-	`\delta`, `δ`,
-	`\Epsilon`, `Ε`,
-	`\epsilon`, `ε`,
-	`\varepsilon`, `ε`,
-	`\Zeta`, `Ζ`,
-	`\zeta`, `ζ`,
-	`\Eta`, `Η`,
-	`\eta`, `η`,
-	`\Theta`, `Θ`,
-	`\theta`, `θ`,
-	`\thetasym`, `ϑ`,
-	`\vartheta`, `ϑ`,
-	`\Iota`, `Ι`,
-	`\iota`, `ι`,
-	`\Kappa`, `Κ`,
-	`\kappa`, `κ`,
-	`\Lambda`, `Λ`,
-	`\lambda`, `λ`,
-	`\Mu`, `Μ`,
-	`\mu`, `μ`,
-	`\nu`, `ν`,
-	`\Nu`, `Ν`,
-	`\Xi`, `Ξ`,
-	`\xi`, `ξ`,
-	`\Omicron`, `Ο`,
-	`\omicron`, `ο`,
-	`\Pi`, `Π`,
-	`\pi`, `π`,
-	`\Rho`, `Ρ`,
-	`\rho`, `ρ`,
-	`\Sigma`, `Σ`,
-	`\sigma`, `σ`,
-	`\sigmaf`, `ς`,
-	`\varsigma`, `ς`,
-	`\Tau`, `Τ`,
-	`\Upsilon`, `Υ`,
-	`\upsih`, `ϒ`,
-	`\upsilon`, `υ`,
-	`\Phi`, `Φ`,
-	`\phi`, `ɸ`,
-	`\varphi`, `φ`,
-	`\Chi`, `Χ`,
-	`\chi`, `χ`,
-	`\acutex`, `𝑥́`,
-	`\Psi`, `Ψ`,
-	`\psi`, `ψ`,
-	`\tau`, `τ`,
-	`\Omega`, `Ω`,
-	`\omega`, `ω`,
-	`\piv`, `ϖ`,
-	`\varpi`, `ϖ`,
-	`\partial`, `∂`,
-	`\alefsym`, `ℵ`,
-	`\aleph`, `ℵ`,
-	`\gimel`, `ℷ`,
-	`\beth`, `ב`,
-	`\dalet`, `ד`,
-	`\ETH`, `Ð`,
-	`\eth`, `ð`,
-	`\THORN`, `Þ`,
-	`\thorn`, `þ`,
-	`\dots`, `…`,
-	`\cdots`, `⋯`,
-	`\hellip`, `…`,
-	`\middot`, `·`,
-	`\iexcl`, `¡`,
-	`\iquest`, `¿`,
-	`\shy`, ``,
-	`\ndash`, `–`,
-	`\mdash`, `—`,
-	`\quot`, `"`,
-	`\acute`, `´`,
-	`\ldquo`, `“`,
-	`\rdquo`, `”`,
-	`\bdquo`, `„`,
-	`\lsquo`, `‘`,
-	`\rsquo`, `’`,
-	`\sbquo`, `‚`,
-	`\laquo`, `«`,
-	`\raquo`, `»`,
-	`\lsaquo`, `‹`,
-	`\rsaquo`, `›`,
-	`\circ`, `∘`,
-	`\vert`, `|`,
-	`\vbar`, `|`,
-	`\brvbar`, `¦`,
-	`\S`, `§`,
-	`\sect`, `§`,
-	`\amp`, `&`,
-	`\lt`, `<`,
-	`\gt`, `>`,
-	`\tilde`, `~`,
-	`\slash`, `/`,
-	`\plus`, `+`,
-	`\under`, `_`,
-	`\equal`, `=`,
-	`\asciicirc`, `^`,
-	`\dagger`, `†`,
-	`\dag`, `†`,
-	`\Dagger`, `‡`,
-	`\ddag`, `‡`,
-	`\nbsp`, ` `,
-	`\ensp`, ` `,
-	`\emsp`, ` `,
-	`\thinsp`, ` `,
-	`\curren`, `¤`,
-	`\cent`, `¢`,
-	`\pound`, `£`,
-	`\yen`, `¥`,
-	`\euro`, `€`,
-	`\EUR`, `€`,
-	`\dollar`, `$`,
-	`\USD`, `$`,
-	`\copy`, `©`,
-	`\reg`, `®`,
-	`\trade`, `™`,
-	`\minus`, `−`,
-	`\pm`, `±`,
-	`\plusmn`, `±`,
-	`\times`, `×`,
-	`\frasl`, `⁄`,
-	`\colon`, `:`,
-	`\div`, `÷`,
-	`\frac12`, `½`,
-	`\frac14`, `¼`,
-	`\frac34`, `¾`,
-	`\permil`, `‰`,
-	`\sup1`, `¹`,
-	`\sup2`, `²`,
-	`\sup3`, `³`,
-	`\radic`, `√`,
-	`\sum`, `∑`,
-	`\prod`, `∏`,
-	`\micro`, `µ`,
-	`\macr`, `¯`,
-	`\deg`, `°`,
-	`\prime`, `′`,
-	`\Prime`, `″`,
-	`\infin`, `∞`,
-	`\infty`, `∞`,
-	`\prop`, `∝`,
-	`\propto`, `∝`,
-	`\not`, `¬`,
-	`\neg`, `¬`,
-	`\land`, `∧`,
-	`\wedge`, `∧`,
-	`\lor`, `∨`,
-	`\vee`, `∨`,
-	`\cap`, `∩`,
-	`\cup`, `∪`,
-	`\smile`, `⌣`,
-	`\frown`, `⌢`,
-	`\int`, `∫`,
-	`\therefore`, `∴`,
-	`\there4`, `∴`,
-	`\because`, `∵`,
-	`\sim`, `∼`,
-	`\cong`, `≅`,
-	`\simeq`, `≅`,
-	`\asymp`, `≈`,
-	`\approx`, `≈`,
-	`\ne`, `≠`,
-	`\neq`, `≠`,
-	`\equiv`, `≡`,
-	`\triangleq`, `≜`,
-	`\le`, `≤`,
-	`\leq`, `≤`,
-	`\ge`, `≥`,
-	`\geq`, `≥`,
-	`\lessgtr`, `≶`,
-	`\lesseqgtr`, `⋚`,
-	`\ll`, `≪`,
-	`\Ll`, `⋘`,
-	`\lll`, `⋘`,
-	`\gg`, `≫`,
-	`\Gg`, `⋙`,
-	`\ggg`, `⋙`,
-	`\prec`, `≺`,
-	`\preceq`, `≼`,
-	`\preccurlyeq`, `≼`,
-	`\succ`, `≻`,
-	`\succeq`, `≽`,
-	`\succcurlyeq`, `≽`,
-	`\sub`, `⊂`,
-	`\subset`, `⊂`,
-	`\sup`, `⊃`,
-	`\supset`, `⊃`,
-	`\nsub`, `⊄`,
-	`\sube`, `⊆`,
-	`\nsup`, `⊅`,
-	`\supe`, `⊇`,
-	`\setminus`, `⧵`,
-	`\forall`, `∀`,
-	`\exist`, `∃`,
-	`\exists`, `∃`,
-	`\nexist`, `∄`,
-	`\nexists`, `∄`,
-	`\empty`, `∅`,
-	`\emptyset`, `∅`,
-	`\isin`, `∈`,
-	`\in`, `∈`,
-	`\notin`, `∉`,
-	`\ni`, `∋`,
-	`\nabla`, `∇`,
-	`\ang`, `∠`,
-	`\angle`, `∠`,
-	`\perp`, `⊥`,
-	`\parallel`, `∥`,
-	`\sdot`, `⋅`,
-	`\cdot`, `⋅`,
-	`\lceil`, `⌈`,
-	`\rceil`, `⌉`,
-	`\lfloor`, `⌊`,
-	`\rfloor`, `⌋`,
-	`\lang`, `⟨`,
-	`\rang`, `⟩`,
-	`\langle`, `⟨`,
-	`\rangle`, `⟩`,
-	`\hbar`, `ℏ`,
-	`\mho`, `℧`,
-	`\larr`, `←`,
-	`\leftarrow`, `←`,
-	`\gets`, `←`,
-	`\lArr`, `⇐`,
-	`\Leftarrow`, `⇐`,
-	`\uarr`, `↑`,
-	`\uparrow`, `↑`,
-	`\uArr`, `⇑`,
-	`\Uparrow`, `⇑`,
-	`\rarr`, `→`,
-	`\to`, `→`,
-	`\rightarrow`, `→`,
-	`\rArr`, `⇒`,
-	`\Rightarrow`, `⇒`,
-	`\darr`, `↓`,
-	`\downarrow`, `↓`,
-	`\dArr`, `⇓`,
-	`\Downarrow`, `⇓`,
-	`\harr`, `↔`,
-	`\leftrightarrow`, `↔`,
-	`\hArr`, `⇔`,
-	`\Leftrightarrow`, `⇔`,
-	`\crarr`, `↵`,
-	`\hookleftarrow`, `↵`,
-	`\arccos`, `arccos`,
-	`\arcsin`, `arcsin`,
-	`\arctan`, `arctan`,
-	`\arg`, `arg`,
-	`\cos`, `cos`,
-	`\cosh`, `cosh`,
-	`\cot`, `cot`,
-	`\coth`, `coth`,
-	`\csc`, `csc`,
-	`\deg`, `deg`,
-	`\det`, `det`,
-	`\dim`, `dim`,
-	`\exp`, `exp`,
-	`\gcd`, `gcd`,
-	`\hom`, `hom`,
-	`\inf`, `inf`,
-	`\ker`, `ker`,
-	`\lg`, `lg`,
-	`\lim`, `lim`,
-	`\liminf`, `liminf`,
-	`\limsup`, `limsup`,
-	`\ln`, `ln`,
-	`\log`, `log`,
-	`\max`, `max`,
-	`\min`, `min`,
-	`\Pr`, `Pr`,
-	`\sec`, `sec`,
-	`\sin`, `sin`,
-	`\sinh`, `sinh`,
-	`\sup`, `sup`,
-	`\tan`, `tan`,
-	`\tanh`, `tanh`,
-	`\bull`, `•`,
-	`\bullet`, `•`,
-	`\star`, `⋆`,
-	`\lowast`, `∗`,
-	`\ast`, `*`,
-	`\odot`, `ʘ`,
-	`\oplus`, `⊕`,
-	`\otimes`, `⊗`,
-	`\check`, `✓`,
-	`\checkmark`, `✓`,
-	`\para`, `¶`,
-	`\ordf`, `ª`,
-	`\ordm`, `º`,
-	`\cedil`, `¸`,
-	`\oline`, `‾`,
-	`\uml`, `¨`,
-	`\zwnj`, `‌`,
-	`\zwj`, `‍`,
-	`\lrm`, `‎`,
-	`\rlm`, `‏`,
-	`\smiley`, `☺`,
-	`\blacksmile`, `☻`,
-	`\sad`, `☹`,
-	`\frowny`, `☹`,
-	`\clubs`, `♣`,
-	`\clubsuit`, `♣`,
-	`\spades`, `♠`,
-	`\spadesuit`, `♠`,
-	`\hearts`, `♥`,
-	`\heartsuit`, `♥`,
-	`\diams`, `◆`,
-	`\diamondsuit`, `◆`,
-	`\diamond`, `◆`,
-	`\Diamond`, `◆`,
-	`\loz`, `⧫`,
-	`\_ `, ` `,
-	`\_  `, `  `,
-	`\_   `, `   `,
-	`\_    `, `    `,
-	`\_     `, `     `,
-	`\_      `, `      `,
-	`\_       `, `       `,
-	`\_        `, `        `,
-	`\_         `, `         `,
-	`\_          `, `          `,
-	`\_           `, `           `,
-	`\_            `, `            `,
-	`\_             `, `             `,
-	`\_              `, `              `,
-	`\_               `, `               `,
-	`\_                `, `                `,
-	`\_                 `, `                 `,
-	`\_                  `, `                  `,
-	`\_                   `, `                   `,
-	`\_                    `, `                    `,
+
+var htmlEntities = [][]string{
+	{`\Agrave`, `À`},
+	{`\agrave`, `à`},
+	{`\Aacute`, `Á`},
+	{`\aacute`, `á`},
+	{`\Acirc`, `Â`},
+	{`\acirc`, `â`},
+	{`\Amacr`, `Ã`},
+	{`\amacr`, `ã`},
+	{`\Atilde`, `Ã`},
+	{`\atilde`, `ã`},
+	{`\Auml`, `Ä`},
+	{`\auml`, `ä`},
+	{`\Aring`, `Å`},
+	{`\AA`, `Å`},
+	{`\aring`, `å`},
+	{`\AElig`, `Æ`},
+	{`\aelig`, `æ`},
+	{`\Ccedil`, `Ç`},
+	{`\ccedil`, `ç`},
+	{`\Egrave`, `È`},
+	{`\egrave`, `è`},
+	{`\Eacute`, `É`},
+	{`\eacute`, `é`},
+	{`\Ecirc`, `Ê`},
+	{`\ecirc`, `ê`},
+	{`\Euml`, `Ë`},
+	{`\euml`, `ë`},
+	{`\Igrave`, `Ì`},
+	{`\igrave`, `ì`},
+	{`\Iacute`, `Í`},
+	{`\iacute`, `í`},
+	{`\Idot`, `İ`},
+	{`\inodot`, `ı`},
+	{`\Icirc`, `Î`},
+	{`\icirc`, `î`},
+	{`\Iuml`, `Ï`},
+	{`\iuml`, `ï`},
+	{`\Ntilde`, `Ñ`},
+	{`\ntilde`, `ñ`},
+	{`\Ograve`, `Ò`},
+	{`\ograve`, `ò`},
+	{`\Oacute`, `Ó`},
+	{`\oacute`, `ó`},
+	{`\Ocirc`, `Ô`},
+	{`\ocirc`, `ô`},
+	{`\Otilde`, `Õ`},
+	{`\otilde`, `õ`},
+	{`\Ouml`, `Ö`},
+	{`\ouml`, `ö`},
+	{`\Oslash`, `Ø`},
+	{`\oslash`, `ø`},
+	{`\OElig`, `Œ`},
+	{`\oelig`, `œ`},
+	{`\Scaron`, `Š`},
+	{`\scaron`, `š`},
+	{`\szlig`, `ß`},
+	{`\Ugrave`, `Ù`},
+	{`\ugrave`, `ù`},
+	{`\Uacute`, `Ú`},
+	{`\uacute`, `ú`},
+	{`\Ucirc`, `Û`},
+	{`\ucirc`, `û`},
+	{`\Uuml`, `Ü`},
+	{`\uuml`, `ü`},
+	{`\Yacute`, `Ý`},
+	{`\yacute`, `ý`},
+	{`\Yuml`, `Ÿ`},
+	{`\yuml`, `ÿ`},
+	{`\fnof`, `ƒ`},
+	{`\real`, `ℜ`},
+	{`\image`, `ℑ`},
+	{`\weierp`, `℘`},
+	{`\ell`, `ℓ`},
+	{`\imath`, `ı`},
+	{`\jmath`, `ȷ`},
+	{`\Alpha`, `Α`},
+	{`\alpha`, `α`},
+	{`\Beta`, `Β`},
+	{`\beta`, `β`},
+	{`\Gamma`, `Γ`},
+	{`\gamma`, `γ`},
+	{`\Delta`, `Δ`},
+	{`\delta`, `δ`},
+	{`\Epsilon`, `Ε`},
+	{`\epsilon`, `ε`},
+	{`\varepsilon`, `ε`},
+	{`\Zeta`, `Ζ`},
+	{`\zeta`, `ζ`},
+	{`\Eta`, `Η`},
+	{`\eta`, `η`},
+	{`\Theta`, `Θ`},
+	{`\theta`, `θ`},
+	{`\thetasym`, `ϑ`},
+	{`\vartheta`, `ϑ`},
+	{`\Iota`, `Ι`},
+	{`\iota`, `ι`},
+	{`\Kappa`, `Κ`},
+	{`\kappa`, `κ`},
+	{`\Lambda`, `Λ`},
+	{`\lambda`, `λ`},
+	{`\Mu`, `Μ`},
+	{`\mu`, `μ`},
+	{`\nu`, `ν`},
+	{`\Nu`, `Ν`},
+	{`\Xi`, `Ξ`},
+	{`\xi`, `ξ`},
+	{`\Omicron`, `Ο`},
+	{`\omicron`, `ο`},
+	{`\Pi`, `Π`},
+	{`\pi`, `π`},
+	{`\Rho`, `Ρ`},
+	{`\rho`, `ρ`},
+	{`\Sigma`, `Σ`},
+	{`\sigma`, `σ`},
+	{`\sigmaf`, `ς`},
+	{`\varsigma`, `ς`},
+	{`\Tau`, `Τ`},
+	{`\Upsilon`, `Υ`},
+	{`\upsih`, `ϒ`},
+	{`\upsilon`, `υ`},
+	{`\Phi`, `Φ`},
+	{`\phi`, `ɸ`},
+	{`\varphi`, `φ`},
+	{`\Chi`, `Χ`},
+	{`\chi`, `χ`},
+	{`\acutex`, `𝑥́`},
+	{`\Psi`, `Ψ`},
+	{`\psi`, `ψ`},
+	{`\tau`, `τ`},
+	{`\Omega`, `Ω`},
+	{`\omega`, `ω`},
+	{`\piv`, `ϖ`},
+	{`\varpi`, `ϖ`},
+	{`\partial`, `∂`},
+	{`\alefsym`, `ℵ`},
+	{`\aleph`, `ℵ`},
+	{`\gimel`, `ℷ`},
+	{`\beth`, `ב`},
+	{`\dalet`, `ד`},
+	{`\ETH`, `Ð`},
+	{`\eth`, `ð`},
+	{`\THORN`, `Þ`},
+	{`\thorn`, `þ`},
+	{`\dots`, `…`},
+	{`\cdots`, `⋯`},
+	{`\hellip`, `…`},
+	{`\middot`, `·`},
+	{`\iexcl`, `¡`},
+	{`\iquest`, `¿`},
+	{`\shy`, ``},
+	{`\ndash`, `–`},
+	{`\mdash`, `—`},
+	{`\quot`, `"`},
+	{`\acute`, `´`},
+	{`\ldquo`, `“`},
+	{`\rdquo`, `”`},
+	{`\bdquo`, `„`},
+	{`\lsquo`, `‘`},
+	{`\rsquo`, `’`},
+	{`\sbquo`, `‚`},
+	{`\laquo`, `«`},
+	{`\raquo`, `»`},
+	{`\lsaquo`, `‹`},
+	{`\rsaquo`, `›`},
+	{`\circ`, `∘`},
+	{`\vert`, `|`},
+	{`\vbar`, `|`},
+	{`\brvbar`, `¦`},
+	{`\S`, `§`},
+	{`\sect`, `§`},
+	{`\amp`, `&`},
+	{`\lt`, `<`},
+	{`\gt`, `>`},
+	{`\tilde`, `~`},
+	{`\slash`, `/`},
+	{`\plus`, `+`},
+	{`\under`, `_`},
+	{`\equal`, `=`},
+	{`\asciicirc`, `^`},
+	{`\dagger`, `†`},
+	{`\dag`, `†`},
+	{`\Dagger`, `‡`},
+	{`\ddag`, `‡`},
+	{`\nbsp`, ` `},
+	{`\ensp`, ` `},
+	{`\emsp`, ` `},
+	{`\thinsp`, ` `},
+	{`\curren`, `¤`},
+	{`\cent`, `¢`},
+	{`\pound`, `£`},
+	{`\yen`, `¥`},
+	{`\euro`, `€`},
+	{`\EUR`, `€`},
+	{`\dollar`, `$`},
+	{`\USD`, `$`},
+	{`\copy`, `©`},
+	{`\reg`, `®`},
+	{`\trade`, `™`},
+	{`\minus`, `−`},
+	{`\pm`, `±`},
+	{`\plusmn`, `±`},
+	{`\times`, `×`},
+	{`\frasl`, `⁄`},
+	{`\colon`, `:`},
+	{`\div`, `÷`},
+	{`\frac12`, `½`},
+	{`\frac14`, `¼`},
+	{`\frac34`, `¾`},
+	{`\permil`, `‰`},
+	{`\sup1`, `¹`},
+	{`\sup2`, `²`},
+	{`\sup3`, `³`},
+	{`\radic`, `√`},
+	{`\sum`, `∑`},
+	{`\prod`, `∏`},
+	{`\micro`, `µ`},
+	{`\macr`, `¯`},
+	{`\deg`, `°`},
+	{`\prime`, `′`},
+	{`\Prime`, `″`},
+	{`\infin`, `∞`},
+	{`\infty`, `∞`},
+	{`\prop`, `∝`},
+	{`\propto`, `∝`},
+	{`\not`, `¬`},
+	{`\neg`, `¬`},
+	{`\land`, `∧`},
+	{`\wedge`, `∧`},
+	{`\lor`, `∨`},
+	{`\vee`, `∨`},
+	{`\cap`, `∩`},
+	{`\cup`, `∪`},
+	{`\smile`, `⌣`},
+	{`\frown`, `⌢`},
+	{`\int`, `∫`},
+	{`\therefore`, `∴`},
+	{`\there4`, `∴`},
+	{`\because`, `∵`},
+	{`\sim`, `∼`},
+	{`\cong`, `≅`},
+	{`\simeq`, `≅`},
+	{`\asymp`, `≈`},
+	{`\approx`, `≈`},
+	{`\ne`, `≠`},
+	{`\neq`, `≠`},
+	{`\equiv`, `≡`},
+	{`\triangleq`, `≜`},
+	{`\le`, `≤`},
+	{`\leq`, `≤`},
+	{`\ge`, `≥`},
+	{`\geq`, `≥`},
+	{`\lessgtr`, `≶`},
+	{`\lesseqgtr`, `⋚`},
+	{`\ll`, `≪`},
+	{`\Ll`, `⋘`},
+	{`\lll`, `⋘`},
+	{`\gg`, `≫`},
+	{`\Gg`, `⋙`},
+	{`\ggg`, `⋙`},
+	{`\prec`, `≺`},
+	{`\preceq`, `≼`},
+	{`\preccurlyeq`, `≼`},
+	{`\succ`, `≻`},
+	{`\succeq`, `≽`},
+	{`\succcurlyeq`, `≽`},
+	{`\sub`, `⊂`},
+	{`\subset`, `⊂`},
+	{`\sup`, `⊃`},
+	{`\supset`, `⊃`},
+	{`\nsub`, `⊄`},
+	{`\sube`, `⊆`},
+	{`\nsup`, `⊅`},
+	{`\supe`, `⊇`},
+	{`\setminus`, `⧵`},
+	{`\forall`, `∀`},
+	{`\exist`, `∃`},
+	{`\exists`, `∃`},
+	{`\nexist`, `∄`},
+	{`\nexists`, `∄`},
+	{`\empty`, `∅`},
+	{`\emptyset`, `∅`},
+	{`\isin`, `∈`},
+	{`\in`, `∈`},
+	{`\notin`, `∉`},
+	{`\ni`, `∋`},
+	{`\nabla`, `∇`},
+	{`\ang`, `∠`},
+	{`\angle`, `∠`},
+	{`\perp`, `⊥`},
+	{`\parallel`, `∥`},
+	{`\sdot`, `⋅`},
+	{`\cdot`, `⋅`},
+	{`\lceil`, `⌈`},
+	{`\rceil`, `⌉`},
+	{`\lfloor`, `⌊`},
+	{`\rfloor`, `⌋`},
+	{`\lang`, `⟨`},
+	{`\rang`, `⟩`},
+	{`\langle`, `⟨`},
+	{`\rangle`, `⟩`},
+	{`\hbar`, `ℏ`},
+	{`\mho`, `℧`},
+	{`\larr`, `←`},
+	{`\leftarrow`, `←`},
+	{`\gets`, `←`},
+	{`\lArr`, `⇐`},
+	{`\Leftarrow`, `⇐`},
+	{`\uarr`, `↑`},
+	{`\uparrow`, `↑`},
+	{`\uArr`, `⇑`},
+	{`\Uparrow`, `⇑`},
+	{`\rarr`, `→`},
+	{`\to`, `→`},
+	{`\rightarrow`, `→`},
+	{`\rArr`, `⇒`},
+	{`\Rightarrow`, `⇒`},
+	{`\darr`, `↓`},
+	{`\downarrow`, `↓`},
+	{`\dArr`, `⇓`},
+	{`\Downarrow`, `⇓`},
+	{`\harr`, `↔`},
+	{`\leftrightarrow`, `↔`},
+	{`\hArr`, `⇔`},
+	{`\Leftrightarrow`, `⇔`},
+	{`\crarr`, `↵`},
+	{`\hookleftarrow`, `↵`},
+	{`\arccos`, `arccos`},
+	{`\arcsin`, `arcsin`},
+	{`\arctan`, `arctan`},
+	{`\arg`, `arg`},
+	{`\cos`, `cos`},
+	{`\cosh`, `cosh`},
+	{`\cot`, `cot`},
+	{`\coth`, `coth`},
+	{`\csc`, `csc`},
+	{`\deg`, `deg`},
+	{`\det`, `det`},
+	{`\dim`, `dim`},
+	{`\exp`, `exp`},
+	{`\gcd`, `gcd`},
+	{`\hom`, `hom`},
+	{`\inf`, `inf`},
+	{`\ker`, `ker`},
+	{`\lg`, `lg`},
+	{`\lim`, `lim`},
+	{`\liminf`, `liminf`},
+	{`\limsup`, `limsup`},
+	{`\ln`, `ln`},
+	{`\log`, `log`},
+	{`\max`, `max`},
+	{`\min`, `min`},
+	{`\Pr`, `Pr`},
+	{`\sec`, `sec`},
+	{`\sin`, `sin`},
+	{`\sinh`, `sinh`},
+	{`\sup`, `sup`},
+	{`\tan`, `tan`},
+	{`\tanh`, `tanh`},
+	{`\bull`, `•`},
+	{`\bullet`, `•`},
+	{`\star`, `⋆`},
+	{`\lowast`, `∗`},
+	{`\ast`, `*`},
+	{`\odot`, `ʘ`},
+	{`\oplus`, `⊕`},
+	{`\otimes`, `⊗`},
+	{`\check`, `✓`},
+	{`\checkmark`, `✓`},
+	{`\para`, `¶`},
+	{`\ordf`, `ª`},
+	{`\ordm`, `º`},
+	{`\cedil`, `¸`},
+	{`\oline`, `‾`},
+	{`\uml`, `¨`},
+	{`\zwnj`, `‌`},
+	{`\zwj`, `‍`},
+	{`\lrm`, `‎`},
+	{`\rlm`, `‏`},
+	{`\smiley`, `☺`},
+	{`\blacksmile`, `☻`},
+	{`\sad`, `☹`},
+	{`\frowny`, `☹`},
+	{`\clubs`, `♣`},
+	{`\clubsuit`, `♣`},
+	{`\spades`, `♠`},
+	{`\spadesuit`, `♠`},
+	{`\hearts`, `♥`},
+	{`\heartsuit`, `♥`},
+	{`\diams`, `◆`},
+	{`\diamondsuit`, `◆`},
+	{`\diamond`, `◆`},
+	{`\Diamond`, `◆`},
+	{`\loz`, `⧫`},
+	{`\_ `, ` `},
+	{`\_  `, `  `},
+	{`\_   `, `   `},
+	{`\_    `, `    `},
+	{`\_     `, `     `},
+	{`\_      `, `      `},
+	{`\_       `, `       `},
+	{`\_        `, `        `},
+	{`\_         `, `         `},
+	{`\_          `, `          `},
+	{`\_           `, `           `},
+	{`\_            `, `            `},
+	{`\_             `, `             `},
+	{`\_              `, `              `},
+	{`\_               `, `               `},
+	{`\_                `, `                `},
+	{`\_                 `, `                 `},
+	{`\_                  `, `                  `},
+	{`\_                   `, `                   `},
+	{`\_                    `, `                    `},
 }
diff --git a/org/testdata/inline.html b/org/testdata/inline.html
index a4abdc0..b0b886d 100644
--- a/org/testdata/inline.html
+++ b/org/testdata/inline.html
@@ -69,4 +69,11 @@ not emphasized/</li>
 <p><code class="verbatim">#+MACROs</code>: <p><h1>yolo</h1></p>
 </p>
 </li>
+<li>
+<p>org entities</p>
+<ul>
+<li><code class="verbatim">\pi</code> &amp; <code class="verbatim">\pi{}</code> =&gt; π &amp; π</li>
+<li><code class="verbatim">\angle{}</code> &amp; <code class="verbatim">\angle</code> &amp; <code class="verbatim">\ang</code> <code class="verbatim">&gt;</code> ∠ ∠ ∠</li>
+</ul>
+</li>
 </ul>
diff --git a/org/testdata/inline.org b/org/testdata/inline.org
index 9273e7f..a2b486a 100644
--- a/org/testdata/inline.org
+++ b/org/testdata/inline.org
@@ -51,3 +51,6 @@
   - [[example_interpolate_h:tag value with specical chars % : &]] (w/o tag [[example_interpolate_h]])
 - =#+MACROs=: {{{headline(yolo)}}}
   #+MACRO: headline @@html:<h1>$1</h1>@@
+- org entities
+  - =\pi= & =\pi{}= => \pi & \pi{}
+  - =\angle{}= & =\angle= & =\ang= =>= \angle{} \angle \ang
diff --git a/org/testdata/inline.pretty_org b/org/testdata/inline.pretty_org
index 8d82893..dfd0b6a 100644
--- a/org/testdata/inline.pretty_org
+++ b/org/testdata/inline.pretty_org
@@ -51,3 +51,6 @@
   - [[example_interpolate_h:tag value with specical chars % : &]] (w/o tag [[example_interpolate_h]])
 - =#+MACROs=: {{{headline(yolo)}}}
   #+MACRO: headline @@html:<h1>$1</h1>@@
+- org entities
+  - =\pi= & =\pi{}= => \pi & \pi{}
+  - =\angle{}= & =\angle= & =\ang= =>= \angle{} \angle \ang