aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-03-24Merge pull request #2812 from mb21/patch-2John MacFarlane1-0/+2
include .tei files in pandoc.cabal
2016-03-24include .tei files in pandoc.cabalMauro Bieg1-0/+2
closes #2811
2016-03-22Updated copyright dates to include 2016.John MacFarlane19-37/+37
2016-03-22Fixed copyright dates.John MacFarlane1-3/+3
2016-03-22Updated man page.John MacFarlane1-1/+1
2016-03-22Updated changelog.John MacFarlane1-0/+6
2016-03-22Version bump to 1.17.0.2.John MacFarlane1-1/+1
2016-03-22Fixed bug in Markdown raw HTML parsing.John MacFarlane1-1/+1
This was a regression, with the rewrite of `htmlInBalanced` (from `Text.Pandoc.Readers.HTML`) in 1.17. It caused newlines to be omitted in raw HTML blocks. Closes #2804.
2016-03-21Updated man page.John MacFarlane1-6/+15
2016-03-21Updated changelog.John MacFarlane1-0/+9
2016-03-21Version to 1.17.0.1.John MacFarlane1-1/+1
2016-03-21Improved documentation of templates.John MacFarlane1-3/+9
Note that there's no docx template. Closes #2797.
2016-03-21Fix stdin handling for file-scopeJesse Rosenthal1-0/+1
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`.
2016-03-20Fixed link to TEI in README.John MacFarlane1-1/+1
2016-03-20Changelog formatting.John MacFarlane1-3/+3
2016-03-20Clarify and shorten description of file-scope in changelog.John MacFarlane1-15/+9
2016-03-20LaTeX Writer: fix polyglossia to babel env mappingMauro Bieg2-4/+4
allow for optional argument in square brackets, closes #2728
2016-03-20Fixed changelog.John MacFarlane1-4/+1
2016-03-20Fixed changelog formatting.John MacFarlane1-3/+4
2016-03-20Fixed Chris Forster's name.John MacFarlane1-1/+1
2016-03-20Removed strip commands from make-windows-installer.bat.John MacFarlane1-2/+0
2016-03-19Don't hardcode pandoc version in osx/distribution.xml.John MacFarlane2-1/+3
Instead, create it from a template, distribution.xml.in.
2016-03-19Fixed version in osx/distribution.xml.John MacFarlane1-1/+1
2016-03-19make_osx_package.sh: Add quotes around env variable.John MacFarlane1-2/+2
2016-03-19Fixed typo in deb, osx stack.yaml.John MacFarlane2-2/+2
2016-03-19texmath-0.8.5 in extra-deps in stack.full.yaml.John MacFarlane1-1/+1
2016-03-19Build vs pandoc-citeproc 0.9.1.1.John MacFarlane2-2/+2
2016-03-19Build pandoc-citeproc 0.9.1 for binary pkgs.John MacFarlane2-2/+2
2016-03-19Build binary packages with with latest texmath.John MacFarlane4-0/+5
2016-03-19Depend on most recent aeson, highlighting-kate.John MacFarlane4-1/+7
These aren't in stackage yet.
2016-03-19Use lts-5.8 resolver.John MacFarlane5-5/+5
2016-03-19Updated man page.John MacFarlane1-0/+6
2016-03-19Updated changelog.John MacFarlane1-0/+5
2016-03-19Merge pull request #2637 from mb21/latex-figure-labelJohn MacFarlane1-19/+24
LaTeX writer: figure label
2016-03-19Added `institute` variable in LaTeX and Beamer templates.John MacFarlane2-7/+11
2016-03-18Rebuilt man page.John MacFarlane1-19/+28
2016-03-18Updated changelog.John MacFarlane1-0/+146
2016-03-18ConTeXt writer: fix whitespace at line beginning in line blocks.John MacFarlane1-1/+11
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.
2016-03-18LaTeX writer: Avoid double toprule in headerless table with caption.John MacFarlane1-7/+10
Closes #2742.
2016-03-18README: document that --toc works with docx.John MacFarlane1-2/+2
Closes #2787.
2016-03-18Docx reader: Handle alternate contentJesse Rosenthal1-14/+37
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`.
2016-03-16Docx reader: Add test for enumerated headers.Jesse Rosenthal3-1/+9
We don't want them to turn into a list.
2016-03-16Docx reader: Don't make numbered heads into lists.Jesse Rosenthal1-6/+8
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.
2016-03-15pandoc.hs: Also use filescope for json files.Jesse Rosenthal1-7/+9
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.
2016-03-15README: Add description of `--file-scope` option.Jesse Rosenthal1-0/+8
2016-03-15Introduce file-scope parsing (parse-before-combine)Jesse Rosenthal2-4/+25
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`.
2016-03-12Add a general ByteStringReader with warnings.Jesse Rosenthal1-1/+9
Have docx reader use it.
2016-03-12Add readDocxWithWarningsJesse Rosenthal1-6/+15
The regular readDocx just becomes a special case.
2016-03-12Docx Reader: Add state to the parser, for warningsJesse Rosenthal1-6/+19
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.
2016-03-10Fixed behavior of base tag.John MacFarlane2-18/+15
+ 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.