Commit graph

186 commits

Author SHA1 Message Date
John MacFarlane
551d8e8541 Reduce compiler noise (exact paths for compiled modules). 2018-01-15 20:59:21 -08:00
John MacFarlane
1d8f2edff0 Allow tasty 1.0. 2018-01-08 17:08:46 -08:00
John MacFarlane
ae6ba1533b Use latest skylighting and omit the 'missingincludes' check.
If you use a custom syntax definition that refers to a syntax
you haven't loaded, pandoc will now complain when it is highlighting
the text, rather than at the start.

This saves a huge performance hit from the `missingIncludes` check.

Closes #4226.
2018-01-07 19:24:08 -08:00
Albert Krewinkel
bdb911550c
Bump hslua version to 0.9.5
This version fixes a bug that made it difficult to handle failures while
getting lists or a Map from Lua. A bug in pandoc, which made it
necessary to always pass a tag when using MetaList or MetaBlock, is
fixed as a result. Using the pandoc module's constructor functions for
these values is now optional (if still recommended).
2018-01-04 23:15:28 +01:00
John MacFarlane
5af89c5e86 Use latest pandoc-citeproc. 2018-01-03 09:48:37 -08:00
John MacFarlane
ff6fd1a9b0 Use latest pandoc-citeproc. 2018-01-02 22:48:19 -08:00
John MacFarlane
11834216ef Use latest pandoc-citeproc. 2018-01-02 11:49:58 -08:00
John MacFarlane
710c658d4f Bump pandoc-citeproc to 0.12.2.2. 2017-12-28 22:56:29 -08:00
John MacFarlane
a8128831cf Use latest pandoc-citeproc. 2017-12-28 21:14:15 -08:00
John MacFarlane
ffa3d7160e Removed stack.pkg.yaml.
We only really need stack.yaml; we can put flag settings
for pandoc-citeproc there.

Also use ghc-8.0.2 in dockerized linux build.  This is
the only version available for alpine so far.
2017-12-27 20:21:37 -08:00
John MacFarlane
06ad9d08ea Use lts-10.1 resolver. 2017-12-26 22:07:00 -08:00
John MacFarlane
ac202e648b Stack builds with lts-10.0. 2017-12-19 22:28:25 -08:00
John MacFarlane
5e039d913f Changes for skylighting-0.5.
This fixes a bug in 2.0.4, whereby pandoc could not
read the theme files generated with `--print-highlight-style`.

It also fixes some CSS issues involving line numbers.
Highlighted code blocks are now enclosed in a div with class
sourceCode.

Highlighting CSS no longer sets a generic color for pre
and code; we only set these for class `sourceCode`.

This will close #4133 and #4128.
2017-12-10 21:13:05 -08:00
Albert Krewinkel
a7953a60b9
Bump lower bound of hslua
The release hslua 0.9.3 contains a new function which makes using
Haskell functions as package loaders much easier.
2017-12-04 13:34:10 +01:00
John MacFarlane
7a8c830734 Use latest tagsoup.
This fixes a bug in parsing tags with `&` following.

Closes #4094.  Closes #4088.
2017-11-30 15:59:06 -08:00
John MacFarlane
073bcae16c Use skylighting 0.4.4.1.
Closes #4103 (wrong color of unmarked code text when
numerLines is used).
2017-11-27 23:29:19 -08:00
John MacFarlane
51027cff29 Use skylighting 0.4.4. 2017-11-21 20:47:00 -08:00
Albert Krewinkel
53aafd6643 Lua filters: preload text module (#4077)
The `text` module is preloaded in lua. The module contains some UTF-8
aware string functions, implemented in Haskell.  The module is loaded on
request only, e.g.:

    text = require 'text'
    function Str (s)
      s.text = text.upper(s.text)
      return s
    end
2017-11-18 13:24:06 -08:00
John MacFarlane
5bedd6219a Use pandoc-types 1.17.3 2017-11-11 13:40:01 -08:00
John MacFarlane
32d95aa9f6 Use skylighting 0.4.3.2. 2017-11-04 22:01:03 -07:00
John MacFarlane
25f24af068 Use texmath 0.10. 2017-11-03 23:26:37 -07:00
John MacFarlane
d0548fe29c Use latest skylighting. 2017-11-03 11:29:15 -07:00
John MacFarlane
856587ff63 Use latest skylighting; ensure no duplicate ids on code lines.
The line identifiers are built using the code block's identifier
as a prefix. If the code block has null identifier, we use
"cb1", "cb2", etc.

Closes #4031.
2017-11-02 16:03:40 -07:00
John MacFarlane
76886678a6 Use skylighting 0.4.2.
This prevents the problem with extra space around highlighted
code blocks (closes #3996).

Note that we no longer put an enclosing div around highlighted
code blocks.  The pre is the outer element, just as for unhighlighted
blocks.
2017-10-26 15:57:55 -07:00
John MacFarlane
0463a57a5c Back to using alpine-based Dockerfile for linux build. 2017-10-22 15:04:49 -07:00
John MacFarlane
dc92c34827 Use doctemplates 0.2.1: allows $-- line comments in templates.
Closes #3806.
2017-10-20 22:44:49 -07:00
Albert Krewinkel
2262f005ce
Use hslua v0.9.0 2017-10-05 11:30:44 +02:00
John MacFarlane
e7ee5413b5 Use latest texmath. 2017-10-03 17:48:45 -07:00
John MacFarlane
c936714197 Use latest texmath. 2017-10-03 13:57:36 -07:00
John MacFarlane
950c68c835 Use latest skylighting. 2017-09-28 09:22:32 -07:00
John MacFarlane
5a3fa5207d Use pandoc-types 1.17.2. 2017-09-24 13:12:14 -07:00
John MacFarlane
438193197d stack.yaml - use new pandoc-citeproc (from git repo). 2017-09-23 23:02:15 -07:00
John MacFarlane
04aba6bd51 Use skylighting 0.4. 2017-09-15 09:36:54 -07:00
John MacFarlane
64472a468c FromJSON/ToJSON instances for Reader, WriterOptions.
Depends on skylighting 0.3.5.
2017-09-14 22:38:23 -07:00
John MacFarlane
5849b89e52 Use texmath 0.9.4.2 in stack.yaml. 2017-09-13 10:05:47 -07:00
John MacFarlane
8c8630c138 Use skylighting 0.3.4.1. 2017-09-09 21:05:02 -07:00
John MacFarlane
f297659d50 Use lts-9.1 in travis. 2017-08-23 07:11:57 -07:00
John MacFarlane
d70b89c0d9 Use pandoc-types 1.17.1. Tests updated for new simpleTable behavior...
with empty headers.
2017-08-20 23:24:51 -07:00
Albert Krewinkel
9b31835530 Update to hslua-0.8.0
hslua no longer provides lua stack instances for Int and Double, the
necessary instances are added to the Custom writer and the lua filtering
system.
2017-08-16 15:47:05 +02:00
Albert Krewinkel
2dc3dbd68b Use hslua >= 0.7, update Lua code 2017-08-13 14:23:54 +02:00
John MacFarlane
f92ca2993c Use haddock-library 1.4.3, since 1.4.5 requirse cabal 2. 2017-08-09 12:48:00 -07:00
John MacFarlane
fad784affa Added haddock-library-1.4.5 to stack.yaml for nightly. 2017-08-09 12:30:27 -07:00
John MacFarlane
14a44f53c8 Build config that works with lts-9.0 and nightly. 2017-08-09 12:14:35 -07:00
John MacFarlane
9c34bb1137 Remove cmark from stack.yaml. 2017-08-09 09:52:40 -07:00
John MacFarlane
2c81c4c218 Added gfm (GitHub-flavored CommonMark) as an input and output format.
This uses bindings to GitHub's fork of cmark, so it should parse
gfm exactly as GitHub does (excepting certain postprocessing
steps, involving notifications, emojis, etc.).

* Added Text.Pandoc.Readers.GFM (exporting readGFM)
* Added Text.Pandoc.Writers.GFM (exporting writeGFM)
* Added `gfm` as input and output forma

Note that tables are currently always rendered as HTML
in the writer; this can be improved when CMarkGFM supports
tables in output.
2017-08-07 16:59:31 -07:00
John MacFarlane
9932d52b53 Use latest cmark. 2017-08-02 09:20:06 -07:00
John MacFarlane
69388d52e3 Use latest texmath. 2017-06-30 20:39:53 +02:00
John MacFarlane
1bf38851dc stack.yaml - Use lts-8.16 resolver. 2017-06-04 18:18:24 +02:00
John MacFarlane
d414b2543a Remove https flag.
Supporting two completely different libraries for fetching
from URLs makes it difficult to trap errors, because of
different error types expected from the libraries.

There's no clear reason not to build with these https-capable
libraires.
2017-05-07 12:49:25 +02:00
John MacFarlane
022d58e02a stack.yaml: use lts-8.12.
This should fix the build failure on travis.
2017-05-02 09:24:33 +02:00
John MacFarlane
c5f4a0b9c5 Use foundation-0.0.7.
See https://github.com/haskell-foundation/foundation/issues/238
for the bug on Windows with 0.0.6.
2017-04-22 22:17:57 +02:00
John MacFarlane
ba27620e4f Use latest skylighting, lts. 2017-04-22 10:54:56 +02:00
Albert Krewinkel
0516b5127c
Drop dependency on hslua-aeson
Pushing values to the lua stack via custom functions is faster and more
flexible.
2017-04-14 11:21:12 +02:00
Alexander Krotov
9ac9e8d278 stack.yaml: update foundation to 0.0.6 (#3565)
foundation-0.0.4 from lts-8.8 does not build on FreeBSD
2017-04-09 18:19:33 +02:00
John MacFarlane
1778f23292 Use stack lts-8.8.
This gives us a newer verison of executable-path, which we need
for FreeBSD.
2017-04-09 10:16:55 +02:00
John MacFarlane
1c7f4e97e2 Use latest skylighting.
This means we no longer need language.dtd when loading
custom highlighting definitions.

See #3334.
2017-04-01 12:54:26 +02:00
Albert Krewinkel
1e13e98ecf
Ensure compatibility with hslua 0.5.*
The 0.5.0 release of hslua fixes problems with lua C modules on linux.
The signature of the `loadstring` function changed, so a compatibility
wrapper is introduced to allow both 0.4.* and 0.5.* versions to be used.
2017-03-24 21:31:35 +01:00
John MacFarlane
0e68c55955 stack.yaml: Use texmath-0.9.4. 2017-03-22 15:36:41 +01:00
Albert Krewinkel
f2f6851713 Lua filters (#3514)
* Add `--lua-filter` option.  This works like `--filter` but takes pathnames of special lua filters and uses the lua interpreter baked into pandoc, so that no external interpreter is needed.  Note that lua filters are all applied after regular filters, regardless of their position on the command line.
* Add Text.Pandoc.Lua, exporting `runLuaFilter`.  Add `pandoc.lua` to data files.
* Add private module Text.Pandoc.Lua.PandocModule to supply the default lua module.
* Add Tests.Lua to tests.
* Add data/pandoc.lua, the lua module pandoc imports when processing its lua filters.
* Document in MANUAL.txt.
2017-03-20 15:17:03 +01:00
John MacFarlane
ebb2acb890 stack.yaml: Use texmath 0.9.3. 2017-03-10 10:15:39 +01:00
John MacFarlane
5418f202df stack.yamls: use lts-8.4 and texmath-0.9.1.1. 2017-03-07 16:47:38 +01:00
John MacFarlane
9925739ba9 Require skylighting 0.3.1. 2017-03-04 10:33:52 +01:00
John MacFarlane
59666f79f3 Use latest skylighting (0.3). 2017-02-20 13:31:15 +01:00
John MacFarlane
42e2ac8536 Use new skylighting-0.2. 2017-02-20 00:31:57 +01:00
John MacFarlane
1e694805a1 stack.yamls: Use lts-8.0. 2017-02-12 19:16:53 +01:00
John MacFarlane
99c2a31749 Version bounds: require skylighting 0.1.1.4, bump bounds for blaze-*. 2017-01-31 14:45:36 +01:00
John MacFarlane
ae8ac926a4 Merge branch 'typeclass' 2017-01-29 22:13:03 +01:00
John MacFarlane
1b416dd12b Use latest skylighting. 2017-01-29 20:53:22 +01:00
John MacFarlane
2bac035632 Rely on skylighting 0.1.1.2. 2017-01-28 23:27:59 +01:00
John MacFarlane
01483f91bd Revert "Added page breaks into Pandoc."
This reverts commit f02a12aff638fa2339192231b8f601bffdfe3e14.
2017-01-25 17:07:43 +01:00
John MacFarlane
00f6549629 Added extra-dep: true to stack.yaml for url deps. 2017-01-25 17:07:43 +01:00
John MacFarlane
85b9abc7a3 Compile against pandoc-types 1.18.*. 2017-01-25 17:07:43 +01:00
John MacFarlane
faf4f7818b Use skylighting 0.1.1.1 in stack.yaml. 2017-01-21 23:30:24 +01:00
John MacFarlane
937b502923 Use skylighting 0.1.1.
Closes #3363.
2017-01-19 15:56:19 +01:00
John MacFarlane
9d781b1454 Updates to use skylighting rather than highlighting-kate.
So far this just reproduces capacity.

Later we'll be able to add features like warning
messages, dynamic loading of xml syntax definitions,
and dynamic loading of themes.
2016-12-23 18:07:49 -07:00
John MacFarlane
804bba1b64 stack.yaml - use texmath 0.9 release. 2016-11-30 12:43:23 +01:00
John MacFarlane
ac83d4b806 Use new module from texmath to lookup MS font codepoints.
+ Removed Text.Pandoc.Readers.Docx.Fonts
+ Moved its code to texmath; we now use (from texmath 0.9)
  Text.TeXMath.Unicode.Fonts
+ Use texmath 0.9 (currently from git).
+ Updated epub tests because texmath now handles more mathml.
2016-11-30 00:43:55 +01:00
John MacFarlane
08bf8f2e9d Updated stack.yaml to use lts 7.9 + latest pandoc-citeproc dev. 2016-11-27 20:24:23 +01:00
John MacFarlane
bd71569483 Use lts-7.5 resolver. 2016-10-26 12:32:30 +02:00
John MacFarlane
ea31c9e88b Use lts-7.4 resolver. 2016-10-18 14:46:17 +02:00
John MacFarlane
7a2d9a2646 stack.yaml - use latest pandoc-types. 2016-10-18 14:43:47 +02:00
John MacFarlane
f8603e6df5 Bump pandoc-types versions to 1.17.0.3 in stack.yaml. 2016-10-17 15:05:38 +02:00
John MacFarlane
54d54fc57f Use pandoc-types 1.17.0.2 in stack.yaml. 2016-10-17 13:59:58 +02:00
John MacFarlane
15902b31ab Try travis build with latest dev pandoc-types. 2016-10-17 13:48:20 +02:00
John MacFarlane
e298dc2065 BUmp pandoc-types version in stack.yamls. 2016-10-17 09:57:55 +02:00
John MacFarlane
8625ff21a9 Update stack.yamls to use pandoc-types 1.17 release. 2016-10-16 22:18:03 +02:00
John MacFarlane
b5c0eeb3ca Use newest pandoc-types from repo. 2016-10-13 21:01:28 +02:00
John MacFarlane
6156cdda13 Update stack.yaml files. 2016-10-13 13:02:18 +02:00
John MacFarlane
354c4ab04f Updated stack.yaml and windows/stack.yaml to use latest pandoc-types. 2016-10-13 11:51:44 +02:00
John MacFarlane
c28c16d463 Use doctemplates 0.1.0.2. 2016-10-02 12:29:37 +02:00
John MacFarlane
fcb45c3505 Use doctemplates 0.1.0.1. 2016-10-02 11:07:10 +02:00
John MacFarlane
5ec9b6352c Moved template compiling/rendering code to a separate library.
jgm/doctemplates.

This allows the pandoc templating system to be used independently.
2016-10-02 09:30:26 +02:00
John MacFarlane
c1d26a20cc Use lts-7.0 in stack.yaml files. 2016-09-23 12:50:56 +02:00
John MacFarlane
d2464de2af Use texmath 0.8.6.5. Closes #3040. 2016-07-24 10:56:19 -07:00
John MacFarlane
e9c20314d0 Use cmark-0.5.3.1 in stack.yaml. 2016-07-16 08:49:46 -07:00
John MacFarlane
c2bcefb39e Use cmark-0.5.3 in stack.yaml. 2016-07-15 12:32:25 -07:00
John MacFarlane
75a9ba5dca Use pandoc-citeproc-0.10.1 for packages. 2016-07-14 22:57:58 -07:00
John MacFarlane
106786ef1b stack.yaml - use ghc 8.01 and nightly. 2016-07-13 23:03:08 -07:00
John MacFarlane
374614aaf7 Depend on http-client 0.5, http-client-tls 0.3 2016-07-04 10:23:37 -07:00
John MacFarlane
44ce21e134 stack.yaml: use 6.5 resolver. 2016-07-03 11:54:11 -07:00