Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-06-17 12:07:09 +02:00
commit 4295d1b949
1 changed files with 3 additions and 1 deletions

View File

@ -745,6 +745,7 @@ holding contextual information."
("aelig" "@ae{}")
((or "bull" "bullet") "@bullet{}")
("copy" "@copyright{}")
("deg" "@textdegree{}")
((or "dots" "hellip") "@dots{}")
("equiv" "@equiv{}")
((or "euro" "EUR") "@euro{}")
@ -767,11 +768,12 @@ holding contextual information."
("pound" "@pound{}")
("raquo" "@guillemetright{}")
((or "rArr" "Rightarrow") "@result{}")
("reg" "@registeredsymbol{}")
((or "rightarrow" "to" "rarr") "@arrow{}")
("rsaquo" "@guilsinglright{}")
("thorn" "@th{}")
("THORN" "@TH{}")
((and (pred (string-prefix-p "_")) name) ;spacing entities.
((and (pred (string-prefix-p "_")) name) ;spacing entities
(format "@w{%s}" (substring name 1)))
(_ (org-element-property :utf-8 entity))))