Merge branch 'master' into any-prefix

lierdakil · Sep 4, 2020 · 88aa81e · 88aa81e
2 parents a792fa6 + 2fc3f43
commit 88aa81e
Show file tree

Hide file tree

Showing 14 changed files with 212 additions and 383 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ static-build
 .pandoc-*
 pandoc
 cabal.project.local
+cabal.project.local~
 dist
 dist-newstyle
 cabal.sandbox.config

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 0.3.8.1
+
+-   Fix parsing multiple inlines in block
+
+## 0.3.8.0
+
+-   [LaTeX] Move hypertarget inside equation environment
+
+    Fixes spacing issues in LaTeX/pdf output
+
+-   [DOCX] Center equation number vertically with tableEqns
+
+## 0.3.7.0
+
+-  Support for pandoc-2.10
+
 ## 0.3.6.4
 
 -   Last version to support pandoc 2.9

diff --git a/README.md b/README.md
@@ -75,8 +75,10 @@ time of writing, pandoc-crossref is provided on the following platforms
 -   NixOS or Nix package manager (via `nixpkgs.haskellPackages`
     attribute)
 -   MacOS (via [Homebrew](https://brew.sh))
+-   FreeBSD official binary package [textproc/hs-pandoc-crossref](https://www.freshports.org/textproc/hs-pandoc-crossref/)
 -   Any Linux distribution (via [Linuxbrew](https://docs.brew.sh/Linuxbrew))
 -   Gentoo Linux (via gentoo-haskell overlay)
+-   Windows (via [scoop](https://scoop.sh/))
 
 ### Building from Hackage with `cabal-install` and Haskell platform
 

diff --git a/cabal.project b/cabal.project
@@ -1,5 +1,5 @@
 packages: .
 package pandoc
-  ghc-options: +RTS -A64m -RTS
+  ghc-options: -j +RTS -A64m -RTS
 package pandoc-crossref
-  ghc-options: +RTS -A64m -RTS
+  ghc-options: -j +RTS -A64m -RTS
diff --git a/misc/Linux-build-cabal-config b/misc/Linux-build-cabal-config
@@ -0,0 +1,14 @@
+package *
+  debug-info: False
+  ghc-options: -fPIC -fasm -optl-static -optl-pthread +RTS -A64m -RTS
+  static: True
+  relocatable: True
+  split-sections: True
+  executable-stripping: True
+  shared: False
+packages: .
+package pandoc
+  ghc-options: -j +RTS -A64m -RTS
+package pandoc-crossref
+  flags: +enable_flaky_tests
+  ghc-options: -j +RTS -A64m -RTS
diff --git a/misc/Windows-build-cabal-config b/misc/Windows-build-cabal-config
@@ -0,0 +1,10 @@
+package *
+  debug-info: False
+  split-sections: True
+  executable-stripping: True
+packages: .
+package pandoc
+  ghc-options: +RTS -A64m -RTS
+package pandoc-crossref
+  flags: +enable_flaky_tests
+  ghc-options: +RTS -A64m -RTS
diff --git a/misc/macOS-build-cabal-config b/misc/macOS-build-cabal-config
@@ -0,0 +1,9 @@
+package *
+  debug-info: False
+  executable-stripping: True
+packages: .
+package pandoc
+  ghc-options: -j +RTS -A64m -RTS
+package pandoc-crossref
+  flags: +enable_flaky_tests
+  ghc-options: -j +RTS -A64m -RTS
diff --git a/osx/Brewfile b/osx/Brewfile
diff --git a/pandoc-crossref.cabal b/pandoc-crossref.cabal
@@ -1,8 +1,10 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.2.
+-- This file has been generated from package.yaml by hpack version 0.33.0.
 --
 -- see: https://github.com/sol/hpack
+--
+-- hash: 97a8c365878e90cc416024d26e1d043d74721b0d4af2bfc5298831494d18a948
 
 name:           pandoc-crossref
 version:        0.4.0.0
@@ -39,8 +41,9 @@ data-files:
     test/m2m/list-of/expect.md
     test/m2m/list-of/input.md
     test/m2m/listing-captions-ids/expect.md
-    test/m2m/listing-captions-ids/expect.tex
     test/m2m/listing-captions-ids/input.md
+    test/m2m/multiple-eqn-same-para/expect.md
+    test/m2m/multiple-eqn-same-para/input.md
     test/m2m/numbering-parts/expect.md
     test/m2m/numbering-parts/input.md
     test/m2m/ref-attrs/expect.md

diff --git a/stack.yaml b/stack.yaml
@@ -10,8 +10,11 @@ packages:
 extra-deps:
 - roman-numerals-0.5.1.5
 - data-accessor-template-0.2.1.16
-- pandoc-2.10
+- pandoc-2.10.1
 - hslua-1.1.2
 - jira-wiki-markup-1.3.2
 - pandoc-types-1.21
-resolver: lts-16.3
+- commonmark-0.1.0.1
+- commonmark-extensions-0.2.0.1
+- commonmark-pandoc-0.2.0.0
+resolver: lts-16.7
diff --git a/test/m2m/listing-captions-ids/expect.tex b/test/m2m/listing-captions-ids/expect.tex
diff --git a/test/m2m/multiple-eqn-same-para/expect.md b/test/m2m/multiple-eqn-same-para/expect.md
@@ -0,0 +1,3 @@
+Simple test [$$x=y\qquad(1)$$]{#eq:1} [$$x=y\qquad(2)$$]{#eq:2}
+
+eqns. 1, 2
diff --git a/test/m2m/multiple-eqn-same-para/input.md b/test/m2m/multiple-eqn-same-para/input.md
@@ -0,0 +1,5 @@
+Simple test
+$$x=y$${#eq:1}
+$$x=y$${#eq:2}
+
+[@eq:1; @eq:2]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Simple test [$$x=y\qquad(1)$$]{#eq:1} [$$x=y\qquad(2)$$]{#eq:2}

		eqns. 1, 2