Commit graph

6344 commits

Author SHA1 Message Date
John MacFarlane
0c7d6fbaba Allow syb 0.6. 2015-09-23 12:30:14 -07:00
John MacFarlane
72e71a1dad LaTeX reader: support longtable.
Closes #2411.
2015-09-23 08:34:37 -07:00
John MacFarlane
f232a0a720 Merge pull request #2369 from mb21/language-variables
`lang` variable is now in BCP47 format
2015-09-22 22:21:06 -07:00
John MacFarlane
d25a37c122 Allow aeson 0.10. 2015-09-20 13:19:16 -07:00
John MacFarlane
9b033672e4 Merge pull request #2406 from tarleb/org-verse-fix
Make sure verse blocks can contain empty lines
2015-09-20 13:02:47 -07:00
John MacFarlane
54526665c3 Merge pull request #2405 from lierdakil/rest-normalize-amend
[RST Writer] Don't normalize heading levels below input minimum
2015-09-19 23:32:23 -07:00
Albert Krewinkel
8007dd97b5 Make sure verse blocks can contain empty lines
The previous verse parsing code made the faulty assumption that empty
strings are valid (and empty) inlines.  This isn't the case, so lines
are changed to contain at least a newline.

It would generally be nicer and faster to keep the newlines while
splitting the string.  However, this would require more code, which
seems unjustified for a simple (and fairly rare) block as *verse*.

This fixes #2402.
2015-09-19 22:02:43 +02:00
Nikolay Yakimov
5788f62ef5 [RST Writer] Don't normalize heading levels below input minimum 2015-09-19 17:45:54 +03:00
John MacFarlane
4d49f76dbb Markdown writer: in TOC, add links to headers.
Closes #829.
2015-09-17 11:41:05 -07:00
John MacFarlane
f2f35224f6 sample.lua - define CaptionedImage, add newline at end.
Cloess #2393.
2015-09-15 09:28:18 -07:00
John MacFarlane
6dcfa7e07b Tests: docx writer tests now use "../data" for data directory.
This allows tests  to be run without installing first.
2015-09-09 10:39:20 -07:00
John MacFarlane
bee255cbfe Use user data directory for reference docx archive.
This allows the test suite to work without installing pandoc first.
It also brings the docx writer in line with the odt writer.
2015-09-09 10:16:45 -07:00
John MacFarlane
7f515add58 stack.yaml - bump to latest LTS Stackage. 2015-09-09 09:58:09 -07:00
John MacFarlane
546201cb46 Removed obsolete reference to default.csl.
Closes #2372.

@cinaeco as the pandoc-citeproc man page describes, the current
behavior if no style is specified is to look in
`~/.csl/chicago-author-date.csl`, and if nothing is found there,
to use a default version of chicago-author-date.csl.

You may want to open a separate issue on jgm/pandoc-citeproc
suggesting the use of `default.csl` rather than
`chicago-author-date.csl`.  I agree that this would make sense.
2015-08-25 13:35:21 -07:00
mb21
622df7034c lang variable is now in BCP47 format
strings are converted for LaTeX and ConTeXt output, closes #1614
2015-08-20 23:17:47 +02:00
John MacFarlane
761e1edc30 Merge pull request #2364 from gbataille/bugDoc
[BUG] Haddock : * and ^ to be escaped in docs
2015-08-17 12:15:32 -07:00
Grégory Bataille
0dff30271c [BUG] Haddock : * and ^ to be escaped in docs 2015-08-17 09:03:33 +02:00
John MacFarlane
a0ddabb206 stack-yaml: use lts 3.1 resolver. 2015-08-16 20:48:06 -07:00
John MacFarlane
8883261b6e Merge pull request #2352 from ousia/master
added selectors for nested emphasis (epub.css)
2015-08-16 10:16:03 -07:00
John MacFarlane
1e17922b95 Use cabal-install-head in travis for ghc 7.10.1.
See
https://www.reddit.com/r/haskell/comments/3f4bgr/the_version_of_cabal_being_used_has_changed/

Maybe this will fix the Cabal version mismatch problem?
2015-08-15 11:50:07 -07:00
John MacFarlane
b725b45c83 Travis: removed diagnostics, add cabal path to PATH, back to ghc 7.10.1.
ghc 7.10.2 isn't whitelisted yet.
https://github.com/travis-ci/travis-ci/issues/4478
2015-08-15 11:13:29 -07:00
John MacFarlane
3a9352957a Added some travis diagnostics. 2015-08-15 11:10:29 -07:00
John MacFarlane
cc37c5470d Travis: build with ghc 7.10.2 instead of 7.10.1. 2015-08-15 10:45:24 -07:00
John MacFarlane
8ae0c857f9 Use real jpg (not empty) for docx tests to avoid warning. 2015-08-15 10:40:22 -07:00
John MacFarlane
1f00a5395f RST reader: better handling of indirect roles.
Previously the parser failed on this kind of case

    .. role:: indirect(code)

    .. role:: py(indirect)
       :language: python

    :py:`hi`

Now it currectly recognizes `:py:` as a code role.

The previous test for this didn't work, because the
name of the indirect role was the same as the language
defined its parent, os it didn't really test for this
behavior.  Updated test.
2015-08-15 10:22:47 -07:00
John MacFarlane
8c579a5daa Merge pull request #2360 from jg/issue-2354
Org reader: add auto identifiers if not present on headers
2015-08-15 09:47:56 -07:00
John MacFarlane
388fe3053a Added note to CONTRIBUTING.md about ghc versions and travis. 2015-08-15 09:43:14 -07:00
Juliusz Gonera
f1c87ed164 Org reader: add auto identifiers if not present on headers
Refs #2354

This should also fix the table of contents (--toc) when generating a html file
from org input
2015-08-15 07:57:48 +02:00
John MacFarlane
0302330a27 RST writer: ensure that \ is inserted when needed...
...before Cite and Span elements that begin with a "complex"
element.  Closes jgm/pandoc-citeproc#157.
2015-08-13 23:20:22 -07:00
John MacFarlane
221390d024 Updated man page. 2015-08-13 15:33:19 -07:00
John MacFarlane
73824908aa Added --bash-completion option.
This generates a bash completion script.

To use:

     eval "$(pandoc --bash-completion)"
2015-08-13 15:27:47 -07:00
John MacFarlane
397c18810e Added stack install instructions to INSTALL. 2015-08-13 09:26:14 -07:00
John MacFarlane
e380cc7f7a Added a stack.yaml. 2015-08-13 09:22:08 -07:00
John MacFarlane
c82f3ad61e RST writer: Don't insert \ when complex expression in matched pairs.
E.g. `` [:sup:`3`] `` is okay; you don't need `` [:sup:`3`\ ] ``.
2015-08-12 21:08:13 -07:00
John MacFarlane
ef18b83c58 LaTeX template: reverted change in abstract position. 2015-08-11 11:47:11 -07:00
John MacFarlane
788cea9133 Revert "LaTeX template: move abstract to before \maketitle."
This reverts commit aa08b4cd67.
2015-08-11 11:44:21 -07:00
John MacFarlane
9894012776 EPUB TOC: replace literal "<br/>" with space.
Closes #2105.
2015-08-10 16:58:47 -07:00
John MacFarlane
50dddecb53 Update version to 1.15.1. 2015-08-10 16:38:16 -07:00
John MacFarlane
7b8c005d07 EPUB reader: stop mangling external URLs.
Closes #2284.

Note the changes to the test suite. In each case, a mangled
external link has been fixed, so these are all positive.
2015-08-10 16:35:43 -07:00
John MacFarlane
609c8231da Allow latest criterion version. 2015-08-10 16:02:00 -07:00
John MacFarlane
0ad576eb1a Docx writer: Moved invalid character stripping to formattedString.
This avoids an inefficient generic traversal.

Updates f3aa03e.

Closes #2356.
2015-08-10 10:49:18 -07:00
John MacFarlane
aa08b4cd67 LaTeX template: move abstract to before \maketitle.
See
http://tex.stackexchange.com/questions/139469/to-have-abstract-in-the-docu
ment-class-revtex
2015-08-09 09:45:32 -07:00
John MacFarlane
06d69fe215 Text.Pandoc: disable auto_identifiers for epub.
The epub writer inserts its own auto identifiers;
this is more complex due to splitting into "chapter" files.
2015-08-08 21:05:43 -07:00
John MacFarlane
3ad474e2cf Updated html reader for new automatic header attributes. 2015-08-08 20:55:40 -07:00
John MacFarlane
467e3be700 MediaWiki reader: handle unquoted table attributes.
Closes #2355.
2015-08-08 20:55:00 -07:00
John MacFarlane
02f4e640ac Revert "Travis: call test program directly rather than by cabal."
This reverts commit 8bcaea5bd1.
2015-08-08 20:39:05 -07:00
John MacFarlane
8bcaea5bd1 Travis: call test program directly rather than by cabal. 2015-08-08 15:52:28 -07:00
John MacFarlane
f78b5a4a5a Clarified what is "out of scope" in README and CONTRIBUTING.md. 2015-08-08 15:18:31 -07:00
John MacFarlane
2eec8cf61b HTML reader: add auto identifiers if not present on headers.
This makes TOC linking work properly.

The same thing needs to be done to the org reader to fix #2354;
in addition, `Ext_auto_identifiers` should be added to the list
of default extensions for org in Text.Pandoc.
2015-08-08 11:20:15 -07:00
John MacFarlane
eaccef1491 DocBook reader: handle informalexample.
It is parsed into a Div with class `informalexample`.

Closes #2319.
2015-08-08 10:43:25 -07:00