From 2b75d2a99cd209df02c6ee21f69e7499e5dc4a52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Perrin?= Date: Mon, 31 Jan 2011 23:56:04 +0100 Subject: [PATCH] Repair XHTML generation. The string given to us as the content may not contain a root element. So, we always add another
around the content. It could be removed. --- atom.el | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/atom.el b/atom.el index 69179bf..c645cda 100644 --- a/atom.el +++ b/atom.el @@ -148,10 +148,8 @@ when the content of the entry ." be a string enconding a valid HTML fragment. See `atom-add-entry' for additional details." (atom-add-entry atom - title link - (atom-massage-html content) - (and summary (atom-massage-html summary)) - updated id)) + title link (atom-massage-html content) + updated id (and summary (atom-massage-html summary)))) (defun atom-add-xhtml-entry (atom title link content &optional updated id summary) @@ -159,10 +157,8 @@ for additional details." given either as a string, or as an XML tree, of a valid XHTML fragment. See `atom-add-entry' for additional details." (atom-add-entry atom - title link - (atom-massage-xhtml content) - (and summary (atom-massage-xhtml summary)) - updated id)) + title link (atom-massage-xhtml content) + updated id (and summary (atom-massage-xhtml summary)))) (defun atom-print (atom) "Print the Atom feed ATOM in the current buffer." @@ -189,17 +185,18 @@ Atom feed. CONTENT must be a string." (defun atom-string-to-xml (string) "Convert STRING into a Lisp structure as used by `xml.el'." (with-temp-buffer + (insert "
") (insert string) + (insert "
") (xml-parse-region (point-min) (point-max)))) (defun atom-massage-xhtml (content) "Massage CONTENT so it can be used as an XHTML fragment in an Atom feed." - (list '((type . "xhtml")) - `(div ((xmlns . "http://www.w3.org/1999/xhtml")) - ,@(or (and (stringp content) - (atom-string-to-xml content)) - content)))) + `(((type . "xhtml")) + ,@(or (and (stringp content) + (atom-string-to-xml content)) + content))) (defun atom-massage-author (author) "Return an XML node representing the author. AUTHOR can be: -- 2.43.0