Prepare 2.10 release (#112)

* Update to Alpine 3.12 * Update pandoc-crossref test for pandoc 2.10 * Prepare freeze files for 2.10
pandoc · Jul 27, 2020 · 6f636fb · 6f636fb
1 parent 9df2bb4
commit 6f636fb
Show file tree

Hide file tree

Showing 5 changed files with 547 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ From there, the tagging scheme is either `X.Y`, `X.Y.Z`, `latest`, or `edge`.
 Current `latest` Tag
 --------------------------------------------------------------------------------
 
-The current `latest` tag for all images points to `pandoc` version `2.9.2.1`.
+The current `latest` tag for all images points to `pandoc` version `2.10`.
 
 Alpine Linux
 --------------------------------------------------------------------------------

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # Base #########################################################################
-FROM alpine:3.11 AS alpine-builder-base
+FROM alpine:3.12 AS alpine-builder-base
 WORKDIR /app
 
 RUN apk --no-cache add \
@@ -50,7 +50,7 @@ RUN find dist-newstyle \
 RUN strip /usr/local/bin/pandoc*
 
 # Core #########################################################################
-FROM alpine:3.11 AS alpine-core
+FROM alpine:3.12 AS alpine-core
 ARG pandoc_version=edge
 LABEL maintainer='Albert Krewinkel <albert+pandoc@zeitkraut.de>'
 LABEL org.pandoc.maintainer='Albert Krewinkel <albert+pandoc@zeitkraut.de>'

diff --git a/alpine/freeze/pandoc-2.10.project.freeze b/alpine/freeze/pandoc-2.10.project.freeze
@@ -0,0 +1,260 @@
+constraints: any.Cabal ==3.0.1.0,
+             any.Diff ==0.4.0,
+             any.Glob ==0.10.0,
+             any.HTTP ==4000.3.14,
+             HTTP -conduit10 -mtl1 +network-uri -warn-as-error -warp-tests,
+             any.HUnit ==1.6.0.0,
+             any.HsYAML ==0.2.1.0,
+             HsYAML -exe,
+             any.HsYAML-aeson ==0.2.0.0,
+             any.JuicyPixels ==3.3.5,
+             JuicyPixels -mmap,
+             any.Only ==0.1,
+             any.QuickCheck ==2.14.1,
+             QuickCheck +old-random +templatehaskell,
+             any.SHA ==1.6.4.4,
+             SHA -exe,
+             any.abstract-deque ==0.3,
+             abstract-deque -usecas,
+             any.abstract-par ==0.3.3,
+             any.aeson ==1.4.7.1,
+             aeson -bytestring-builder -cffi -developer -fast,
+             any.aeson-pretty ==0.8.8,
+             aeson-pretty -lib-only,
+             any.ansi-terminal ==0.10.3,
+             ansi-terminal -example,
+             any.ansi-wl-pprint ==0.6.9,
+             ansi-wl-pprint -example,
+             any.array ==0.5.4.0,
+             any.asn1-encoding ==0.9.6,
+             any.asn1-parse ==0.9.5,
+             any.asn1-types ==0.3.4,
+             any.async ==2.2.2,
+             async -bench,
+             any.attoparsec ==0.13.2.4,
+             attoparsec -developer,
+             any.base ==4.13.0.0,
+             any.base-compat ==0.11.1,
+             any.base-compat-batteries ==0.11.1,
+             any.base-orphans ==0.8.2,
+             any.base-unicode-symbols ==0.2.4.2,
+             base-unicode-symbols +base-4-8 -old-base,
+             any.base16-bytestring ==0.1.1.7,
+             any.base64-bytestring ==1.1.0.0,
+             any.basement ==0.0.11,
+             any.binary ==0.8.7.0,
+             any.binary-orphans ==1.0.1,
+             any.bitarray ==0.0.1.1,
+             any.blaze-builder ==0.4.1.0,
+             any.blaze-html ==0.9.1.2,
+             any.blaze-markup ==0.8.2.7,
+             any.bytestring ==0.10.10.0,
+             any.call-stack ==0.2.0,
+             any.case-insensitive ==1.2.1.0,
+             any.cassava ==0.5.2.0,
+             cassava -bytestring--lt-0_10_4,
+             any.cereal ==0.5.8.1,
+             cereal -bytestring-builder,
+             any.clock ==0.8,
+             clock -llvm,
+             any.cmark-gfm ==0.2.1,
+             cmark-gfm -pkgconfig,
+             any.cmdargs ==0.10.20,
+             cmdargs +quotation -testprog,
+             any.code-page ==0.2,
+             any.colour ==2.3.5,
+             any.conduit ==1.3.2,
+             any.conduit-extra ==1.3.5,
+             any.connection ==0.3.1,
+             any.containers ==0.6.2.1,
+             any.cookie ==0.4.5,
+             any.criterion ==1.5.6.2,
+             criterion -embed-data-files -fast,
+             any.criterion-measurement ==0.1.2.0,
+             criterion-measurement -fast,
+             any.cryptonite ==0.27,
+             cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
+             any.data-accessor ==0.2.3,
+             data-accessor +category +monadfail +splitbase,
+             any.data-accessor-template ==0.2.1.16,
+             data-accessor-template -template_2_11 -template_2_4,
+             any.data-accessor-transformers ==0.2.1.7,
+             any.data-default ==0.7.1.1,
+             any.data-default-class ==0.1.2.0,
+             any.data-default-instances-containers ==0.0.1,
+             any.data-default-instances-dlist ==0.0.1,
+             any.data-default-instances-old-locale ==0.0.1,
+             any.deepseq ==1.4.4.0,
+             any.dense-linear-algebra ==0.1.0.0,
+             any.digest ==0.0.1.2,
+             digest -bytestring-in-base,
+             any.directory ==1.3.6.0,
+             any.dlist ==0.8.0.8,
+             any.doclayout ==0.3,
+             any.doctemplates ==0.8.2,
+             any.emojis ==0.1,
+             any.errors ==2.3.0,
+             any.exceptions ==0.10.4,
+             exceptions +transformers-0-4,
+             any.executable-path ==0.0.3.1,
+             any.file-embed ==0.0.13.0,
+             any.filepath ==1.4.2.1,
+             any.ghc ==8.8.3,
+             any.ghc-boot ==8.8.3,
+             any.ghc-boot-th ==8.8.3,
+             any.ghc-heap ==8.8.3,
+             any.ghc-prim ==0.5.3,
+             any.ghci ==8.8.3,
+             any.gitrev ==1.3.1,
+             any.haddock-library ==1.9.0,
+             any.hashable ==1.3.0.0,
+             hashable -examples +integer-gmp +sse2 -sse41,
+             any.hourglass ==0.2.12,
+             any.hpc ==0.6.0.3,
+             any.hs-bibutils ==6.10.0.0,
+             any.hsc2hs ==0.68.7,
+             hsc2hs -in-ghc-tree,
+             any.hslua ==1.1.2,
+             hslua +allow-unsafe-gc -apicheck +export-dynamic +hardcode-reg-keys -lua_32bits +pkg-config +system-lua,
+             any.hslua-module-system ==0.2.1,
+             any.hslua-module-text ==0.2.1,
+             any.hspec ==2.7.1,
+             any.hspec-core ==2.7.1,
+             any.hspec-discover ==2.7.1,
+             any.hspec-expectations ==0.8.2,
+             any.http-client ==0.7.1,
+             http-client +network-uri,
+             any.http-client-tls ==0.3.5.3,
+             any.http-types ==0.12.3,
+             any.hxt ==9.3.1.18,
+             hxt -network-uri -profile,
+             any.hxt-charproperties ==9.4.0.0,
+             hxt-charproperties -profile,
+             any.hxt-regex-xmlschema ==9.2.0.3,
+             hxt-regex-xmlschema -profile,
+             any.hxt-unicode ==9.0.2.4,
+             any.integer-gmp ==1.0.2.0,
+             any.integer-logarithms ==1.0.3,
+             integer-logarithms -check-bounds +integer-gmp,
+             any.ipynb ==0.1.0.1,
+             any.jira-wiki-markup ==1.3.2,
+             any.js-flot ==0.8.3,
+             any.js-jquery ==3.3.1,
+             any.libyaml ==0.1.2,
+             libyaml -no-unicode -system-libyaml,
+             any.math-functions ==0.3.4.0,
+             math-functions +system-erf +system-expm1,
+             any.memory ==0.15.0,
+             memory +support_basement +support_bytestring +support_deepseq +support_foundation,
+             any.microstache ==1.0.1.1,
+             any.mime-types ==0.1.0.9,
+             any.monad-par ==0.3.5,
+             monad-par -chaselev -newgeneric,
+             any.monad-par-extras ==0.3.3,
+             any.mono-traversable ==1.0.15.1,
+             any.mtl ==2.2.2,
+             any.mwc-random ==0.14.0.0,
+             any.network ==3.1.1.1,
+             any.network-uri ==2.6.3.0,
+             any.old-locale ==1.0.0.7,
+             any.open-browser ==0.2.1.0,
+             any.optparse-applicative ==0.15.1.0,
+             pandoc +embed_data_files -static -trypandoc,
+             pandoc-citeproc +bibutils -debug +embed_data_files -static -test_citeproc -unicode_collation,
+             any.pandoc-crossref ==0.3.7.0,
+             pandoc-crossref -enable_flaky_tests,
+             any.pandoc-types ==1.21,
+             any.parallel ==3.2.2.0,
+             any.parsec ==3.1.14.0,
+             any.pem ==0.2.4,
+             any.pretty ==1.1.3.6,
+             any.primitive ==0.7.1.0,
+             any.process ==1.6.8.0,
+             any.quickcheck-io ==0.2.0,
+             any.random ==1.1,
+             any.regex-base ==0.94.0.0,
+             any.regex-pcre-builtin ==0.95.1.2.8.43,
+             any.resourcet ==1.2.4.2,
+             any.rfc5051 ==0.1.0.4,
+             rfc5051 -mkunicodedata,
+             any.roman-numerals ==0.5.1.5,
+             any.rts ==1.0,
+             any.safe ==0.3.19,
+             any.scientific ==0.3.6.2,
+             scientific -bytestring-builder -integer-simple,
+             any.setenv ==0.1.1.3,
+             any.skylighting ==0.8.5,
+             skylighting -executable,
+             any.skylighting-core ==0.8.5,
+             skylighting-core -executable -system-pcre,
+             any.socks ==0.6.1,
+             any.split ==0.2.3.4,
+             any.splitmix ==0.1,
+             splitmix -optimised-mixer,
+             any.statistics ==0.15.2.0,
+             any.stm ==2.5.0.0,
+             any.streaming-commons ==0.2.1.2,
+             streaming-commons -use-bytestring-builder,
+             any.syb ==0.7.1,
+             any.tagged ==0.8.6,
+             tagged +deepseq +transformers,
+             any.tagsoup ==0.14.8,
+             any.tasty ==1.2.3,
+             tasty +clock,
+             any.tasty-golden ==2.3.3.2,
+             tasty-golden -build-example,
+             any.tasty-hunit ==0.10.0.2,
+             any.tasty-lua ==0.2.2,
+             any.tasty-quickcheck ==0.10.1.1,
+             any.template-haskell ==2.15.0.0,
+             any.temporary ==1.3,
+             any.terminfo ==0.4.1.4,
+             any.texmath ==0.12.0.2,
+             texmath -executable +network-uri,
+             any.text ==1.2.4.0,
+             any.text-conversions ==0.3.0,
+             any.text-short ==0.1.3,
+             text-short -asserts,
+             any.tf-random ==0.5,
+             any.th-abstraction ==0.3.2.0,
+             any.time ==1.9.3,
+             any.time-compat ==1.9.3,
+             time-compat -old-locale,
+             any.tls ==1.5.4,
+             tls +compat -hans +network,
+             any.transformers ==0.5.6.2,
+             any.transformers-compat ==0.6.5,
+             transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
+             any.typed-process ==0.2.6.0,
+             any.unbounded-delays ==0.1.1.0,
+             any.unicode-transforms ==0.3.6,
+             unicode-transforms -bench-show -dev -has-icu -has-llvm,
+             any.unix ==2.7.2.2,
+             any.unliftio-core ==0.2.0.1,
+             any.unordered-containers ==0.2.11.0,
+             unordered-containers -debug,
+             any.utf8-string ==1.0.1.1,
+             any.utility-ht ==0.0.15,
+             any.uuid-types ==1.0.3,
+             any.vector ==0.12.1.2,
+             vector +boundschecks -internalchecks -unsafechecks -wall,
+             any.vector-algorithms ==0.8.0.3,
+             vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
+             any.vector-binary-instances ==0.2.5.1,
+             any.vector-th-unbox ==0.2.1.7,
+             any.wcwidth ==0.0.2,
+             wcwidth -cli +split-base,
+             any.weigh ==0.0.16,
+             any.x509 ==1.7.5,
+             any.x509-store ==1.6.7,
+             any.x509-system ==1.6.6,
+             any.x509-validation ==1.6.11,
+             any.xml ==1.3.14,
+             any.xml-conduit ==1.8.0.1,
+             any.xml-types ==0.3.8,
+             any.yaml ==0.11.4.0,
+             yaml +no-examples +no-exe,
+             any.zip-archive ==0.4.1,
+             zip-archive -executable,
+             any.zlib ==0.6.2.1,
+             zlib -non-blocking-ffi -pkg-config
diff --git a/test/expected/crossref-test.native b/test/expected/crossref-test.native
@@ -1,12 +1,29 @@
 [Header 1 ("pandoc-crossref-test",[],[]) [Str "pandoc-crossref",Space,Str "test"]
 ,Header 2 ("section-with-table",[],[]) [Str "Section",Space,Str "with",Space,Str "table"]
 ,Div ("tbl:label",[],[])
- [Table [Str "Table",Space,Str "1:",Space,Str "Caption"] [AlignLeft,AlignLeft] [0.0,0.0]
-  [[Plain [Str "a"]]
-  ,[Plain [Str "b"]]]
-  [[[Plain [Str "1"]]
-   ,[Plain [Str "2"]]]
-  ,[[Plain [Str "3"]]
-   ,[Plain [Str "4"]]]]]
+ [Table ("",[],[]) (Caption Nothing
+  [Plain [Str "Table",Space,Str "1:",Space,Str "Caption"]])
+  [(AlignLeft,ColWidthDefault)
+  ,(AlignLeft,ColWidthDefault)]
+  (TableHead ("",[],[])
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "a"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Plain [Str "b"]]]])
+  [(TableBody ("",[],[]) (RowHeadColumns 0)
+   []
+   [Row ("",[],[])
+    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "1"]]
+    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "2"]]]
+   ,Row ("",[],[])
+    [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "3"]]
+    ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+     [Plain [Str "4"]]]])]
+  (TableFoot ("",[],[])
+  [])]
 ,Header 2 ("section-with-text",[],[]) [Str "Section",Space,Str "with",Space,Str "text"]
 ,Para [Str "See",Space,Str "table",Space,Str "tbl.\160\&1."]]