Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Jan 03, 2016
@jgm Fixed debpkg target. 90a2df3
@jgm Textile reader: don't allow block HTML tags in inline contexts.
The reader previously did allow this, following redcloth,
which happily parses

    Html blocks can be <div>inlined</div> as well.

as

    <p>Html blocks can be <div>inlined</div> as well.</p>

This is invalid HTML, and this kind of thing can lead
to parsing problems (stack overflows) as well.  So this
commit undoes this behavior.  The above sample now produces;

    <p>Html blocks can be</p>
    <div>
    <p>inlined</p>
    </div>
    <p>as well.</p>
97c9691
Commits on Jan 04, 2016
@jgm Updated binary package stack.yamls to ensure pandoc-citeproc...
is built with embed_data_files. This fixes a problem with
the original 1.16 binary packages.
1cee481
@jgm windows/stack.yaml - use local pandoc-citeproc.
I'm not sure why this is needed, but it is. Otherwise
the build fails.
a6d20b3
Commits on Jan 05, 2016
@jgm Fixed v1.16 reversion with --latex-engine.
In 1.16 --latex-engine raises an error if a full path is
given. This commit fixes this reversion. Closes #2618.
4990350
@jgm Updated .travis.yml, added ghc 7.10.3 to tested-with. 694eb87
@jgm Added 7.10.3 to make_travis_yml.hs known versions. 51a415e
@jgm Regenerated .travis.yml to include 7.10.3. e792920
@jgm Go back to testing with ghc 7.10.2.
Avoids the dreaded "the version of cabal being used has
changed" error.

https://www.reddit.com/r/haskell/comments/3f4bgr/the_version_of_cabal_being_used_has_changed/
a81b093
@jgm RST, Markdown writers: Fixed rendering of grid tables with blank rows.
Closes #2615.
a796538
Commits on Jan 06, 2016
@conklech conklech Add .stack-work to gitignore
The .stack-work directory is analogous to a cabal sandbox;
it comprises temporary build artifacts.
45f5fc9
@jgm Merge pull request #2622 from conklech/ignore-stack
Add .stack-work to gitignore
2aee5a3
@jgm stack.yaml: bump pandoc-types version to 1.16.0.1. 73d1175
@jgm Make file globbing work on windows.
Windows cmd doesn't expand wildcards; the application has to
do this.  So on windows we use 'glob' to expand.
363ecfe
@jgm Revert "Make file globbing work on windows."
This reverts commit 363ecfe.
197f301
@jgm stack.yaml, stack.full.yaml - use lts-4.0 resolver. f6fe430
@jgm Improved default template lookup for custom lua scripts.
Previously, if you tried to do `pandoc -s -t /path/to/lua/script.lua`,
pandoc would look for the template in
`~/.pandoc/templates/default./path/to/lua/script.lua`.
With this change it will look in the more reasonable
`~/.pandoc/templates/default.script.lua`.

This makes it possible to store default templates for custom
writers.

Closes #2625.
a5efd2a
Commits on Jan 07, 2016
@jgm Markdown reader: renormalize table column widths if they exceed 100%.
Closes #2626.
c4fdf28
@tarleb tarleb Fix function dropping subtrees tagged :noexport:
Continue scanning for comment subtrees beyond only the first block.

Note to self: when writing an recursive function, don't forget to, you
know, actually recurse.

Shout to @mrvdb for noticing this.

This fixes #2628.
b3b00da
@jgm Upgrade hsb2hs.yaml lts resolver. 510a539
@jgm make_deb.sh - added --stack-setup-yaml. af706bc
@jgm deb/Makefile: Renamed COMMIT -> TREE 669153e
@jgm deb pkg generation improvements.
Allow setting DEBPKGVER.
Bump to stack lts-4.0.
Make output verbose.
646ef17
@jgm make_deb.sh - use --install-ghc flag instead of stack setup. d2dfacc
@jgm Merge pull request #2629 from tarleb/org-noexport-fix
Fix function dropping subtrees tagged :noexport:
9320d35
@jgm deb/make_deb.sh - removed 'stack clean'. 8a5950a
@jgm Minor tweak in how make_deb.sh is called. 6cb94d5
@jgm More deb packaging tweaks. 6cf610d
@jgm debpkg - back to lts-3.20.
We get memory exhaustion on lts-4.0.  My guess is that it's
due to aeson-0.10.
f010b39
@jgm deb/Makefile - make DEBPKGVER work. eadf5ad
@jgm deb/stack.yaml - use older aeson to avoid excessive memory use in com…
…pile.

With aeson 0.10 I was getting an out of memory error on a 2GB Ubuntu
64-bit VM.
0602a22
@jgm stack.yaml - use older aeson to avoid excessive memory use on compile. c30ad6f
Commits on Jan 08, 2016
@matt-e matt-e Update stack.full.yaml dbff1d1
@matt-e matt-e Update stack.yaml
Another typo?
1730e63
@jgm Merge pull request #2632 from matt-e/fix-stack-build
Fix typo in stack build files
52d95dd
Commits on Jan 09, 2016
@jgm Entity handling fixes:
- Text.Pandoc.XML.fromEntities:  handle entities without a
  semicolon. Always lookup character references with the
  trailing ';', even if it wasn't present.  And never add
  it when looking up numerical entities.  (This is what
  tagsoup seems to require.)
- Text.Pandoc.Parsing.characterReference:  Always lookup
  character references with the trailing ';', and leave off
  the ';' when looking up numerical entities.

This fixes a regression for e.g. `&lang;`.
12a5bd3
@jgm Work around tagsoup bug - not allowing uppercase x in hex entities.
Issue submitted at tagsoup.
5884ff6
@jgm Added some entity tests in Markdown reader tests. d5f6782
@jgm Fixed shadowing warning. 729911a
@jgm LaTeX writer: restore old treatment of Span.
A Span is rendered with surrounding {braces}.

This was a regression in 1.16.  Closes #2624.
1506e62
@jgm Version bump to 1.16.0.1 687c39e
@jgm Updated changelog. 1fbbc2b
@jgm Updated stack.yaml. 5eb8087
@jgm Fixed typo in deb/stack.yaml. a412104
Commits on Jan 10, 2016
@mb21 mb21 LaTeX writer: figure label 1fde920
Commits on Jan 11, 2016
@jgm osx package fixes: correct version, allow installation to any drive. 6936a6a
@jgm README - changed date. 37ac274
@jgm Regenerated man page. 293f31c
@jgm Release checklist: added note on regenerating Hackage docs. 4db912f
@jgm Fixed regression in latex smart quote parsing.
Closes #2645.

In cases where a match was not found for a quote, everything
from the open quote to the end of the paragraph was being dropped.
8611ac5
@jgm Depend on deepseq rather than deepseq-generics. f34382e
@tarleb tarleb Prefix even empty figure names with "fig:"
The convention used by pandoc for figures is to mark them by prefixing
the name with "fig:".  The org reader failed to do this if a figure had
no name.  The test for this was broken as well.

This fixes #2643.
fabbd1a
Commits on Jan 13, 2016
@jgm Version to 1.16.0.2, updated changelog. 3004306
@jgm Updated README date. ee09ee1
@jgm Updated man page. f8776ed
Commits on Jan 14, 2016
@jgm Org writer - pass through RawInline with format "org". f45a8e1
@jgm make_osx_package.sh: Use env variable for developer id certs. 20c55ab
@jgm HTML writer: harmless code simplification.
Since the 'math' is only put into the template if stMath is
set anyway, there's no need for this conditional.
f2c0974
Commits on Jan 19, 2016
csforste Add TEI Writer. 25a9ca6
@jgm Added some entity tests in Markdown reader tests.
Change types of divs.

From Docbook "sect#" and "simplesect" to "level#" and
"section."

Add tests.

Add mention of TEI to README.

Small changes to TEI writer.
4d74a96
Commits on Jan 20, 2016
Henrik Tramberend LaTeX writer: Allow more flexible table alignment 7a18879
@jgm Merge pull request #2665 from monofon/fix/table-alignment
LaTeX writer: Allow more flexible table alignment
3875df7
@jgm Adjusted longtable in tests.
New default is not to include `[c]` option.
7ea4d17
Commits on Jan 21, 2016
Henrik Tramberend Markdown writer: Use hyphens for yaml metadata block bottom line 556d0c1
@jgm Merge pull request #2638 from c-forster/teiwriter
Add TEI Writer.
3b39b16
@jgm Added default.tei TEI template cbc2434
@jgm Added TEI to description and default.tei to data files. 5b31790
@jgm Added old-style tests for TEI writer (tests/tables.tei, tests/writer.…
…tei).
2a2e3d9
Commits on Jan 22, 2016
@jgm Changed type of Shared.uniqueIdent argument from [String] to Set String.
This avoids performance problems in documents with many identically
named headers.

Closes #2671.
20170c3
@jgm Bump version to 1.17.
API change in type of Text.Pandoc.Shared.uniqueIdent.
f35fa88
Commits on Jan 23, 2016
@jgm stack.yaml - use cmark 0.5.1. d015284
Commits on Jan 24, 2016
@jgm Make language extensions trigger highlighting.
For example, `py` will now work as well as `python`.
Closes jgm/highlighting-kate#83.
11c5831
Commits on Jan 25, 2016
@jgm Textile reader: Support `>`, `<`, `=`, `<>` text alignment attributes.
Closes #2674.
a1021bd
Commits on Jan 26, 2016
@pra85 pra85 Update license year range to 2016 fdc9f0e
@jgm Merge pull request #2681 from pra85/patch-1
Update license year range to 2016
373aaa8
Commits on Jan 29, 2016
@jgm Properly handle LaTeX "math" environment as inline math.
See #2171.
76983c3
@jgm HTML reader: handle multiple meta tags with same name.
Put them in a list in the metadata so they are all
preserved, rather than (as before) throwing out all
but one..
a02c26d
Commits on Jan 31, 2016
@jgm LaTeX reader: `inlineCommand` now gobbles an empty `{}` after any com…
…mand.

This gives better results when people write e.g. `\TeX{}` in Markdown.

    \TeX{} and \LaTeX{}

now works as expected with `pandoc -f markdown -t latex`.

Closes #2687.
1874558
@tarleb tarleb Org reader: Refactor link-target processing
Cleanup of the code for link target handling.  Most notably, the
canonicalization of a link is handled by a separate function.

This fixes #2684.
92e6ae4
Commits on Feb 02, 2016
@jkr jkr Docx reader: Add a "Link" modifier to Reducible
We want to make sure that links have their spaces removed, and are
appropriately smushed together.

This closes #2689
2ee7752
@jkr jkr Docx reader: Add tests for adjacent hyperlinks. 7a10507
Commits on Feb 03, 2016
@jgm HTML writer: don't include alignment attribute for default table colu…
…mns.

Previously these were given "left" alignment.  Better to leave off
alignment attributes altogether.

Closes #2694.
93a05df
Commits on Feb 04, 2016
@jgm Markdown reader: Fixed bug with smart quotes around tex math.
Previously smart quotes were incorrect in the following:

    '$\neg(x \in x)$'.

(because of the following period).  This commit fixes the problem,
which was introduced by commit 4229cf2.
6cb4991
Commits on Feb 05, 2016
@MathieuDuponchelle MathieuDuponchelle CONTRIBUTING.md : update test enabling documentation
On my end, in a clean sandbox, I had to run this before I could run the tests, I'm a cabal / haskell noob so that might not be the best way to do so but :)
a326600
Commits on Feb 06, 2016
@jgm Custom writer: Pass attributes parameter to CaptionedImage.
Closes #2697.
a692bd2
@jgm Merge pull request #2699 from MathieuDuponchelle/patch-1
CONTRIBUTING.md : update test enabling documentation
7358b47
@jgm Added info on Stack to CONTRIBUTING.md. c0515e0
Commits on Feb 08, 2016
@rski rski Fix stack link in INSTALL
Stack installation instructions have moved to docs.haskellstack.org
c428231
@jgm Merge pull request #2703 from rski/stack_link_fix
Fix stack link in INSTALL
7034366
Commits on Feb 09, 2016
@jgm Allow aeson 0.11. e552a14
@jgm Updated to lts-5.2 resolver, aeson 0.11 in stack.yaml. 522f8f3
@jgm Changed aeson version in stack.yaml to 0.11.0.0. 1aaf4b8
Commits on Feb 10, 2016
@jgm Removed aeson extra-dep from stack.yaml. 52794d8
@jgm Removed `tex_math_single_backslash` from `markdown_github` options.
Closes #2707.
bbc67de
@jgm stack.yaml: Added commented-out commands to compile against aeson 0.11.
This has been tested.
09bc31a
Commits on Feb 16, 2016
@jgm HTML reader: properly handle an empty cell in a simple table.
Closes #2718.
b8dadc6
Commits on Feb 17, 2016
@jgm Try new travis stack+cabal script. 1a87794
@jgm Fixed stack.yaml. 134a5e5
@jgm Travis fixes.
cabal sdist has problems on cabal 1.16, because of our
Text.Pandoc.Data module.  So we don't test it.
dda7c27
@jgm Travis: don't build with lts-3.
It doesn't have recent enough dependencies.
9e3f739
@jgm Don't build with lts-2 or lts-3. 44bcc88
Commits on Feb 18, 2016
@adunning adunning Remove stray line from stack.full.yaml
The line causes an error with stack 1.0.2:

```
Could not parse '/pandoc-build/pandoc/stack.full.yaml':
AesonException "Error in $.extra-deps: failed to parse field 'extra-deps': failed to parse field extra-deps: expected [a], encountered Null"
See http://docs.haskellstack.org/en/stable/yaml_configuration.html.
```
4dfe373
Commits on Feb 19, 2016
@jgm Merge pull request #2725 from adunning/patch-1
Remove stray line from stack.full.yaml
5848416
@jkr jkr LaTeX writer: treat memoir template with `article` opt as article
We currently treat all memoir templates as books. This means that pandoc
will infer the `--chapters` argument, even if the `article` iption is
set for memoir.

This commit makes pandoc treats the document as an article if there is
an article option (i.e., `\documentclass[12pt,article]{memoir}`).

Note that this refactors out the parsec parsers for document class and
options, to make it a little clearer what's going on.
4112b32
@jkr jkr LaTeX writer: clean up options parser.
Make sure that we require the closing bracket.
4438ff1
Commits on Feb 20, 2016
@pra85 pra85 Fix typos in Readme
Remove extra `be`
`overriden` → `overridden`
8a114e9
@jgm Merge pull request #2732 from pra85/patch-2
Fix typos in Readme
d45fcf9
@jgm HTML reader: rewrote htmlInBalanced.
This version avoids an exponential performance problem with `<script>` tags,
and it should be faster in general.

Closes #2730.
1534052
Commits on Feb 21, 2016
@jgm Merge pull request #2691 from tarleb/org-image-file-links
Org reader: Refactor link-target processing
e369e60
@jgm Merge pull request #2668 from monofon/fix/yaml-metadata-block-bottom-…
…line

Markdown writer: Use hyphens for yaml metadata block bottom line
649cfb6
@jgm Merge pull request #2646 from tarleb/org-figure-with-no-name
Prefix even empty figure names with "fig:"
29706ee
@jgm Fixed some linter warnings. 9693de7
@jkr jkr Update README to reflect 4112b32.
We don't infer `--chapters` if `article` document option is set. For
example: `\documentclass[article]{memoir}`.
f1c59b2
@jgm Markdown reader: use htmlInBalanced for rawVerbatimBlock.
This should give better performance.

See #2730.
04d1e40
Commits on Feb 22, 2016
@jgm Raise tagsoup lower bound to 0.13.7.
This fixes entity-related problems.

Closes #2734.
0180807
Commits on Feb 24, 2016
@jgm Make protocol-relative URIs work again.
Closes #2737.
f2bd6fd
Commits on Feb 25, 2016
@jgm Allow zip-archive 0.3. 38bd416
Commits on Feb 26, 2016
@jkr jkr Docx Reader: Get rid of Modifiable typeclass.
The docx reader used to use a Modifiable typeclass to combine both
Blocks and Inlines. But all the work was in the inlines. So most of the
generality was wasted, at the expense of making the code harder to
understand. This gets rid of the generality, and adds functions for
Blocks and Inlines. It should be a bit easier to work with going forward.
a7a0b45
@mb21 mb21 Add relocatable stack build 752be50
@jgm Merge pull request #2739 from mb21/patch-2
Add relocatable stack build
ea70495
Commits on Feb 28, 2016
@jgm LaTeX reader: handle interior `$` characters in math.
e.g. `$$\hbox{$i$}$$`.

Partially addresses #2743.
7c6a3c0
Commits on Mar 07, 2016
@ickc ickc Update pandoc.1 b411e0f
@ickc ickc Update README 846fa87
@jgm Merge pull request #2760 from ickc/master
Very Minor update on the documentation
0510396
@jgm Stack-based appveyor setup. 928a050
Commits on Mar 08, 2016
@jkr jkr Docx reader: update feature checklist.
The feature checklist in the source code was out of date. Update.
0b9c54d
@jgm DokuWiki writer: use $$ for display math. 6bfaa5a
Commits on Mar 09, 2016
@jgm Markdown reader: don't cross line boundary parsing pipe table row.
Previously an emph element could be parsed across the newline
at the end of the pipe table row.

I thought this would help with #2765, but it doesn't.
4ed6483
@jgm Markdown reader: allow `+` separators in pipe table cells.
We already allowed them in the header, but not in the body
rows, for some reason.  This gives compatibility with org-mode
tables.
6e950a8
@jgm Markdown reader: Clean up pipe table parsing. 54a6861
@jgm Markdown reader: Improved pipe table parsing.
Fixes #2765.
Added test case.
2b55b76
Commits on Mar 10, 2016
@mb21 mb21 Docx Writer: handle image alt text
 closes #2754
139fa54
@jgm Merge pull request #2771 from mb21/docx-alt-text
Docx Writer: handle image alt text
06a57b2
Commits on Mar 11, 2016
@jgm Fixed behavior of base tag.
+ If the base path does not end with slash, the last component
  will be replaced.  E.g. base = `http://example.com/foo`
  combines with `bar.html` to give `http://example.com/bar.html`.
+ If the href begins with a slash, the whole path of the base
  is replaced.  E.g. base = `http://example.com/foo/` combines
  with `/bar.html` to give `http://example.com/bar.html`.

Closes #2777.
a485c42
Commits on Mar 12, 2016
@jkr jkr Docx Reader: Add state to the parser, for warnings
In order to be able to collect warnings during parsing, we add a state
monad transformer to the D monad. At the moment, this only includes a
list of warning strings (nothing currently triggers them, however). We
use StateT instead of WriterT to correspond more closely with the
warnings behavior in T.P.Parsing.
102ba9e
@jkr jkr Add readDocxWithWarnings
The regular readDocx just becomes a special case.
ee03e95
@jkr jkr Add a general ByteStringReader with warnings.
Have docx reader use it.
68fd333
Commits on Mar 15, 2016
@jkr jkr Introduce file-scope parsing (parse-before-combine)
Traditionally pandoc operates on multiple files by first concetenating
them (around extra line breaks) and then processing the joined file. So
it only parses a multi-file document at the document scope. This has the
benefit that footnotes and links can be in different files, but it also
introduces a couple of difficulties:

  - it is difficult to join files with footnotes without some sort of
    preprocessing, which makes it difficult to write academic documents
    in small pieces.

  - it makes it impossible to process multiple binary input files, which
    can't be catted.

  - it makes it impossible to process files from different input
    formats.

This commit introduces alternative method. Instead of catting the files
first, it parses the files first, and then combines the parsed
output. This makes it impossible to have links across multiple files,
and auto-identified headers won't work correctly if headers in multiple
files have the same name. On the other hand, footnotes across multiple
files will work correctly and will allow more freedom for input formats.

Since ByteStringReaders can currently only read one binary file, and
will ignore subsequent files, we also changes the behavior to
automatically parse before combining if using the ByteStringReader. If
we use one file, it will work as normal. If there is more than one file
it will combine them after parsing (assuming that the format is the
same).

Note that this is intended to be an optional method, defaulting to
off. Turn it on with `--file-scope`.
5c055b4
@jkr jkr README: Add description of `--file-scope` option. c7c4ee4
@jkr jkr pandoc.hs: Also use filescope for json files.
JSON files have metadata and list structure, so they can't be simply
catted, but they're useful as intermediate build files in large projects.
09b4f29
Commits on Mar 16, 2016
@jkr jkr Docx reader: Don't make numbered heads into lists.
Word uses list numbering styles to number its headings. We only call
something a numbered list if it does not also heave a heading style.
855c8b4
@jkr jkr Docx reader: Add test for enumerated headers.
We don't want them to turn into a list.
7f4a404
Commits on Mar 18, 2016
@jkr jkr Docx reader: Handle alternate content
Some word functions -- especially graphics -- give various choices for
content so there can be backwards compatibility. This follows the
largely undocumented feature by working through the choices until we
find one that works.

Note that we had to split out the processing of child elems of runs into
a separate function so we can recurse properly. Any processing of an
element *within* a run (other than a plain run) should go into
`childElemToRun`.
28c7617
@jgm README: document that --toc works with docx.
Closes #2787.
8d1c018
@jgm LaTeX writer: Avoid double toprule in headerless table with caption.
Closes #2742.
e821b05
@jgm ConTeXt writer: fix whitespace at line beginning in line blocks.
Add a `\strut` after `\crlf` before space.
Closes #2744, #2745.  Thanks to @c-foster.
This uses the fix suggested by @c-foster.

Mid-line spaces are still not supported, because of limitations
of the Markdown parser.
976e7e2
Commits on Mar 19, 2016
@jgm Updated changelog. 9d66901
@jgm Rebuilt man page. 9a2326c
@jgm Added `institute` variable in LaTeX and Beamer templates. 3aa7bd1
@jgm Merge pull request #2637 from mb21/latex-figure-label
LaTeX writer: figure label
3af753d
@jgm Updated changelog. 8aef957
@jgm Updated man page. 3336783
@jgm Use lts-5.8 resolver. 3dadc1b
@jgm Depend on most recent aeson, highlighting-kate.
These aren't in stackage yet.
33bad8d
@jgm Build binary packages with with latest texmath. 6a4c176
@jgm Build pandoc-citeproc 0.9.1 for binary pkgs. a2706ee
@jgm Build vs pandoc-citeproc 0.9.1.1. f939c21
@jgm texmath-0.8.5 in extra-deps in stack.full.yaml. ad3a7bf
@jgm Fixed typo in deb, osx stack.yaml. 2e2298a
Commits on Mar 20, 2016
@jgm make_osx_package.sh: Add quotes around env variable. 1f5c1b9
@jgm Fixed version in osx/distribution.xml. 06bfac1
@jgm Don't hardcode pandoc version in osx/distribution.xml.
Instead, create it from a template, distribution.xml.in.
128409f
@jgm Removed strip commands from make-windows-installer.bat. c7df80e
@jgm Fixed Chris Forster's name. 7e6c70e
@jgm Fixed changelog formatting. b53036b
@jgm Fixed changelog. b0dc933
@jgm Clarify and shorten description of file-scope in changelog. 5f91f06
@jgm Changelog formatting. 44428ca
@jgm Fixed link to TEI in README. 08c625c
Commits on Mar 21, 2016
@jkr jkr Fix stdin handling for file-scope
Regardless of input type, we should use default handling if we are
dealing with stdin. In other words, there should be no file-scope if
there are no files. This was an issue with pandoc json, which could be
piped on stdin, but which was read by default with `--file-scope`.
a8a2d4f
@jgm Improved documentation of templates.
Note that there's no docx template.
Closes #2797.
2649a0d
@jgm Version to 1.17.0.1. edcb8b6
@jgm Updated changelog. 650c12d
@jgm Updated man page. db20790
Something went wrong with that request. Please try again.