X-Git-Url: http://gitweb.fperrin.net/?p=atom.el.git;a=blobdiff_plain;f=atom.el;h=c4224b85680ae273b942936da6236319ce99bd89;hp=693c6062e15854cbdbfdca088d0cae19a9c008ac;hb=ed7d99f83fafe4f60eac3d5416212e6c9af010af;hpb=19007bf94bfdd47e342e711b405ca196cc3bd681

diff --git a/atom.el b/atom.el
index 693c606..c4224b8 100644
--- a/atom.el
+++ b/atom.el
@@ -123,7 +123,7 @@ probably not a very good default.
 ID defaults to LINK, which is not optimal; see `atom-generate-id'
 for a way to create good identifiers. For a given entry, it must
 not change between successive generations of the atom feed, even
-when the content of the entry ."
+when the content of the entry changes."
   (let ((entry (list (list 'title nil title))))
     (atom-modify-entry entry 'link  (list (list (cons 'href link))))
     (atom-modify-entry entry 'id (or id link))
@@ -152,8 +152,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.
 
-If CONVERT, translate all links in CONTENT so that they are no
-longer relative to LINK."
+If NOCONVERT is nil, translate all links in CONTENT so that they
+are no longer relative to LINK."
   (let ((xhtml-content (atom-massage-xhtml content)))
     (unless noconvert
       (atom-xhtml-convert-links (cadr xhtml-content) link))
@@ -163,7 +163,7 @@ longer relative to LINK."
 
 (defun atom-print (atom)
   "Print the Atom feed ATOM in the current buffer."
-  (insert "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+  (insert atom-xml-declaration)
   (insert "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n")
   (xml-print atom)
   (insert "\n</feed>"))
@@ -172,7 +172,7 @@ longer relative to LINK."
   "Writes the feed ATOM to FILENAME."
   (with-temp-buffer
     (atom-print atom)
-    (write-region (point-min) (point-max) filename)))
+    (write-file filename)))
 
 
 (defun atom-to-rss (atom)
@@ -223,7 +223,7 @@ Some information may be lost or approximated."
 
 (defun atom-print-as-rss (atom)
   (let ((rss (atom-to-rss atom)))
-    (insert "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
+    (insert atom-xml-declaration)
     (insert "<rss version=\"2.0\">\n")
     (insert "  <channel>\n")
     (xml-print rss "    ")
@@ -233,7 +233,6 @@ Some information may be lost or approximated."
 (defun atom-to-rss-time (time)
   "Translates a string from the format used by Atom into the
 format used by RSS."
-  ;; Same remark as in `atom-format-time'
   (let ((system-time-locale "C"))
     (format-time-string "%a, %d %b %Y %T %z" (atom-parse-time time))))
 
@@ -247,12 +246,16 @@ format used by RSS."
   "Saves ATOM as a RSS feed into FILENAME."
   (with-temp-buffer
     (atom-print-as-rss atom)
-    (write-region nil nil filename)))
+    (write-file filename)))
 
 
 (defvar atom-time-format-string "%Y-%m-%dT%T%z"
   "The format for string representation of dates.")
 
+(defvar atom-xhtml-namespace "http://www.w3.org/1999/xhtml")
+
+(defvar atom-xml-declaration "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+
 (defun atom-format-time (&optional time)
   "Format a time according to RFC3339."
   ;; The time zone must be specified in numeric form, but with a colon between
@@ -263,6 +266,7 @@ format used by RSS."
 
 (defun atom-parse-time (&optional time)
   "Parse a time as specified in RFC3339 into Emacs's native format."
+  ;; Same remark as in `atom-format-time'
   (date-to-time (replace-regexp-in-string ":\\(..\\)$" "\\1" time)))
 
 (defun atom-massage-html (content)
@@ -272,19 +276,25 @@ 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 "<div xmlns=\"http://www.w3.org/1999/xhtml\">")
-    (insert string)
-    (insert "</div>")
-    (xml-parse-region (point-min) (point-max))))
+  (require 'xml-xhtml-entities)
+  (let ((xml-entity-alist xml-xhtml-entities)
+	(xml-validating-parser t))
+    (with-temp-buffer
+      (insert "<div xmlns=\"" atom-xhtml-namespace "\">")
+      (insert string)
+      (insert "</div>")
+      ;; `xml-parse-region' returns a list of elements, even though it
+      ;; requires an only root node. We are only interested in the first
+      ;; one, the DIV we just inserted.
+      (car (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."
-  `(((type . "xhtml"))
-    ,@(or (and (stringp content)
-	       (atom-string-to-xml content))
-	  content)))
+  (list '((type . "xhtml"))
+	(or (and (stringp content)
+		 (atom-string-to-xml content))
+	    `(div ((xmlns . ,atom-xhtml-namespace)) ,@content))))
 
 (defun atom-massage-author (author)
   "Return an XML node representing the author. AUTHOR can be:
@@ -337,10 +347,14 @@ CREATION-DATE of the entry, and the domain part of LINK."
       (url-recreate-url url-base))))
 
 (defun xml-node-as-text (node)
-  "Return a string representing NODEn, an XML structure."
+  "Return a string representing NODE, an XML structure."
   (with-temp-buffer
     (xml-print (xml-node-children node))
     (buffer-string)))
 
+(defun xml-node-create (name attrlist childlist)
+  "Create a new XML node."
+  (list name attrlist . childlist))
+
 (provide 'atom)
 ;;; atom.el ends here