Improve the check for a custom front matter value with nested maps

ox-hugo.el

@@ -2947,9 +2947,10 @@ are \"toml\" and \"yaml\"."
            (;; Custom front-matter with nested map value.
             ;; Only 1 level of nesting is supported.
             (and (listp value) ;Example value: '((legs . 4) ("eyes" . 2) (friends . (poo boo)))
-                 (consp (car value)) ;Check if (car value) is a dotted pair: '(foo . bar),
-                 (or (not (listp (cdr (car value)))) ;and not '(foo bar).
-                     (null (cdr (car value))))) ;'(foo) will be counted as a valid consp too.
+                 (or (consp (car value)) ;Check if value is an alist of conses or lists
+                     (eq 0 (cl-count-if (lambda (el)
+                                          (not (listp el)))
+                                        (car value)))))
             (let ((custom-nested-parent-key key)
                   (custom-nested-alist value)
                   (custom-nested-parent-key-str "")

test/site/content-org/all-posts.org

@@ -1696,7 +1696,7 @@ The following results in the 'genres' property having the value
 :EXPORT_HUGO_FRONT_MATTER_FORMAT: toml
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER: :dog '((legs . 4) ("eyes" . 2) (friends . (poo boo)))
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :header '((image . "projects/Readingabook.jpg") (caption . "stay hungry, stay foolish"))
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :collection '((nothing) (nonnil . t) (animals . (dog cat "penguin" "mountain gorilla")) (strings-symbols . ("abc" def "two words")) (integers . (123 -5 17 1_234)) (floats . (12.3 -5.0 -17E-6)) (booleans . (true false)))
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :collection '((animals . (dog cat "penguin" "mountain gorilla")) (nothing) (nonnil . t) (strings-symbols . ("abc" def "two words")) (integers . (123 -5 17 1_234)) (floats . (12.3 -5.0 -17E-6)) (booleans . (true false)))
 :END:
 #+begin_description
 Custom TOML front-matter with TOML tables.
@@ -1708,7 +1708,7 @@ Custom TOML front-matter with TOML tables.
 :EXPORT_HUGO_FRONT_MATTER_FORMAT: yaml
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER: :dog '((legs . 4) ("eyes" . 2) (friends . (poo boo)))
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :header '((image . "projects/Readingabook.jpg") (caption . "stay hungry, stay foolish"))
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :collection '((nothing) (nonnil . t) (animals . (dog cat "penguin" "mountain gorilla")) (strings-symbols . ("abc" def "two words")) (integers . (123 -5 17 1_234)) (floats . (12.3 -5.0 -17E-6)) (booleans . (true false)))
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :collection '((animals . (dog cat "penguin" "mountain gorilla")) (nothing) (nonnil . t) (strings-symbols . ("abc" def "two words")) (integers . (123 -5 17 1_234)) (floats . (12.3 -5.0 -17E-6)) (booleans . (true false)))
 :END:
 #+begin_description
 Custom YAML front-matter with nested maps.

test/site/content/posts/custom-front-matter-with-nested-maps-toml.md

@@ -11,9 +11,9 @@ draft = false
   image = "projects/Readingabook.jpg"
   caption = "stay hungry, stay foolish"
 [collection]
+  animals = ["dog", "cat", "penguin", "mountain gorilla"]
   nothing = false
   nonnil = true
-  animals = ["dog", "cat", "penguin", "mountain gorilla"]
   strings-symbols = ["abc", "def", "two words"]
   integers = [123, -5, 17, 1_234]
   floats = [12.3, -5.0, -1.7e-05]

test/site/content/posts/custom-front-matter-with-nested-maps-yaml.md

@@ -11,9 +11,9 @@ header:
   image: "projects/Readingabook.jpg"
   caption: "stay hungry, stay foolish"
 collection:
+  animals: ["dog", "cat", "penguin", "mountain gorilla"]
   nothing: false
   nonnil: true
-  animals: ["dog", "cat", "penguin", "mountain gorilla"]
   strings-symbols: ["abc", "def", "two words"]
   integers: [123, -5, 17, 1_234]
   floats: [12.3, -5.0, -1.7e-05]