Commit graph

528 commits

Author SHA1 Message Date
John MacFarlane
aa3394af45 stack.yaml - use latest skylighting. 2020-09-14 10:28:08 -07:00
Christian Despres
10c6c411f9
Add Writers.Tables helper functions and types, add tests for those (#6655)
Add Writers.Tables helper functions and types, add tests for those

The Writers.Tables module contains an AnnTable type that is a pandoc
Table with added inferred information that should be enough for
writers (in particular the HTML writer) to operate on without having
to lay out the table themselves.

The toAnnTable and fromAnnTable functions in that module convert
between AnnTable and Table. In addition to producing an AnnTable with
coherent and well-formed annotations, the toAnnTable function also
normalizes its input Table like the table builder does.

Various tests ensure that toAnnTable normalizes tables exactly like
the table builder, and that its annotations are coherent.
2020-09-05 14:36:51 -07:00
John MacFarlane
3935c9c5c4 Insignificant whitespace change.
Try to expire cache for macOS CI.
2020-09-03 09:53:50 -07:00
Albert Krewinkel
1b865aaddf
stack.yaml: use skylighting 0.10 2020-08-31 22:44:00 +02:00
John MacFarlane
5734167531 Whitespace change to stack.yaml to reset macos CI cache. 2020-08-14 14:45:25 -07:00
John MacFarlane
57417feaf4 Use commonmark >= 0.1.0.2. Closes #6589. 2020-08-05 12:58:29 -07:00
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