From 4cfd5a21bcfc89fb1172780ffb3cc7356778c555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 16 May 2022 12:19:46 +0200 Subject: [PATCH] update pandoc version to 2.18 --- .drone.yml | 4 ++-- admin/metadata.yaml | 2 ++ build-pandoc.sh | 3 ++- pandoc/template | 2 +- user/metadata.yaml | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index ffbb6c1..57ca5e9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: - git submodule update --recursive --remote - name: pandoc - image: pandoc/core:2.14-alpine + image: pandoc/core:2.18-alpine commands: - sh build-pandoc.sh latex user > user-manual.tex - sh build-pandoc.sh latex admin > admin-manual.tex @@ -39,6 +39,6 @@ steps: prerelease: true --- kind: signature -hmac: 266046bb784be1e63788e1ebd4761d90bb9d61ac2466e78cb1f0bd5802314f84 +hmac: 27fe3c287ea5597d1d2db3d2a55155b0e96e6cc7b020fe5e8a0b42d904775f48 ... diff --git a/admin/metadata.yaml b/admin/metadata.yaml index 5f16f02..902ca86 100644 --- a/admin/metadata.yaml +++ b/admin/metadata.yaml @@ -3,6 +3,8 @@ title: Manuel administrateur de Chill subtitle: Chill en Vendée lang: fr-BE toc: true +page: a4 +book: true header-includes: | diff --git a/build-pandoc.sh b/build-pandoc.sh index 64edb22..b2746e6 100755 --- a/build-pandoc.sh +++ b/build-pandoc.sh @@ -52,10 +52,11 @@ export ARGS=" --number-sections --resource-path ./$kind --metadata-file ./$kind/metadata.yaml - --lua-filter "${PANDOC_DIR}/format-link.lua" + `#--lua-filter "${PANDOC_DIR}/format-link.lua` " export PDF_TEMPLATE="./pandoc/template/eisvogel.tex" export LATEX_ARGS=" + --metadata=footer-left:$(date +%d-%m-%Y) --template "${PDF_TEMPLATE}" --lua-filter "${PANDOC_DIR}/boxes.lua" " diff --git a/pandoc/template b/pandoc/template index 4909f13..04e3296 160000 --- a/pandoc/template +++ b/pandoc/template @@ -1 +1 @@ -Subproject commit 4909f13d58bb4c66243def1f6e01becd1820c767 +Subproject commit 04e329698d01c3a25aa72ad81d98483284669316 diff --git a/user/metadata.yaml b/user/metadata.yaml index 8ead965..1aa5370 100644 --- a/user/metadata.yaml +++ b/user/metadata.yaml @@ -2,6 +2,8 @@ title: Manuel utilisateur de Chill lang: fr-BE toc: true +page: a4 +book: true titlepage: true, #logo: "img/logo-chill-outil-accompagnement.svg"