Commit graph

10403 commits

Author SHA1 Message Date
Alexander Krotov
309595aff3 Export list marker parsers from Text.Pandoc.Parsing 2018-01-31 01:33:11 +03:00
Alexander Krotov
9ff8bc64f9 Muse writer: don't wrap displayMath into <verse>
<verse> is a block tag and displayMath is an inline element.
Writing <verse> around displayMath could result in nested
<verse> tags.
2018-01-30 00:33:02 +03:00
Alexander Krotov
b7d8930dc0 Muse writer: escape nonbreaking space ("~~") 2018-01-29 12:54:43 +03:00
Alexander Krotov
37271fabee Muse reader: simplify block tag parsing code 2018-01-29 12:07:40 +03:00
Alexander Krotov
ff31602267 Muse reader: parse inline <literal> without parseFromString 2018-01-29 04:58:43 +03:00
Alexander Krotov
60b2863e90 Muse reader: parse <comment> and <verbatim> without parseFromString 2018-01-29 04:52:51 +03:00
Daniel Lublin
d2e4790b50 MANUAL.txt: self-contained implies standalone (#4304) 2018-01-28 11:25:34 -08:00
Adam Brandizzi
8fa9912005 CONTRIBUTING.md: label was renamed. (#4310)
See https://groups.google.com/forum/#!msg/pandoc-discuss/mrFsj5RzNFA/Pnd3zubWBwAJ;context-place=searchin/pandoc-discuss/%22good$20first$20issue%22%7Csort:date
2018-01-28 11:17:26 -08:00
Alexander Krotov
264a25e5e9 Muse reader: parse verse tag contents without parseFromString 2018-01-28 22:09:47 +03:00
Alexander Krotov
05275be2cb Muse reader: make verseLine return Inlines, not String 2018-01-28 08:49:55 +03:00
Alexander Krotov
4bfab8f04c Muse reader: parse directives without parseFromString 2018-01-28 07:51:38 +03:00
Alexander Krotov
248f6076bc Muse reader: fix parsing of trailing whitespace
Newline after whitespace now results in softbreak
instead of space.
2018-01-28 03:18:29 +03:00
Alexander Krotov
75762ee0dc Muse reader: simplify paragraph parsing
Blank lines are already handled by blockElements.
2018-01-28 02:32:41 +03:00
Jesse Rosenthal
de6ae29be5 Docx writer tests: correct test name. 2018-01-27 17:47:07 -05:00
Jesse Rosenthal
ebcd04f57a Docx writer tests: Add tests for custom styles 2018-01-27 11:46:41 -05:00
Jesse Rosenthal
a66bfd9071 Add docx golden tests to cabal file. 2018-01-27 08:09:01 -05:00
Jesse Rosenthal
b3449a84aa Docx writer tests: Use new golden framework
These are based off the reader tests, with some removed (where the
reader output was identical, based on different docx inputs). There
are still more to be added. In particular, tests for custom-styles
need to be added.

All golden docx files have been checked in MS Word
2013 (windows). There is no corruption.

There is questionable output in the `tables` test: the three tables
seemed to be joined. This will be addressed in a future commit, and
the golden docx file will be changed.
2018-01-27 08:08:25 -05:00
Jesse Rosenthal
9cf9f1f89d Docx writer: make more deterministic to facilitate testing
This will allow us to compare files directly in a golden test. Times
are still based on IO, but we will be able to safely skip those.

Changes:

 - `getUniqueId` now calls to the state to get an incremented digit,
   instead of calling to P.uniqueHash.

 - we always start the PRNG in mkNumbering/mkAbstractNum with the same
   seed (1848), so our randoms should be the same each time.
2018-01-27 07:44:53 -05:00
Jesse Rosenthal
ae2157fe8b Docx writer: Fix ids in comment writing
Comments from `--track-changes=all` were producing corrupt docx,
because the writer was trying to get id from the `(ID,_,_)` field of
the attributes, and ignoring the "id" entry in the key-value pairs. We
now check both.

There is a larger conversation to be had about the right way to treat
"id" and "class" entries in kvs, but this fix will correctly interpret
the output of the docx reader work.
2018-01-27 07:41:55 -05:00
Jesse Rosenthal
61f80e795d Tests: Abstract powerpoint tests out to OOXML tests.
There is very little pptx-specific in these tests, so we abstract out
the basic testing function so it can be used for docx as well. This
should allow us to catch some errors in the docx writer that slipped
by the roundtrip testing.
2018-01-25 15:29:50 -05:00
Henri Menke
751b5ad010 ConTeXt writer: new section syntax and --section-divs (#4295)
Fixes #2609.

This PR introduces the new-style section headings: `\section[my-header]{My Header}` -> `\section[title={My Header},reference={my-header}]`.

On top of this, the ConTeXt writer now supports the `--section-divs` option to write sections in the fenced style, with `\startsection` and `\stopsection`.
2018-01-25 11:56:28 -08:00
Jesse Rosenthal
0d7aedca58 Dock writer: Fix deletion track changes
This had been mistakenly written as a second insertion function.

Closes: #4303
2018-01-25 10:42:01 -05:00
Alexander Krotov
6337539e32 Muse reader: fix matching of closing inline tags 2018-01-24 14:16:56 +03:00
Alexander Krotov
763126dae0 Muse reader: remove block function 2018-01-24 13:58:43 +03:00
Albert Krewinkel
517f65a7cc
Lua filters: store constructors in registry
Lua functions used to construct AST element values are stored in the Lua
registry for quicker access. Getting a value from the registry is much
faster than getting a global value (partly to idiosyncrasies of hslua);
this change results in a considerable performance boost.
2018-01-23 21:29:58 +01:00
Albert Krewinkel
2e0bb77334
Lua: move getTag from StackInstances to Util
Change: minor
2018-01-23 21:29:52 +01:00
Jesse Rosenthal
f0671bf4c7 Powerpoint writer tests: hlint cleanups. 2018-01-23 13:30:23 -05:00
John MacFarlane
be929bcc80
Merge pull request #4291 from hmenke/xtables
ConTeXt writer: xtables: correct wrong usage of caption
2018-01-22 13:26:55 -07:00
Henri Menke
71bbadb793
ConTeXt writer: xtables: correct wrong usage of caption 2018-01-23 09:15:59 +13:00
Jesse Rosenthal
f8640fdff0 Powerpoint writer tests: add tests for two-column layout and images
Powerpoint output checked in MS PowerPoint 2013 (Windows)
2018-01-22 14:06:47 -05:00
Jesse Rosenthal
145c3f54f9 Powerpoint writer: Add further tests
Tests added for:

 - table of contents
 - endnotes
 - endnotes with table of contents

Powerpoint output checked in MS PowerPoint 2013 (Windows)
2018-01-22 11:52:03 -05:00
Jesse Rosenthal
5cdac2607d Powerpoint writer tests: simplify updating function
We had previously re-read the native file and converted it to
Powerpoint. But we have already done that in constructing the test
archive. So now we just convert the archive back to a bytestring and
write it to disk.
2018-01-22 09:55:41 -05:00
Jesse Rosenthal
0e48c216bc Powerpoint tests: Convert to golden tests
This will allow us to rebuild the pptx files in the test dir more
easily if we make a change in the writer.
2018-01-22 09:14:00 -05:00
Alexander Krotov
e9ed4832ed Muse writer: join code with different attributes during normalization 2018-01-22 16:27:14 +03:00
Alexander Krotov
288065cfd4 Muse writer: indent lists inside Div 2018-01-22 16:24:44 +03:00
Alexander Krotov
b818623d42 Fix Text.Pandoc.Builder link 2018-01-22 15:43:48 +03:00
John MacFarlane
848a3fd528 Delete excess whitespace 2018-01-21 10:21:16 -08:00
John MacFarlane
e9aadc1cfa
Merge pull request #4237 from sitewisely/header_and_footer
Add header and footer parameters for wkhtmltopdf
2018-01-21 11:18:44 -07: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
Jesse Rosenthal
54526525bf Powerpoint writer tests: New test framework for pptx.
Previously we had tested certain properties of the output PowerPoint
slides. Corruption, though, comes as the result of a numebr of
interrelated issues in the output pptx archive. This is a new
approach, which compares the output of the Powerpoint writer with
files that we know to (a) not be corrupt, and (b) to show the desired
output behavior (details below). This commit introduces three tests
using the new framework. More will follow.

The test procedure: given a native file and a pptx file, we generate a
pptx archive from the native file, and then test:

1. Whether the same files are in the two archives

2. Whether each of the contained xml files is the same. (We skip time
   entries in `docProps/core.xml`, since these are derived from IO. We
   just check to make sure that they're there in the same way in both
   files.)

3. Whether each of the media files is the same.

Note that steps 2 and 3, though they compare multiple files, are one
test each, since the number of files depends on the input file (if
there is a failure, it will only report the first failed file
comparison in the test failure).
2018-01-21 12:15:35 -05:00
John MacFarlane
3193bf6be7 appveyor - remove -fexternal-interpreter.
This didn't help with the problem #4283.
2018-01-21 08:26:34 -08:00
John MacFarlane
06abfed8e1 appveyor - put comment about cache delete on one line,
so it's easier to copy/paste.
2018-01-21 08:20:39 -08:00
John MacFarlane
3ca3ad8956 Use latest pandoc-citeproc. 2018-01-21 08:20:39 -08:00
Alexander Krotov
91bca73266 Muse reader: embed parseBlocks into parseMuse 2018-01-21 03:26:54 +03:00
Alexander Krotov
eaebc5fd19 Muse reader: make listItem generic 2018-01-21 03:26:54 +03:00
John MacFarlane
5e106ce0b8 More appveyor fixes. 2018-01-20 14:46:47 -08:00
John MacFarlane
ac08a887cf Markdown reader: Fix parsing bug with nested fenced divs.
Closes #4281.

Previously we allowed "nonindent spaces" before the
opening and closing `:::`, but this interfered with
list parsing, so now we require the fences to be
flush with the margin of the containing block.
2018-01-20 14:44:08 -08:00
John MacFarlane
e69ca9a070 appveyor - changed syntax for adding ghc-options. 2018-01-20 14:25:24 -08:00
Alexander Krotov
1dd5018a80 Muse reader: simplify paragraph parsing
Blanklines are already consumed during block parsing,
there is no need to check for them specifically.
2018-01-21 00:49:43 +03:00
John MacFarlane
957c0e110d RST reader: fix parsing of headers with trailing space.
This was a regression in pandoc 2.0.

Closes #4280.
2018-01-20 11:10:09 -08:00