diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-10-20 22:42:16 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-10-20 22:44:49 -0700 |
| commit | dc92c348275ad2de1da94033e0096cd610ee4883 (patch) | |
| tree | f32d87e43402742983d00d130468a3b17e070156 | |
| parent | 21328a87718818d78c658c87a2c42298453cc45f (diff) | |
| download | pandoc-dc92c348275ad2de1da94033e0096cd610ee4883.tar.gz | |
Use doctemplates 0.2.1: allows `$--` line comments in templates.
Closes #3806.
| -rw-r--r-- | MANUAL.txt | 3 | ||||
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | stack.pkg.yaml | 6 | ||||
| -rw-r--r-- | stack.yaml | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/MANUAL.txt b/MANUAL.txt index b8392a701..eacd11275 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1643,6 +1643,9 @@ and modifying your custom templates accordingly. An easy way to do this is to fork the [pandoc-templates] repository and merge in changes after each pandoc release. +Templates may contain comments: anything on a line after `$--` +will be treated as a comment and ignored. + [pandoc-templates]: https://github.com/jgm/pandoc-templates Pandoc's Markdown diff --git a/pandoc.cabal b/pandoc.cabal index a0c85e830..ea6d98f58 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -334,7 +334,7 @@ library JuicyPixels >= 3.1.6.1 && < 3.3, Glob >= 0.7 && < 0.9, cmark-gfm >= 0.1.1 && < 0.2, - doctemplates >= 0.1 && < 0.2, + doctemplates >= 0.2.1 && < 0.3, http-client >= 0.4.30 && < 0.6, http-client-tls >= 0.2.4 && < 0.4, http-types >= 0.8 && < 0.10, diff --git a/stack.pkg.yaml b/stack.pkg.yaml index 9d52469d0..b7cf8436f 100644 --- a/stack.pkg.yaml +++ b/stack.pkg.yaml @@ -18,12 +18,12 @@ packages: extra-dep: false extra-deps: - pandoc-types-1.17.2 -- texmath-0.9.4.4 - hslua-0.9.0 - skylighting-0.4.1 - cmark-gfm-0.1.1 - QuickCheck-2.10.0.1 - tasty-quickcheck-0.9.1 -- haddock-library-1.4.3 - hs-bibutils-6.2.0.1 -resolver: lts-9.1 +- doctemplates-0.2.1 +- haddock-library-1.4.3 +resolver: lts-9.9 diff --git a/stack.yaml b/stack.yaml index d4d7a7b4f..035173389 100644 --- a/stack.yaml +++ b/stack.yaml @@ -8,11 +8,11 @@ packages: - '.' extra-deps: - pandoc-types-1.17.2 -- texmath-0.9.4.4 - hslua-0.9.0 - skylighting-0.4.1 - cmark-gfm-0.1.1 - QuickCheck-2.10.0.1 - tasty-quickcheck-0.9.1 +- doctemplates-0.2.1 - haddock-library-1.4.3 -resolver: lts-9.1 +resolver: lts-9.9 |