Fix manpage generation with pandoc >=1.18.

diff --git a/Makefile b/Makefile
index c1513c68984f3f28afba5395344dba4bc292b410..a8474d6982f6d6689fd51ccc4664adf0603e1d20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,22 +3,30 @@ all: pullimap.1 interimap.1
 # upper case the headers and remove the links
 %.1: %.md
        @pandoc -S -f markdown -t json "$<" | \
-       jq ".[1][] |= if .t == \"Header\" then .c[2][] |= (if .t == \"Str\" then .c |= ascii_upcase else . end) else . end" | \
-       jq "                                                                                                                                                                            \
-               def fixit:                                                                                                                                                              \
-                       if type == \"object\" then                                                                                                                      \
-                               if .t == \"Link\" then                                                                                                                  \
-                                       if .c[2][0][0:7] == \"mailto:\" then . else     .c[1][] end                                             \
-                               else                                                                                                                                                    \
-                                       map_values(fixit)                                                                                                                       \
-                               end                                                                                                                                                             \
-                       else if type == \"array\" then                                                                                                          \
-                                       map(fixit)                                                                                                                                      \
-                               else                                                                                                                                                    \
-                                       .                                                                                                                                                       \
-                               end                                                                                                                                                             \
-                       end;                                                                                                                                                            \
-               map(fixit)" | \
+       jq "                                                                        \
+           def fixheaders:                                                         \
+               if .t == \"Header\" then                                            \
+                   .c[2][] |= (if .t == \"Str\" then .c |= ascii_upcase else . end)\
+               else                                                                \
+                   .                                                               \
+               end;                                                                \
+           def fixlinks:                                                           \
+               if type == \"object\" then                                          \
+                   if .t == \"Link\" then                                          \
+                       if .c[2][0][0:7] == \"mailto:\" then . else .c[1][] end     \
+                   else                                                            \
+                       map_values(fixlinks)                                        \
+                   end                                                             \
+               else if type == \"array\" then                                      \
+                       map(fixlinks)                                               \
+                   else                                                            \
+                       .                                                           \
+                   end                                                             \
+               end;                                                                \
+           { \"pandoc-api-version\"                                                \
+           , meta                                                                  \
+           , blocks: .blocks | map(fixheaders) | map(fixlinks)                     \
+           }" | \
        pandoc -sS -f json -t man -o "$@"
 
 install: