[Emacs-diffs] master 6ccb5f1: * lisp/net/shr.el (shr-collect-extra-strings-in-table) New function

[Katsumi Yamaoka]

branch: master
commit 6ccb5f19f68689186002b817be7be25d929f5677
Author: Katsumi Yamaoka <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    * lisp/net/shr.el (shr-collect-extra-strings-in-table) New function
    that gathers extra strings in an invalid html.  (bug#24831)
    (shr-tag-table): Use it.
---
 lisp/net/shr.el |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 7ea33fb..73886bf 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1897,11 +1897,48 @@ The preference is a float determined from 
`shr-prefer-media-type'."
     (when (zerop shr-table-depth)
       (save-excursion
        (shr-expand-alignments start (point)))
+      ;; Insert also non-td/th strings excluding comments and styles.
+      (save-restriction
+       (narrow-to-region (point) (point))
+       (insert (mapconcat #'identity
+                          (shr-collect-extra-strings-in-table dom)
+                          "\n"))
+       (shr-fill-lines (point-min) (point-max)))
       (dolist (elem (dom-by-tag dom 'object))
        (shr-tag-object elem))
       (dolist (elem (dom-by-tag dom 'img))
        (shr-tag-img elem)))))
 
+(defun shr-collect-extra-strings-in-table (dom &optional flags)
+  "Return extra strings in DOM of which the root is a table clause.
+FLAGS is a cons of two flags that control whether to collect strings."
+  ;; If and only if the cdr is not set, the car will be set to t when
+  ;; a <td> or a <th> clause is found in the children of DOM, and reset
+  ;; to nil when a <table> clause is found in the children of DOM.
+  ;; The cdr will be set to t when a <table> clause is found if the car
+  ;; is not set then, and will never be reset.
+  ;; This function collects strings if the car of FLAGS is not set.
+  (unless flags (setq flags (cons nil nil)))
+  (cl-loop for child in (dom-children dom)
+          if (stringp child)
+            when (and (not (car flags))
+                      (string-match "\\(?:[^\t\n\r ]+[\t\n\r ]+\\)*[^\t\n\r ]+"
+                                    child))
+              collect (match-string 0 child)
+            end
+          else
+            unless (let ((tag (dom-tag child)))
+                     (or (memq tag '(comment style))
+                         (progn
+                           (cond ((memq tag '(td th))
+                                  (unless (cdr flags) (setcar flags t)))
+                                 ((eq tag 'table)
+                                  (if (car flags)
+                                      (unless (cdr flags) (setcar flags nil))
+                                    (setcdr flags t))))
+                           nil)))
+              append (shr-collect-extra-strings-in-table child flags)))
+
 (defun shr-insert-table (table widths)
   (let* ((collapse (equal (cdr (assq 'border-collapse shr-stylesheet))
                          "collapse"))