[elpa] externals/ebdb cbaa04b 10/13: Fix compose fields for the HTML5 freeform formatter

[Eric Abrahamsen]

branch: externals/ebdb
commit cbaa04b15417f84be2ce25446e5a8977774bb76e
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Fix compose fields for the HTML5 freeform formatter
    
    * ebdb-html.el (ebdb-fmt-compose-fields): This didn't need to be so
      complicated; also you're allowed to have multiple <dd> elements for
      a single <dt> element.
---
 ebdb-html.el | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/ebdb-html.el b/ebdb-html.el
index 6a85ef1..5d423b4 100644
--- a/ebdb-html.el
+++ b/ebdb-html.el
@@ -67,33 +67,27 @@
 (cl-defmethod ebdb-fmt-compose-fields ((fmt ebdb-html-formatter-html5)
                                       (rec ebdb-record)
                                       &optional field-list _depth)
+  "This particular implementation uses description lists (<dl>)."
   (when field-list
-    (let ((field-pairs
-          (mapcar
-           (pcase-lambda ((map style inst class))
-             ;; Field labels,
-             (cons (ebdb-fmt-field-label
-                    fmt
-                    (if (= 1 (length inst))
-                        (car inst)
-                      class)
-                    style
-                    rec)
-                   ;; and fields.
-                   (mapconcat
-                    #'identity
-                    (mapcar (lambda (f)
-                              (ebdb-fmt-field fmt f style rec))
-                            inst)
-                    ", ")))
-           field-list)))
-      (concat
-       "<dl>\n"
-       (mapconcat
-       (pcase-lambda (`(,label . ,field))
-         (format "<dt>%s</dt><dd>%s</dd>" label field))
-       field-pairs "\n")
-       "</dl>\n"))))
+    (concat
+     "<dl>\n"
+     (mapconcat
+      (pcase-lambda ((map style inst class))
+       (concat
+        (format "<dt>%s</dt>" (ebdb-fmt-field-label
+                               fmt
+                               (if (= 1 (length inst))
+                                   (car inst)
+                                 class)
+                               style
+                               rec))
+        (mapconcat
+         (lambda (f)
+           (format "<dd>%s</dd>" (ebdb-fmt-field fmt f style rec)))
+         inst
+         "\n")))
+      field-list "\n")
+     "</dl>\n")))
 
 (cl-defmethod ebdb-fmt-field ((_fmt ebdb-html-formatter)
                              (field ebdb-field-mail)