Commit graph

522 commits

Author SHA1 Message Date
John MacFarlane
971b861ef2 Use new pandoc-citeproc, rfc5051. 2020-08-02 09:40:24 -07:00
John MacFarlane
57e29610ac Use skylighting 0.9. 2020-07-31 08:56:59 -07:00
John MacFarlane
5c4ff810d1 Use commonmark-extensions 0.2.0.1. 2020-07-24 11:24:34 -07:00
John MacFarlane
c37a56e060 Use commonmark-0.1.0.1.
Partially addresses #6556.
2020-07-23 16:36:44 -07:00
John MacFarlane
e17b4718d4 Use commonmark-extensions, commonmark-pandoc 0.2. 2020-07-19 22:51:59 -07:00
John MacFarlane
d6b7b1dc77 Remove use of cmark-gfm for commonmark/gfm rendering.
Instead rely on the markdown writer with appropriate extensions.

Export writeCommonMark variant from Markdown writer.
This changes a few small things in rendering markdown,
e.g. w/r/t requiring backslashes before spaces inside
super/subscripts.
2020-07-19 22:51:59 -07:00
John MacFarlane
0df5ea87cf Use released versions of commonmark libraries. 2020-07-19 22:51:59 -07:00
John MacFarlane
3a22fbd11b Trim down githubMarkdownExtensions.
Previously it included all of the following, which make
sense for the legacy markdown_github but not for gfm,
since they are part of base commonmark and thus
can't be turned off in gfm:

- `Ext_all_symbols_escapable`
- `Ext_backtick_code_blocks`
- `Ext_fenced_code_blocks`
- `Ext_space_in_atx_header`
- `Ext_intraword_underscores`
- `Ext_lists_without_preceding_blankline`
- `Ext_shortcut_reference_links`
`
These have been removed from `githubMarkdownExtensions`, though
they're still turned on for legacy `markdown_github`.
2020-07-19 22:51:59 -07:00
John MacFarlane
0db4702042 Use commonmark-hs to parse commonmark/gfm...
...instead of cmark-gfm (a wrapper around a C library).

We can now support many more pandoc extensions for
commonmark and gfm.

Add fenced_code_attributes to gfm/commonmark extensions.
2020-07-19 22:51:59 -07:00
John MacFarlane
a7d7c29bf7 Bump hslua in stack.yaml 2020-06-28 10:24:06 -07:00
John MacFarlane
3b25511e47 Use released pandoc-citeproc. 2020-06-23 10:44:22 -07:00
John MacFarlane
c5c8bc96a1 Use released pandoc-types 1.21. 2020-06-22 16:39:04 -07:00
Albert Krewinkel
064303e2c9
Jira writer: always escape braces
Braces are now always escaped, even within words or when surrounded by
whitespace. Jira and Confluence treat braces specially.

Package jira-wiki-markup must be version 1.3.2 or later.

Fixes: #6478
2020-06-22 16:30:11 +02:00
John MacFarlane
112e98def6 Use latest skylighting. 2020-06-19 15:31:31 -07:00
John MacFarlane
aa9bcce4f9 Bump jira-wiki-markup in stack.yaml. 2020-06-14 23:38:41 -07:00
Mathieu Boespflug
9d076ed7ea
Make it possible to compile using Stack on NixOS (#6439)
On NixOS, it is necessary to compile with `stack --nix`. It is
furthermore necessary to provide zlib headers when `--nix` is enabled.
2020-06-07 17:32:16 -07:00
John MacFarlane
46179d5b3e Use latest skylighting.
This adds `aria-hidden="true"` to the empty a elements, which
helps people who use screen readers.
2020-05-12 14:37:07 -07:00
John MacFarlane
1918944c99 Add needed dependency to stack.yaml. 2020-05-04 23:01:42 -07:00
John MacFarlane
8d0c124e5f Update dependency versions in stack.yaml. 2020-05-04 14:47:00 -07:00
John MacFarlane
d3ec53b3cc Revert "Use lts-15.11 stack"
This reverts commit b78fb28898.
2020-05-04 14:44:08 -07:00
John MacFarlane
2662a60db2 Revert "Try downgrading HsYAML on stack to 0.2.0.0."
This reverts commit 32d5d6c80b.
2020-05-04 12:14:38 -07:00
John MacFarlane
32d5d6c80b Try downgrading HsYAML on stack to 0.2.0.0.
to deal with the access violation we get in CI windows:
https://github.com/jgm/pandoc/runs/643362477?check_suite_focus=true
2020-05-04 09:35:41 -07:00
John MacFarlane
5b7364d02f Revert "Try using -fexternal-interpreter to avoid access violation on Windows CI."
This reverts commit 58115dd07f.
2020-05-04 08:43:02 -07:00
John MacFarlane
58115dd07f Try using -fexternal-interpreter to avoid access violation on Windows CI. 2020-05-03 23:39:32 -07:00
John MacFarlane
b78fb28898 Use lts-15.11 stack 2020-05-03 21:34:11 -07:00
John MacFarlane
8d09a92d97 Use latest pandoc-types master with underline addition. 2020-04-27 09:35:34 -07:00
John MacFarlane
64e84d8a3e Use dev version of pandoc-citeproc...
so we can use pandoc-types 1.21 with it.
2020-04-19 09:00:18 -07:00
John MacFarlane
61771e2c9b Use pandoc-types 1.21, new texmath. 2020-04-19 08:17:32 -07:00
Albert Krewinkel
fb54f3d679
API change: use PandocError for exceptions in Lua subsystem
The PandocError type is used throughout the Lua subsystem, all Lua
functions throw an exception of this type if an error occurs. The
`LuaException` type is removed and no longer exported from
`Text.Pandoc.Lua`. In its place, a new constructor `PandocLuaError` is
added to PandocError.
2020-04-17 21:52:48 +02:00
John MacFarlane
7accbd585e Use main pandoc-types repository...
now that @despresc's changes have been merged.
2020-04-17 10:05:55 -07:00
Albert Krewinkel
75d7e69532 Use custom pandoc-types repo with new table types 2020-04-15 23:03:22 -04:00
despresc
c7814f31e1 Use the new builders, modify readers to preserve empty headers
The Builder.simpleTable now only adds a row to the TableHead when the
given header row is not null. This uncovered an inconsistency in the
readers: some would unconditionally emit a header filled with empty
cells, even if the header was not present. Now every reader has the
conditional behaviour. Only the XWiki writer depended on the header
row being always present; it now pads its head as necessary.
2020-04-15 23:03:22 -04:00
despresc
d368536a4e Adapt to the removal of the RowSpan, ColSpan, RowHeadColumns accessors 2020-04-15 23:03:22 -04:00
despresc
4e34d366df Adapt to the newest Table type, fix some previous adaptation issues
- Writers.Native is now adapted to the new Table type.

- Inline captions should now be conditionally wrapped in a Plain, not
  a Para block.

- The toLegacyTable function now lives in Writers.Shared.
2020-04-15 23:03:22 -04:00
despresc
7254a2ae0b Implement the new Table type 2020-04-15 23:03:22 -04:00
John MacFarlane
58cd731e51 Require doctemplates 0.8.2. 2020-04-12 22:25:31 -07:00
Albert Krewinkel
c3f539364a
Jira: support citations, attachment links, and user links
Closes: #6231
Closes: #6238
Closes: #6239
2020-04-04 14:27:27 +02:00
Albert Krewinkel
09a5a1f447
Jira reader: fix multiple parsing problems
Multiple parsing problems are resolved, including issues with empty
table cells, faulty recognition of closing emphasis characters, and
parsing of image attributes.

Fixes: #6212
Fixes: #6219
Fixes: #6220
2020-03-28 15:57:00 +01:00
Albert Krewinkel
44f8c2725e
Jira reader: fix parsing of tables without preceding blankline
A bug was fixed which caused faulty parsing if a table was not preceded
by a newline and the first table cell had no space after the initial `|`
characters.

Fixes: #6198
2020-03-19 21:27:35 +01:00
Albert Krewinkel
81d46435f6
Jira reader: fix parsing of strikeout, emphasis
A bug was fixed which caused non-emphasized text containing digits and/or
non-special symbols (like dots) to sometimes be parsed incorrectly.

Fixes: #6196
2020-03-18 21:32:05 +01:00
Albert Krewinkel
7eb9914841
Jira reader: support colored inline text, indented lists
* Support for colored inlines has been added.
* Lists are now allowed to be indented; i.e., lists are still recognized
  if list markers are preceded by spaces.

Closes: #6183, #6184
2020-03-13 09:52:28 +01:00
John MacFarlane
9feefa3931 Revert "stack.yaml - switch to lts-15."
This reverts commit a238128a8e.

This version fails on Windows.  We get the following log output:

Stack has not been tested with GHC versions above 8.6, and using 8.8.2, this may fail
Stack has not been tested with Cabal versions above 2.4, but version 3.0.1.0 was found, this may fail
Building all executables for `pandoc' once. After a successful build of all of them, only specified executables will be rebuilt.
pandoc> configure (lib + exe + test)
Configuring pandoc-2.9.2...
pandoc> build (lib + exe + test)
Preprocessing library for pandoc-2.9.2..
Building library for pandoc-2.9.2..
[  1 of 162] Compiling Paths_pandoc
[  2 of 162] Compiling Text.Pandoc.App.FormatHeuristics
[  3 of 162] Compiling Text.Pandoc.Asciify
[  4 of 162] Compiling Text.Pandoc.CSV
[  5 of 162] Compiling Text.Pandoc.Data
C:\Users\runneradmin\AppData\Roaming\stack\snapshots\9b7c3910\lib\x86_64-windows-ghc-8.8.2\texmath-0.12.0.1-LHa5Nt7Y9k12Dq03wVcYbb\HStexmath-0.12.0.1-LHa5Nt7Y9k12Dq03wVcYbb.o: unhandled PEi386 relocation type 0
ghc.exe: unable to load package `texmath-0.12.0.1'
      C:\Users\runneradmin\AppData\Roaming\stack\setup-exe-cache\x86_64-windows\Cabal-simple_Z6RU0evB_3.0.1.0_ghc-8.8.2.exe --builddir=.stack-work\dist\29cc6475 build lib:pandoc exe:pandoc test:test-pandoc --ghc-options " -fdiagnostics-color=always"
2020-02-17 16:52:46 -08:00
John MacFarlane
a238128a8e stack.yaml - switch to lts-15. 2020-02-17 15:59:18 -08:00
John MacFarlane
87b9ee87e6 Use pandoc-citeproc 0.17. 2020-02-15 21:51:39 -08:00
John MacFarlane
33fcac40d5 Use latest texmath. 2020-02-15 09:12:56 -08:00
John MacFarlane
3b4dc3a2b0 Use skylighting 0.8.3.2. 2020-01-21 17:57:23 -08:00
John MacFarlane
9009bda179 Update versions for doclayout, doctemplates.
Closes #6031.  The new version of doclayout fixes a
memory leak that affected `--include-in-header` with
large files (and possibly other cases involving extremely
long lines).
2020-01-13 08:39:25 -08:00
Albert Krewinkel
96c80b156d Add jira reader (#5913)
Closes #5556
2019-12-17 21:07:46 -08:00
John MacFarlane
4ced99b5db Bump pandoc-citeproc version to 0.16.4.1. 2019-12-11 13:53:45 -08:00
John MacFarlane
0bfe478a69 Use external emojis package.
Moved the emoji-specified code into an external package
we can depend on.
2019-12-08 17:27:18 -08:00
John MacFarlane
5295607de7 Use doctemplates 0.8. 2019-12-07 12:31:05 -08:00
John MacFarlane
ec219f911e Use skylighting 0.8.3. 2019-11-26 10:41:43 -08:00
John MacFarlane
7fb9432ae1 Update to doctemplates 0.7.2, update template docs.
This adds the `nowrap` filter.
2019-11-24 09:53:45 -08:00
John MacFarlane
138d0b1b3e Use released pandoc-citeproc 0.16.4. 2019-11-21 21:40:35 -08:00
John MacFarlane
06124fb863 Use doctemplates 0.7.1 2019-11-18 17:46:43 -08:00
John MacFarlane
787ad00167 Use dev version of doctemplates. 2019-11-17 22:44:40 -08:00
despresc
90e436d496 Switch to new pandoc-types and use Text instead of String [API change].
PR #5884.

+ Use pandoc-types 1.20 and texmath 0.12.
+ Text is now used instead of String, with a few exceptions.
+ In the MediaBag module, some of the types using Strings
  were switched to use FilePath instead (not Text).
+ In the Parsing module, new parsers `manyChar`, `many1Char`,
  `manyTillChar`, `many1TillChar`, `many1Till`, `manyUntil`,
  `mantyUntilChar` have been added: these are like their
  unsuffixed counterparts but pack some or all of their output.
+ `glob` in Text.Pandoc.Class still takes String since it seems
  to be intended as an interface to Glob, which uses strings.
  It seems to be used only once in the package, in the EPUB writer,
  so that is not hard to change.
2019-11-12 16:03:45 -08:00
John MacFarlane
9c7f75afb5 Change merge behavior for metadata.
Previously, if a document contained two YAML metadata blocks
that set the same field, the conflict would be resolved in favor
of the first. Now it is resolved in favor of the second (due to
a change in pandoc-types).

This makes the behavior more uniform with other things in pandoc
(such as reference links and `--metadata-file`).
2019-11-07 10:48:38 -08:00
John MacFarlane
803ab48a20 Use latest pandoc-citeproc 0.16.3.1 in binary packages. 2019-11-04 09:32:56 -08:00
John MacFarlane
4f1224dc0b Use latest doclayout.
Closes #5863.
2019-10-30 21:26:21 -07:00
John MacFarlane
1fe9742263 Changes to build with new doctemplates/doclayout.
The new version of doctemplates adds many features to pandoc's
templating system, while remaining backwards-compatible.
New features include partials and filters.  Using template filters,
one can lay out data in enumerated lists and tables.

Templates are now layout-sensitive: so, for example, if a
text with soft line breaks is interpolated near the end of
a line, the text will break and wrap naturally.  This makes
the templating system much more suitable for programatically
generating markdown or other plain-text files from metadata.
2019-10-29 22:21:35 -07:00
John MacFarlane
b80bd174a2 Use latest dev doctemplates 2019-10-16 09:25:52 -07:00
John MacFarlane
f1fd120d4a Use latest dev doctemplates. 2019-10-15 22:33:29 -07:00
John MacFarlane
a0aeb135b3 Minor template & test changes for latest dev doctemplates. 2019-10-14 23:42:29 -07:00
John MacFarlane
1985199ce8 stack.yaml - re-add HsYAML-aeson, as pandoc-citeproc uses it 2019-10-11 08:20:27 -07:00
John MacFarlane
7388cd3e7a Improve parsing of --defaults.
- Add FromYAML instances to Opt and to all subsidiary types.
- Remove the use of HsYAML-aeson, which doesn't give good
  position information on errors.
- Rename some fields in Opt to better match cli options or
  reflect what the ycontain [API change]:

  + optMetadataFile -> optMetadataFiles
  + optPDFEngineArgs -> optPDFEngineOpts
  + optWrapText -> optWrap
- Add IpynbOutput enumerated type to Text.Pandoc.App.Opts.
  Use this instead fo a string for optIpynbOutput.
- Add FromYAML instance for Filter in Text.Pandoc.Filters.

With these changes parsing of defaults files should be
complete and should give decent error messages.

Now (unlike before) we get an error if an unknown field
is used.
2019-10-10 23:21:18 -07:00
John MacFarlane
3aa069e1d5 Change optVariables from [(String, String)] to Context Text.
In Text.Pandoc.App.Opt [API change].
2019-10-09 11:01:33 -07:00
John MacFarlane
aceee9ca48 Options.WriterOptions: Change type of writerVariables to Context Text.
This will allow structured values.

[API change]
2019-10-09 11:01:33 -07:00
John MacFarlane
8fb9a0d168 Remove derive_json_via_th flag; always use TH.
This cuts down on code duplication and reduces the chance
for errors.  See #4083.
2019-10-07 21:23:50 -07:00
John MacFarlane
b235a187dc Make derive_json_via_th flag false by default 2019-10-07 17:33:41 -07:00
John MacFarlane
ceeb565203 stack.yaml - added some missing flags 2019-10-06 16:53:23 -07:00
John MacFarlane
4ca1db0643 Require haddock-library >= 1.8 2019-10-04 07:20:48 -07:00
John MacFarlane
20c87962e3 Use texmath 0.11.3 2019-10-03 21:59:06 -07:00
John MacFarlane
383023374b Use latest skylighting. 2019-10-03 11:11:23 -07:00
John MacFarlane
89c916d830 Use latest skylighting-core.
Closes #5776.
2019-09-30 22:48:10 -07:00
John MacFarlane
4212c09296 Use skylighting >= 0.8.2.2. 2019-09-30 22:48:10 -07:00
John MacFarlane
d98dde07c9 Used released pandoc-citeproc 0.16.3. 2019-09-25 18:03:57 -07:00
John MacFarlane
fe72c9bbe4 Use latest skylighting.
This addresses #5776 for now, though ultimately we need a
new release of regex-pcre-builtin or some other solution.
2019-09-25 17:36:17 -07:00
John MacFarlane
251e2b2d6d Use latest texmath. 2019-09-24 15:14:13 -07:00
John MacFarlane
570b96f4e8 Use pandoc-types 1.17.6.1 2019-09-24 09:39:00 -07:00
John MacFarlane
f60ae7f327 Update pandoc-citeproc commit. 2019-09-22 22:09:51 -07:00
John MacFarlane
a846ce9dd4 Add HsYAML-aeson to stack.yaml. 2019-09-22 21:43:30 -07:00
John MacFarlane
74e25c5480 Use latest pandoc-citeproc. 2019-09-22 17:03:40 -07:00
John MacFarlane
ad64ec613d Switch to lts-14 resolver and ghc 8.6. 2019-09-22 12:43:29 -07:00
John MacFarlane
a9d106d1d1 Use released doctemplates 2019-09-22 10:58:04 -07:00
John MacFarlane
b64410ff9c Use HsYAML-0.2.0.0
Most of this is due to @vijayphoenix (#5704), but it
needed some revisions to integrate with current
master, and to use the released HsYAML.

Closes #5704.
2019-09-22 10:38:15 -07:00
John MacFarlane
bb362fd76c Add partial styles.html in HTML5 template.
Avoid duplication in HTML templates by using styles.html partial.
Change indentation of styles in template.
2019-09-05 12:39:50 -07:00
John MacFarlane
d0bddaf7b9 Use latest pandoc-citeproc. 2019-09-02 21:26:20 -07:00
John MacFarlane
e9ba29e57f Use doctemplates 0.6. 2019-09-02 11:14:14 -07:00
John MacFarlane
ffbd690cbc Simplify stack.yaml after cabal file changes.
We don't need so many local ghc options now that they're
specified in pandoc.cabal.

I've kept `-fhide-source-paths` (in case we move this out
of pandoc.cabal) and `-Wno-missing-home-modules` (which seems
to be needed for `stack ghci` to work).
2019-08-26 17:37:06 -07:00
John MacFarlane
8a26422bfc Use dev version of doctemplates. 2019-08-25 23:49:40 -07:00
John MacFarlane
1ee6e0e087 Use new doctemplates, doclayout.
+ Remove Text.Pandoc.Pretty; use doclayout instead. [API change]
+ Text.Pandoc.Writers.Shared: remove metaToJSON, metaToJSON'
  [API change].
+ Text.Pandoc.Writers.Shared: modify `addVariablesToContext`,
  `defField`, `setField`, `getField`, `resetField` to work with
  Context rather than JSON values. [API change]
+ Text.Pandoc.Writers.Shared: export new function `endsWithPlain` [API
  change].
+ Use new templates and doclayout in writers.
+ Use Doc-based templates in all writers.
+ Adjust three tests for minor template rendering differences.
+ Added indentation to body in docbook4, docbook5 templates.

The main impact of this change is better reflowing of content
interpolated into templates.  Previously, interpolated variables
were rendered independently and intepolated as strings, which could lead
to overly long lines.  Now the templates interpolated as Doc values
which may include breaking spaces, and reflowing occurs
after template interpolation rather than before.
2019-08-25 14:24:31 -07:00
John MacFarlane
5b11ca03e1 Use released pandoc-types. 2019-08-23 12:50:58 -07:00
Albert Krewinkel
813e1fc7e0
Lua: add module for AST element sequence traversal
Lua filters must be able to traverse sequences of AST elements and to
replace elements by splicing sequences back in their place. Special
`Walkable` instances can be used for this; those are provided in a new
module `Text.Pandoc.Lua.Walk`.
2019-08-16 20:52:15 +02:00
John MacFarlane
ec55382f8d Fix stack.yaml. 2019-08-07 08:33:30 -07:00
John MacFarlane
ea3a779f7b Use dev version of pandoc-citeproc. 2019-08-05 10:51:06 -07:00
John MacFarlane
82d94d1452 Use latest doctemplates. 2019-07-29 10:56:43 -07:00
John MacFarlane
b35fae6511 Use doctemplates 0.3, change type of writerTemplate.
* Require recent doctemplates.  It is more flexible and
  supports partials.
* Changed type of writerTemplate to Maybe Template instead
  of Maybe String.
* Remove code from the LaTeX, Docbook, and JATS writers that looked in
  the template for strings to determine whether it is a book or an
  article, or whether csquotes is used. This was always kludgy and
  unreliable.  To use csquotes for LaTeX, set `csquotes` in your
  variables or metadata. It is no longer sufficient to put
  `\usepackage{csquotes}` in your template or header includes.
  To specify a book style, use the `documentclass` variable or
  `--top-level-division`.
* Change template code to use new API for doctemplates.
2019-07-28 19:25:45 -07:00
John MacFarlane
25939c0838 stack.yaml - use latest skylighting. 2019-07-14 10:40:17 -07:00
John MacFarlane
23ddb47520 Use latest skylighting. 2019-06-13 10:20:59 -07:00
John MacFarlane
dddad515e8 Update pandoc-citeproc and skylighting versions. 2019-06-04 09:01:50 -07:00
John MacFarlane
0be83f24a9 Specify skylighting 0.8 as extra-deps. 2019-05-27 22:28:49 -07:00
John MacFarlane
20144a205e Disable missing-home-modules warning in stack.yaml.
Otherwise 'stack ghci' fails.
2019-05-23 09:47:09 -07:00
Albert Krewinkel
6208d4e7fc Improve output of Lua tests (#5499)
This makes use of tasty-lua, a package to write tests in Lua
and integrate the results into Tasty output. Test output becomes
more informative: individual tests and test groups become visible
in test output. Failures are reported with helpful error messages.
2019-05-20 12:52:28 -04:00
Albert Krewinkel
786594b23b Lua: add pandoc.system module (#5468)
The `system` Lua module provides utility functions to interact with the
operating- and file system. E.g.

    print(pandoc.system.get_current_directory())

or

    pandoc.system.with_temporary_directory('tikz', function (dir)
      -- write and compile a TikZ file with pdflatex
    end)
2019-05-04 01:06:30 -04:00
John MacFarlane
66ffe1831e Update stack.yaml, use latest pandoc-citeproc and lts-13. 2019-04-18 21:36:39 -07:00
John MacFarlane
0e37ed9f50 Use cmark-gfm 0.2.0. 2019-04-09 09:15:49 -07:00
John MacFarlane
9c7a57d648 stack.yml - remove -Wmissing-home-modules
This seems to cause problems with stack ghci.
2019-03-28 17:02:25 -07:00
John MacFarlane
33476b30f9 stack.yaml: remove RTS options 2019-03-28 08:58:11 -07:00
John MacFarlane
03293a4ac4 Quote RTS options in stack.yaml. 2019-03-27 09:36:27 -07:00
John MacFarlane
9e876fb568 Add nice default ghc options to stack.yaml. 2019-03-27 09:22:24 -07:00
John MacFarlane
cdad322a98 Use cmark-gfm-0.1.8. 2019-03-13 21:16:51 -07:00
John MacFarlane
12e36ba827 Use latest pandoc-citeproc. 2019-03-12 23:27:45 -07:00
John MacFarlane
12afafdf7f Use latest pandoc-citeproc, texmath. 2019-03-07 22:09:22 -08:00
John MacFarlane
70ab78e294 Use latest pandoc-citeproc. Updated cahngelog. 2019-03-02 17:49:55 -08:00
John MacFarlane
3eb50cc2e9 Require texmath 0.11.2.1 2019-03-02 16:29:59 -08:00
John MacFarlane
f152d4d53b Remove workaround for foundation, now that the bug is fixed. 2019-02-27 23:54:53 -08:00
John MacFarlane
be14a95f07 Use latest skylighting.
This should fix #5328.
2019-02-27 22:14:01 -08:00
John MacFarlane
fb5bafd13e Use latest pandoc-citeproc (0.16.1). 2019-02-15 15:05:46 -08:00
John MacFarlane
b6cf490efd Use latest skylighting. 2019-02-10 08:06:53 -08:00
John MacFarlane
4ef23623d3 Use pandoc-citeproc-0.16.0.2 2019-02-07 10:00:21 -08:00
John MacFarlane
5e1dc5809b stack.yaml - use latest pandoc-citeproc. 2019-02-06 10:56:11 -08:00
John MacFarlane
13c1cb82b6 stack.yaml - use latest texmath. 2019-01-30 22:10:20 -08:00
John MacFarlane
18a9c7c0e0 Update stack.yaml to use lts-13. 2019-01-30 14:38:35 -08:00
John MacFarlane
1c8097136b Update pandoc-citeproc commit in stack.yaml. 2019-01-25 06:58:28 -08:00
John MacFarlane
395ea03069 Support ipynb (Jupyter notebook) as input and output format.
[API change]

* Depend on ipynb library.

* Add `ipynb` as input and output format.

* Added Text.Pandoc.Readers.Ipynb (supports both nbformat v3 and v4).

* Added Text.Pandoc.Writers.Ipynb (supports nbformat v4).

* Added ipynb readers and writers to T.P.Readers,
  T.P.Writers, and T.P.Extensions.  Register the
  file extension .ipynb for this format.

* Add `PandocIpynbDecodingError` constructor to Text.Pandoc.Error.Error.

* Note: there is no template for ipynb.
2019-01-22 21:45:59 -08:00
John MacFarlane
4dc732f28f Update stack resolver. 2018-12-16 08:19:11 -08:00
John MacFarlane
80e86109a2 Use compatible version of pandoc-citeproc. 2018-12-02 09:33:50 -08:00
John MacFarlane
6513de055a stack.yaml - use skylighting 0.7.5. 2018-12-01 15:54:57 -08:00
John MacFarlane
8ae18138df Use latest dev version of pandoc-citeproc.
IT allows pandoc 2.5.
2018-11-23 10:21:24 -05:00
John MacFarlane
5d8289665a Clean up stack.yaml, allow latest pandoc-citeproc. 2018-11-13 07:53:29 -08:00
John MacFarlane
16af096a68 stack.yaml - use latest versions of packages.
pandoc-citeproc, HsYaml, yaml.
2018-11-11 14:45:59 -08:00
John MacFarlane
123381765c Use latest texmath. 2018-10-24 12:06:37 -07:00
John MacFarlane
4333556bcf stack.yaml - use latest cmark-gfm, pandoc-citeproc. 2018-10-19 20:28:35 -07:00
John MacFarlane
ebdb2deb0d Updated version bounds for containers and haddock-library.
Allow haddock-library 1.7 and containers 0.6.*.

Closes #4974.
2018-10-17 17:30:14 -07:00
John MacFarlane
ab3e41c822 Use pandoc-citeproc 0.14.7. 2018-10-14 14:49:34 -07:00
John MacFarlane
78871c9b96 Use pandoc-citeproc 0.14.6. 2018-10-13 09:37:45 -07:00
John MacFarlane
2e9a8d207b Require skylighting 0.7.4.
Closes #4920.
2018-10-08 22:48:13 -07:00
Albert Krewinkel
9abdbb2783
Lua filters: report traceback when an error occurs
A proper Lua traceback is added if either loading of a file or execution
of a filter function fails. This should be of help to authors of Lua
filters who need to debug their code.
2018-10-01 16:32:11 +02:00
Albert Krewinkel
56fe5b559e
Use hslua v1.0.0 2018-09-24 20:11:27 +02:00
John MacFarlane
47034fd781 Use released version of pandoc-citeproc (0.14.4). 2018-09-16 20:00:26 -07:00
John MacFarlane
5df45fd1fe Use latest texmath. 2018-09-09 14:38:11 -07:00
John MacFarlane
01f39c5991 stack.yaml tweaks.
Use a patched version of foundation until
https://github.com/haskell-foundation/foundation/pull/503
is fixed.

Use latest pandoc-citeproc.
2018-09-06 23:09:17 -07:00
John MacFarlane
97a176aaaa stack.yaml: use latest dev version of pandoc-citeproc. 2018-09-03 23:50:50 -07:00
John MacFarlane
d0072002f5 Use yaml-0.9.0 in stack.yaml. 2018-08-22 13:40:54 -07:00
John MacFarlane
df22464434 Use latest pandoc-citeproc.
This should fix build failure on appveyor.
2018-08-22 08:33:38 -07:00
John MacFarlane
0d9c0b1b5b stack.yaml: use lts 12.6 and latest git pandoc-citeproc. 2018-08-16 22:03:44 -07:00
John MacFarlane
3e35292707 Revert "Try limiting to aeson-pretty-0.8.5."
This reverts commit ceec41072a.
2018-07-14 12:27:07 -07:00
John MacFarlane
ceec41072a Try limiting to aeson-pretty-0.8.5.
That built before on appveyor...
2018-07-14 12:10:21 -07:00
John MacFarlane
71e55f520e Use latest network.
Hopefully this will build on Windows.
See https://ci.appveyor.com/project/jgm/pandoc/build/1.0.2625/job/tfpvh7rxue26phoq
2018-07-13 10:54:21 -07:00
John MacFarlane
23e6e8e221 Add pandoc-citeproc to stack.yaml. 2018-07-13 10:15:29 -07:00
John MacFarlane
f7485f8850 Use lts-12 for stack.yaml, add stack.lts11.yaml.
Also adjusted some minor versions in extra-deps.
2018-07-13 09:51:13 -07:00
John MacFarlane
b153d028ee Add stack.lts10.yaml, switch to lts11 in stack.yaml. 2018-07-13 09:20:28 -07:00
John MacFarlane
e49b8304e4 Use HsYAML instead of yaml for translations, YAML metadata.
yaml wraps a C library; HsYAML is pure Haskell.
Closes #4747.  Advances #4535.
2018-06-29 23:21:25 +02:00
John MacFarlane
06bcb7c872 Remove network-uri flag and use 'Network.Socket'.
This removes a compiler warning.
There is no need for the old network-uri flag, since
network 2.6 was released in 2014.
2018-06-28 11:51:52 +02:00
John MacFarlane
8b4728e284 Use latest pandoc-types (1.17.5). 2018-06-11 11:05:48 -07:00
John MacFarlane
edcfbccf5d Use skylighting 0.7.2. Adjust tests.
This should fix commercialhaskell/stackage#3719, once
a new release is made.
2018-06-09 13:34:21 -07:00
John MacFarlane
81ed7948da Use haddock-library 1.6.0. 2018-05-20 17:05:23 -07:00
John MacFarlane
c3d2572c5f Use texmath-0.11. 2018-05-10 12:10:35 -07:00
John MacFarlane
dba86dcceb Use texmath-0.10.1.2.
Closes #4597.
2018-04-26 12:23:25 -07:00
John MacFarlane
df452038f5 stack.yaml: use latest pandoc-citeproc. 2018-04-25 23:48:01 -07:00
John MacFarlane
4883f41f53 stack.lts9.yaml - use older haddock-library.
The newer version can't be compiled with the old stack/Cabal
we have on alpine.
2018-04-21 22:23:05 -07:00
John MacFarlane
26fdd40370 Added test-framework to stack.yaml deps. 2018-04-05 10:14:06 -07:00
John MacFarlane
6285c047c4 Don't depend on latest haddock-library in stack.yaml.
For now.  Because of a bug in the library, it must be
rebuilt every time we do 'stack install.

See #4482.
2018-03-24 11:00:29 -07:00
John MacFarlane
532cfcc59f Update stack.yaml to work with stackage nightly.
We now compile on nightly.
2018-03-20 08:53:47 -07:00
John MacFarlane
43677682d8 Use pandoc-citeproc 0.14.3. 2018-03-19 23:45:55 -07:00
John MacFarlane
d6f9715230 Bumped some versions in stack.yaml. 2018-03-18 15:25:55 -07:00
John MacFarlane
937bec95a9 Removed old-locale flag and Text.Pandoc.Compat.Time.
This is no longer necessary since we no longer support ghc 7.8.
2018-03-18 11:24:29 -07:00
John MacFarlane
7e389cb3db Use NoImplicitPrelude and explicitly import Prelude.
This seems to be necessary if we are to use our custom Prelude
with ghci.

Closes #4464.
2018-03-18 10:46:28 -07:00
John MacFarlane
1683185e98 Use pandoc-citeproc 0.14.2. 2018-03-17 22:50:58 -07:00
John MacFarlane
73f9ba4a00 stack.yaml - don't force latest haddock-library. 2018-03-17 21:50:16 -07:00
John MacFarlane
c166861ee6 Require haddock-libary 1.5 (with tables). 2018-03-16 21:21:41 -07:00
John MacFarlane
424d0df1f2 Use latest pandoc-types. 2018-03-16 21:20:52 -07:00
John MacFarlane
1b37e3b3c0 Require pandoc-types 1.17.4.
And a few tweaks related to the Semigroups/Monoid change.

Closes #4448.
2018-03-13 23:23:04 -07:00
Alexander Krotov
b6182afcfe stack.yaml: Add skylighting-core to extra-deps 2018-03-07 14:40:59 +03:00
John MacFarlane
54a6b75510 Use latest skylighting. 2018-03-06 10:57:49 -08:00
John MacFarlane
5823bdf560 Use latest pandoc-citeproc. 2018-03-02 10:17:26 -08:00
Alexander Krotov
83ce0a789d Update tagsoup to 0.14.6 2018-02-28 07:00:14 +03:00
Alexander Krotov
ab1bee58e5 Update tagsoup to 0.14.5 2018-02-27 15:02:59 +03:00
Alexander Krotov
19b4cb16f3 Update tagsoup to 0.14.4
Fixes #4282
2018-02-27 04:31:46 +03:00
John MacFarlane
e232faf5ee Use latest pandoc-citeproc. 2018-02-01 11:56:43 -08:00
John MacFarlane
4423f81079 Require tagsoup 0.14.3 - closes #4282.
This fixes an HTML tokenization bug whereby comments
were sometimes consumed with open tags.
2018-01-21 10:09:27 -08:00
John MacFarlane
3ca3ad8956 Use latest pandoc-citeproc. 2018-01-21 08:20:39 -08:00
John MacFarlane
3eac24c8cf Use latest texmath. 2018-01-19 17:21:40 -08:00
John MacFarlane
63b10cf157 More stack.yaml fixes for skylighting. 2018-01-18 10:05:41 -08:00
John MacFarlane
aaf2dbf897 Use latest pandoc-citeproc and skylighting. 2018-01-18 09:18:13 -08:00
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