Home Explore Help
Sign In
swflint
/
org-mode-mirror
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ox-html: Fix meta tag output for properties

* lisp/ox-html.el (org-html--build-meta-info): Fix output of meta tags
  when properties are present.

Reported-by: Kyle Machulis <kyle@nonpolynomial.com>
Nicolas Goaziou 11 years ago
parent
fe1289b382
commit
1ad8f4a01e
1 changed files with 18 additions and 15 deletions
Split View Show Diff Stats
  1. 18 15
      lisp/ox-html.el

+ 18 - 15
lisp/ox-html.el
View File 

@@ -1535,23 +1535,26 @@ INFO is a plist used as a communication channel."
 
      (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")
 
+	  (concat
 
+	   (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")
 
+	  (concat
 
+	   (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"))))
 
+	  (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 <head>..</head> of the HTML output.