diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-11-19 22:41:12 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-11-19 23:14:23 -0800 |
| commit | 244cd5644b44f43722530379138bd7bb9cbace9b (patch) | |
| tree | 771cf6688ca92dc054616318372e6759fb594587 /pandoc.cabal | |
| parent | 1ad296dc69d0e901ce26d446b57758feea5a52c6 (diff) | |
| parent | 08243d53a68239fe60fdcb59ee71f6562b16f5c7 (diff) | |
| download | pandoc-244cd5644b44f43722530379138bd7bb9cbace9b.tar.gz | |
Merge branch 'new-image-attributes' of https://github.com/mb21/pandoc into mb21-new-image-attributes
* Bumped version to 1.16.
* Added Attr field to Link and Image.
* Added `common_link_attributes` extension.
* Updated readers for link attributes.
* Updated writers for link attributes.
* Updated tests
* Updated stack.yaml to build against unreleased versions of
pandoc-types and texmath.
* Fixed various compiler warnings.
Closes #261.
TODO:
* Relative (percentage) image widths in docx writer.
* ODT/OpenDocument writer (untested, same issue about percentage widths).
* Update pandoc-citeproc.
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index fd9a43179..c463d605b 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,5 +1,5 @@ Name: pandoc -Version: 1.15.2.1 +Version: 1.16 Cabal-Version: >= 1.10 Build-Type: Custom License: GPL @@ -264,7 +264,7 @@ Library xml >= 1.3.12 && < 1.4, random >= 1 && < 1.2, extensible-exceptions >= 0.1 && < 0.2, - pandoc-types >= 1.12.4 && < 1.13, + pandoc-types >= 1.16 && < 1.17, aeson >= 0.7 && < 0.11, tagsoup >= 0.13.1 && < 0.14, base64-bytestring >= 0.1 && < 1.1, @@ -412,7 +412,7 @@ Library Executable pandoc Build-Depends: pandoc, - pandoc-types >= 1.12.4 && < 1.13, + pandoc-types >= 1.16 && < 1.17, base >= 4.2 && <5, directory >= 1 && < 1.3, filepath >= 1.1 && < 1.5, @@ -469,7 +469,7 @@ Test-Suite test-pandoc Build-Depends: base >= 4.2 && < 5, syb >= 0.1 && < 0.7, pandoc, - pandoc-types >= 1.12.4 && < 1.13, + pandoc-types >= 1.16 && < 1.17, bytestring >= 0.9 && < 0.11, text >= 0.11 && < 1.3, directory >= 1 && < 1.3, |