From d0a54cffe8445c2b02b6a150c38ab12c6251bcc7 Mon Sep 17 00:00:00 2001 From: Kyle Machulis Date: Sat, 1 Jun 2013 15:04:14 -0700 Subject: [PATCH] ox-html.el: Fix output of meta tags when properties are present * lisp/ox-html.el (org-html--build-meta-info): Fix output of meta tags when properties are present TINYCHANGE --- lisp/ox-html.el | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index facd84c..5e4ad7b 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -1518,24 +1518,25 @@ INFO is a plist used as a communication channel." charset) "\n" (org-html-close-tag "meta" " name=\"generator\" content=\"Org-mode\"" info) "\n" - (and (org-string-nw-p author) - (org-html-close-tag "meta" - (format " name=\"author\" content=\"%s\"" - (funcall protect-string author)) - info) - "\n") - (and (org-string-nw-p description) - (org-html-close-tag "meta" - (format " name=\"description\" content=\"%s\"\n" - (funcall protect-string description)) - info) - "\n") - (and (org-string-nw-p keywords) - (org-html-close-tag "meta" - (format " name=\"keywords\" content=\"%s\"" - (funcall protect-string keywords)) - info) - "\n")))) + + (when (org-string-nw-p author) + (concat (org-html-close-tag "meta" + (format " name=\"author\" content=\"%s\"" + (funcall protect-string author)) + info) + "\n")) + (when (org-string-nw-p description) + (concat (org-html-close-tag "meta" + (format " name=\"description\" content=\"%s\"" + (funcall protect-string description)) + info) + "\n")) + (when (org-string-nw-p keywords) + (concat (org-html-close-tag "meta" + (format " name=\"keywords\" content=\"%s\"" + (funcall protect-string keywords)) + info) + "\n"))))) (defun org-html--build-head (info) "Return information for the .. of the HTML output. -- 1.8.2.3