Update for pandoc 2.18 changes

Included patches:
- Upstream PR#348: Fix pandoc breaking some tests' expected output

4 files changed, 130 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d1ca7be8369..182ea1c9472d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = pandoc-crossref-static-git
 	pkgdesc = Pandoc filter for cross-references (static build)
-	pkgver = 0.3.12.2.r0.g0b473d7
-	pkgrel = 1
+	pkgver = 0.3.12.2a.r4.gfe1f71b
+	pkgrel = 2
 	url = https://github.com/lierdakil/pandoc-crossref
 	arch = x86_64
 	license = GPL2
 	makedepends = stack
 	makedepends = pandoc
-	depends = pandoc=2.17.1.1
-	provides = pandoc-crossref=0.3.12.2
+	depends = pandoc=2.18
+	provides = pandoc-crossref=0.3.12.2a
 	conflicts = pandoc-crossref
 	replaces = pandoc-crossref-bin
 	replaces = pandoc-crossref-static
@@ -16,6 +16,6 @@ pkgbase = pandoc-crossref-static-git
 	source = pandoc-crossref-static-git::git+https://github.com/lierdakil/pandoc-crossref.git
 	source = ver-bump.patch
 	sha256sums = SKIP
-	sha256sums = fe76eee42278b16d1e04c28b7d12003853f57f30b4a5dfdc73b4efdf2aa556ad
+	sha256sums = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 
 pkgname = pandoc-crossref-static-git
diff --git a/0001-Update-tests-for-pandoc-5f0bfd41.patch b/0001-Update-tests-for-pandoc-5f0bfd41.patch
new file mode 100644
index 000000000000..4a9bdbcf171b
--- /dev/null
+++ b/0001-Update-tests-for-pandoc-5f0bfd41.patch
@@ -0,0 +1,80 @@
+From d3dedc6d98d569d8c23cd0e57f3caa8d424afccc Mon Sep 17 00:00:00 2001
+From: hseg <gesh@gesh.uni.cx>
+Date: Mon, 4 Apr 2022 22:59:09 +0300
+Subject: [PATCH] Update tests for pandoc 5f0bfd41
+
+cf https://github.com/jgm/pandoc/commit/5f0bfd41a80aaf4d05c37357a317a6694ec338ec
+which changed the output of booktabs rules
+---
+ test/m2m/secLabels/expect.tex         | 10 +++++-----
+ test/m2m/setLabelAttribute/expect.tex | 10 +++++-----
+ test/test-pandoc-crossref.hs          |  2 +-
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/test/m2m/secLabels/expect.tex b/test/m2m/secLabels/expect.tex
+index 6353604..817683c 100644
+--- a/test/m2m/secLabels/expect.tex
++++ b/test/m2m/secLabels/expect.tex
+@@ -19,15 +19,15 @@ Section}\label{other-second-level-section}}
+ \hypertarget{tbl:mytable}{}
+ \begin{longtable}[]{@{}lll@{}}
+ \caption{\label{tbl:mytable}My table}\tabularnewline
+-\toprule
++\toprule()
+ a & b & c \\
+-\midrule
++\midrule()
+ \endfirsthead
+-\toprule
++\toprule()
+ a & b & c \\
+-\midrule
++\midrule()
+ \endhead
+ 1 & 2 & 3 \\
+ 4 & 5 & 6 \\
+-\bottomrule
++\bottomrule()
+ \end{longtable}
+diff --git a/test/m2m/setLabelAttribute/expect.tex b/test/m2m/setLabelAttribute/expect.tex
+index a9cff37..aad3c08 100644
+--- a/test/m2m/setLabelAttribute/expect.tex
++++ b/test/m2m/setLabelAttribute/expect.tex
+@@ -14,16 +14,16 @@
+ \hypertarget{tbl:1}{}
+ \begin{longtable}[]{@{}ll@{}}
+ \caption{\label{tbl:1}Table}\tabularnewline
+-\toprule
++\toprule()
+ a & b \\
+-\midrule
++\midrule()
+ \endfirsthead
+-\toprule
++\toprule()
+ a & b \\
+-\midrule
++\midrule()
+ \endhead
+ 1 & 2 \\
+-\bottomrule
++\bottomrule()
+ \end{longtable}
+ 
+ \begin{codelisting}
+diff --git a/test/test-pandoc-crossref.hs b/test/test-pandoc-crossref.hs
+index e94207a..ed30cb2 100644
+--- a/test/test-pandoc-crossref.hs
++++ b/test/test-pandoc-crossref.hs
+@@ -313,7 +313,7 @@ main = hspec $ do
+         it "Tbl labels" $
+           table' "A table" "some_table1"
+             <> para (citeGen "tbl:some_table" [1])
+-            `test` "\\hypertarget{tbl:some_table1}{}\n\\begin{longtable}[]{@{}@{}}\n\\caption{\\label{tbl:some_table1}A table}\\tabularnewline\n\\toprule\n\\endhead\n \\\\\n\\bottomrule\n\\end{longtable}\n\ntbl.~\\ref{tbl:some_table1}"
++            `test` "\\hypertarget{tbl:some_table1}{}\n\\begin{longtable}[]{@{}@{}}\n\\caption{\\label{tbl:some_table1}A table}\\tabularnewline\n\\toprule()\n\\endhead\n \\\\\n\\bottomrule()\n\\end{longtable}\n\ntbl.~\\ref{tbl:some_table1}"
+ #endif
+ 
+         it "Code block labels" $ do
+-- 
+2.35.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 3e4f841643df..35cb8e84e5bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,11 @@
 
 pkgname=pandoc-crossref-static-git
 _pkgname="${pkgname%-static-git}"
-pkgver=0.3.12.2.r0.g0b473d7
+pkgver=0.3.12.2a.r4.gfe1f71b
 _pandoc_type=version
-_pandoc_ver=2.17.1.1
+_pandoc_ver=2.18
 _pandoc_commit=64a21caa6c802eabaabecc181087dc7c42580946
-pkgrel=1
+pkgrel=2
 pkgdesc="Pandoc filter for cross-references (static build)"
 url="https://github.com/lierdakil/pandoc-crossref"
 license=("GPL2")
@@ -19,9 +19,11 @@ provides=("$_pkgname=${pkgver%%.r*}")
 replaces=('pandoc-crossref-bin' 'pandoc-crossref-static' 'pandoc-crossref-lite')
 depends=("pandoc=$_pandoc_ver")
 makedepends=('stack' 'pandoc')
-source=("$pkgname::git+$url.git" ver-bump.patch)
+source=("$pkgname::git+$url.git" ver-bump.patch
+    0001-Update-tests-for-pandoc-5f0bfd41.patch)
 sha256sums=('SKIP'
-            'fe76eee42278b16d1e04c28b7d12003853f57f30b4a5dfdc73b4efdf2aa556ad')
+            '9b15ac6f617e583eda0cfd7308ff8fead84dc6200e1e94fad695fb8602e38bbe'
+            '6b92482325fdefcb0588efd1f0ad0bb632ad509b8538aae63a32a128f0c0d5bf')
 
 pkgver() {
     cd "$pkgname"
@@ -31,6 +33,7 @@ pkgver() {
 prepare() {
     cd "$pkgname"
     patch --forward --strip=1 --input="${srcdir}/ver-bump.patch"
+    git apply "${srcdir}/0001-Update-tests-for-pandoc-5f0bfd41.patch"
     sedscript=''
     case "$_pandoc_type" in
     stock) return;;
diff --git a/ver-bump.patch b/ver-bump.patch
index 15d7563d2408..db743c1a11ce 100644
--- a/ver-bump.patch
+++ b/ver-bump.patch
@@ -1,46 +1,43 @@
 diff --git a/stack.yaml b/stack.yaml
-index 5afc965..211280a 100644
+index 0d538f8..8980afd 100644
 --- a/stack.yaml
 +++ b/stack.yaml
-@@ -8,25 +8,26 @@ packages:
+@@ -8,12 +8,12 @@ packages:
  - .
  extra-deps:
  - roman-numerals-0.5.1.5
--- pandoc-2.17.0.1
-+- pandoc-2.17.1
- - citeproc-0.6.0.1@sha256:686b75196ed241f61916878bfe62d974c7c56958d117fbd1be833496d487fe90,5645
- - doctemplates-0.10.0.1@sha256:bb36fe3bd5dbeaa91d76391c1203feb4b51a1fe7bef1be8d688c80d42967da80,3085
--- hslua-2.0.1@sha256:d8f3f8f3be9239940daecdeb7334567732fe922ba6194e08d4c1dff4a2795969,4176
--- hslua-aeson-2.0.1@sha256:2b3db325c1922b814efece9be6f8c3044a7da0ab86e66489aad96690d8f4edb3,3189
--- hslua-marshalling-2.0.1@sha256:40eff33e386aa4f99fb22f12fc9fe673752ed5ccb09566d575bce3cfe1776166,3839
--- hslua-module-path-1.0.0@sha256:29a8116d8c21acfc2dbeed32490037866697ba035e2682b5d5239b8e29bfa96c,2674
--- hslua-module-system-1.0.0@sha256:39b87e6f3caec3a478d95c59a9f7acd088f47ef57cb8bfa785381fc383972318,3087
--- hslua-module-text-1.0.0@sha256:0d3b8ce3df77c596274c88af8dcd9df5e05ef2476f6feb07634c663e873558fd,2620
--- hslua-module-version-1.0.0@sha256:5df8f3fbf37d7b060fb79b9ed6397e2ff244f4dc04e6455d5a0f7f86e7cafa42,2645
- - ipynb-0.2@sha256:506363b4922a87bcd8a66b08d2fe0af6ecac156926bc2845131509aed1f9226b,1827
--- lpeg-1.0.1@sha256:a1a0087da8191fe71ab6bbd83c6f8277df84de4fc1921e7cfc8854d78a0456a5,3517
--- pandoc-lua-marshal-0.1.3.1@sha256:5798ccad9949c95f366f729a9ec816c88a656d086b8685f32882ae6a47b28130,5272
- - skylighting-0.12.2@sha256:32bb80ef9b1d2332bb54117a7f05f26c209ca998083b9825766577319c3fd736,10198
- - skylighting-core-0.12.2@sha256:6970f548102db3546f6ad5e6f37207d259e9cb60b968dce61c449d2319f69c62,8081
- - texmath-0.12.4@sha256:1fd7a39f17ec7fba826c3c1459c0d5c28270d5a51501b1fe06028bffbc55873a,6037
--- hslua-classes-2.0.0@sha256:77892ad3e81bd5a6e28d264f1d062839346569660368aa5f606805ae8f347d97,3794
--- hslua-core-2.0.0.2@sha256:18397c8649129c3adaaa43b68c2ed9f5fad7b96d7f43b9355ffad4ff55ff4693,4061
--- hslua-objectorientation-2.0.1@sha256:28362bb7e476e5fae3382ef545146f81b9a64fa4e2c5ec627dfa5618d671d003,3335
--- hslua-packaging-2.0.0@sha256:0b62de0ffe7a6e051730c29433f06a0570137564cb605df2b3921b87dc76bad2,3476
--- lua-2.0.2@sha256:374f224425c318b9c9e0bdb4dc649ef7f48c32488eec1d68b4926e24ffe5fc9d,8150
-+- lua-2.1.0@sha256:8d6c68fb87ad545b7c2608a9d2c64d2157a8b88839f68ebc3c7d3487b12e9247,8258
-+- hslua-2.1.0@sha256:134a14902ad0979ecbe76db9227077b66c4f670e5022d638ef64c59bddb80dce,4209
-+- hslua-aeson-2.1.0@sha256:43a35e8ce034ce29931af804a15151fe9b7d9a4ee5e27dd47cc8086f65215fcb,3200
-+- hslua-core-2.1.0@sha256:16630e315c296aab587cb06c4342d1570cb026cc21bde0edf68125224851500e,4306
-+- hslua-marshalling-2.1.0@sha256:4179d240a8ca8417a284e362f275e37f3cdf0ad0a0d1e682e036c8ae4a6d2471,3907
-+- pandoc-lua-marshal-0.1.4
-+- lpeg-1.0.2
-+- hslua-packaging-2.1.0
-+- hslua-objectorientation-2.1.0
-+- hslua-classes-2.1.0
-+- hslua-module-path-1.0.1
-+- hslua-module-system-1.0.1
-+- hslua-module-text-1.0.1
-+- hslua-module-version-1.0.1
-+
- resolver: lts-18.22
+-- pandoc-2.17.1.1
+-- citeproc-0.6.0.1@sha256:686b75196ed241f61916878bfe62d974c7c56958d117fbd1be833496d487fe90,5645
++- pandoc-2.18
++- citeproc-0.7@sha256:779de5879e324ea3304174de4fdb3d58867d5af9c1f67197051cef59435c9329,5655
+-- doctemplates-0.10.0.1@sha256:bb36fe3bd5dbeaa91d76391c1203feb4b51a1fe7bef1be8d688c80d42967da80,3085
++- doctemplates-0.10.0.2
+-- hslua-2.1.0@sha256:134a14902ad0979ecbe76db9227077b66c4f670e5022d638ef64c59bddb80dce,4209
+-- hslua-aeson-2.1.0@sha256:43a35e8ce034ce29931af804a15151fe9b7d9a4ee5e27dd47cc8086f65215fcb,3200
+-- hslua-marshalling-2.1.0@sha256:4179d240a8ca8417a284e362f275e37f3cdf0ad0a0d1e682e036c8ae4a6d2471,3907
++- hslua-2.2.0@sha256:a0f42ab0d843f3b86c5a7268da9c5516fdf93d29ae26a4b8c683bfc0a7fc0a39,4751
++- hslua-aeson-2.2.0@sha256:8c6e49aacf9cec4e9cdb692073e788a0ce06ac4a831fe75cd2745b496f235c67,3200
++- hslua-marshalling-2.2.0@sha256:9c1f1c447e137946c6d52e79d0677b0bf89841217611a46af5c804d7cefdc8b3,3907
+ - hslua-module-path-1.0.2@sha256:2238a21ada9fe8a8064b7b2f969a74868f64168e301fdd93c6bf4ff5c6354e2f,2697
+ - hslua-module-system-1.0.2@sha256:1958499d7a04f7faad2f98a134f988d3fe6d95f914b5090acc0032ffadcbfba1,3058
+ - hslua-module-text-1.0.2@sha256:bb3d9311b0ec1ef822a19e5f8a6da5dd8bc232965ceb0c5ac13d8a30d26bf567,2713
+@@ -23,10 +23,12 @@ extra-deps:
+ - pandoc-lua-marshal-0.1.5.1@sha256:530a07d622c1a033eba0b26b96314b2d567a9fc36a291cc94fe093f2895cb616,5272
+ - skylighting-0.12.3@sha256:6543d493a1e0cbc9ccd5c7ef2f20b78e3a11afec8b488ba23982d2a012738276,10398
+ - skylighting-core-0.12.3@sha256:2e03951b7b6d1f652c9effb47984d396104a385af79fb363e26ea7c365fa0fde,8081
+-- texmath-0.12.4@sha256:1fd7a39f17ec7fba826c3c1459c0d5c28270d5a51501b1fe06028bffbc55873a,6037
+-- hslua-classes-2.1.0@sha256:f553f66f5e838372abe79a2b4ad796fb27a73018072d2fbd32dea914259645de,3828
+-- hslua-core-2.1.0@sha256:16630e315c296aab587cb06c4342d1570cb026cc21bde0edf68125224851500e,4306
+-- hslua-objectorientation-2.1.0@sha256:498e515c0a21db00a21f8620225089f6672caa81e207318554f463f7b939d0bc,3408
+-- hslua-packaging-2.1.0@sha256:103d0645b9baae00bd582206d174b369c908ff900a87eb282cd053addea2045a,3706
+-- lua-2.1.0@sha256:8d6c68fb87ad545b7c2608a9d2c64d2157a8b88839f68ebc3c7d3487b12e9247,8258
++- texmath-0.12.5@sha256:b5ff26862318501ceb1d64d78c8f6cb40014c586322cdea1b763b729fb9c5563,6609
++- hslua-classes-2.2.0@sha256:a76550e77d82f0daecf0f110e14ce0bdf92c799a61aec8f448ce8a92f8d936cd,3828
++- hslua-core-2.2.0@sha256:1bc7b42fc5c701f00bae2995bc8422eb02e22f8e6ff50dc6bcd325072985df1e,4306
++- hslua-objectorientation-2.2.0@sha256:d124eb2d2350819c92c02c428d9de40efa6e1b02a39d24278fbb2370ffc4d190,3408
++- hslua-packaging-2.2.0@sha256:b6fea154b34b7e6d52db4f981140f47751b5dede4b51df628e716ef378248b8f,3706
++- lua-2.2.0@sha256:9ab955e366d0a84f8fd93fa7afae544469e19bd6441b091fcadca1f9b0566f37,7499
+-resolver: lts-18.27
++- doclayout-0.4@sha256:9443bcad927de56d222f5f44d5f99270079f03f5deeb42485a7bba5b61184ba1,2414
++- hslua-module-doclayout-1.0.4@sha256:2d526e1095328aaede64a40a9276abe257596f6c73e893bbfa0432b2744aaaa7,2693
++resolver: lts-19.2