GNU bug report logs - #20009
eww-render: misrecognizes XHTML (application/xhtml+xml)

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 20009 in the body.
You can then email your comments to 20009 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ivan Shmakov <ivan <at> siamics.net>
To: submit <at> debbugs.gnu.org
Subject: eww-render: misrecognizes XHTML (application/xhtml+xml) 
Date: Thu, 05 Mar 2015 19:45:50 +0000

[Message part 1 (text/plain, inline)]

Package:  emacs
Severity: minor
Tags: patch

	As currently implemented, EWW fails to properly render XHTML
	documents, when served with Content-Type: application/xhtml+xml.
	Consider, e. g.:

    M-x eww RET http://www.x.org/releases/X11R7.7/doc/man/man1/index.xhtml RET

	Please thus consider the patch MIMEd.

	* lisp/net/eww.el (eww-html-p): New function.
	(eww-render): Use it.

	(Tested on 619fc5c197eb, 2015-02-26 18:09:48 UTC.)

-- 
FSF associate member #7257  np. Memento Mori — Kamelot  … 3013 B6A0 230E 334A

[Message part 2 (text/diff, inline)]

--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -300,6 +284,12 @@
   (interactive "r")
   (eww (buffer-substring beg end)))
 
+(defun eww-html-p (content-type)
+  "Return non-nil if CONTENT-TYPE designates an HTML content type.
+Currently this means either text/html or application/xhtml+xml."
+  (string-match-p "^\\(text\\|application\\)/\\(html\\|xhtml\\+xml\\)$"
+		  content-type))
+
 (defun eww-render (status url &optional point buffer encode)
   (let ((redirect (plist-get status :redirect)))
     (when redirect
@@ -318,8 +308,7 @@ defun eww-render (status url &optional point buffer encode)
 	 (charset (intern
 		   (downcase
 		    (or (cdr (assq 'charset (cdr content-type)))
-			(eww-detect-charset (equal (car content-type)
-						   "text/html"))
+			(eww-detect-charset (eww-html-p (car content-type)))
 			"utf-8"))))
 	 (data-buffer (current-buffer)))
     ;; Save the https peer status.
@@ -332,7 +321,7 @@ defun eww-render (status url &optional point buffer encode)
                  (string-match-p eww-use-external-browser-for-content-type
                                  (car content-type)))
             (eww-browse-with-external-browser url))
-	   ((equal (car content-type) "text/html")
+	   ((eww-html-p (car content-type))
 	    (eww-display-html charset url nil point buffer encode))
 	   ((equal (car content-type) "application/pdf")
 	    (eww-display-pdf))

Message #8 received at 20009 <at> debbugs.gnu.org (full text, mbox):

From: Lars Magne Ingebrigtsen <larsi <at> gnus.org>
To: Ivan Shmakov <ivan <at> siamics.net>
Cc: 20009 <at> debbugs.gnu.org
Subject: Re: bug#20009: eww-render: misrecognizes XHTML (application/xhtml+xml)
Date: Thu, 05 Mar 2015 23:27:09 +0100

Ivan Shmakov <ivan <at> siamics.net> writes:

> 	* lisp/net/eww.el (eww-html-p): New function.
> 	(eww-render): Use it.

Thanks.  I've applied a variant of your patch.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.