From 535366ec1e1819c73bb038712a19f5e1be0a51b7 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Tue, 4 Aug 2015 19:12:00 +0200 Subject: [PATCH 1/4] ox-html: Only translate entities to UTF-8 * ox-html.el (org-html-final-function): Do not check :html-use-unicode-chars. (org-html-entity): Check :html-use-unicode-chars (org-html-use-unicode-chars): Update docstring. Reported-by: Vladimir Alexiev --- lisp/ox-html.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 2c13bf6..c329b72 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -609,10 +609,10 @@ Warning: non-nil may break indentation of source code blocks." :type 'boolean) (defcustom org-html-use-unicode-chars nil - "Non-nil means to use unicode characters instead of HTML entities." + "Non-nil means to use unicode characters for org-entities instead of HTML codes." :group 'org-export-html - :version "24.4" - :package-version '(Org . "8.0") + :version "25.1" + :package-version '(Org . "8.3") :type 'boolean) ;;;; Drawers @@ -2359,7 +2359,9 @@ holding contextual information. See `org-export-data'." "Transcode an ENTITY object from Org to HTML. CONTENTS are the definition itself. INFO is a plist holding contextual information." - (org-element-property :html entity)) + (if (plist-get info :html-use-unicode-chars) + (org-element-property :utf-8 entity) + (org-element-property :html entity))) ;;;; Example Block @@ -3500,9 +3502,6 @@ contextual information." (set-auto-mode t) (if (plist-get info :html-indent) (indent-region (point-min) (point-max))) - (when (plist-get info :html-use-unicode-chars) - (require 'mm-url) - (mm-url-decode-entities)) (buffer-substring-no-properties (point-min) (point-max)))) -- 2.5.0