From ecd60a86cdf9086912714100c0b0659c4d469870 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 28 Jul 2017 00:05:13 +0200
Subject: Fix generation of manpages with pandoc >=1.18

---
 Changelog |  6 ++++++
 Makefile  | 40 ++++++++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Changelog b/Changelog
index de6185d..d3fc678 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+lacme (0.4) upstream;
+
+  * Fix generation of manpages with pandoc >=1.18
+
+ -- Guilhem Moulin <guilhem@fripost.org>  Fri, 28 Jul 2017 00:16:06 +0200
+
 lacme (0.3) upstream;
 
   + When parsing config-cert files and directories (default "lacme-certs.conf
diff --git a/Makefile b/Makefile
index 3b61341..16ec63e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,22 +5,30 @@ all: ${MANPAGES}
 # 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: ${MANPAGES}
-- 
cgit v1.2.3