aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-03-28Merge branch 'errortype' of https://github.com/mpickering/pandoc into ↵John MacFarlane34-254/+376
mpickering-errortype Conflicts: benchmark/benchmark-pandoc.hs src/Text/Pandoc/Readers/Markdown.hs src/Text/Pandoc/Readers/Org.hs src/Text/Pandoc/Readers/RST.hs tests/Tests/Readers/LaTeX.hs
2015-03-28Create reference files from unpacked archives with helper programNikolay Yakimov3-5/+56
2015-03-28Add unpacked reference dataNikolay Yakimov23-0/+1616
2015-03-28Remove pre-built reference filesNikolay Yakimov3-0/+2
2015-03-28Updated tests for new highlighting-kate behavior.John MacFarlane2-4/+7
2015-03-28Fixed ghc-prof-options.John MacFarlane1-2/+2
2015-03-28Require highlighting-kate >= 0.5.14John MacFarlane1-3/+3
This ensures that all code blocks will be wrapped in a div with class sourceCode. Also, the default highlighting CSS now adds `div.sourceCode { x-overflow: auto; }`, which means that code blocks (even with line numbers) will acquire a scroll bar on screens too small to display them (e.g. mobile phones). See #1903 and jgm/highlighting-kate#65.
2015-03-27pandoc.cabal: changed default profiling options.John MacFarlane1-2/+2
Removed `-auto-all` and `-caf-all` at cabal's suggestion. Use `-auto-exported` instead.
2015-03-27Merge pull request #2030 from lierdakil/issue2026John MacFarlane1-2/+11
Fixes for #2026
2015-03-27travis script: build with ghc 7.10.1.John MacFarlane1-5/+5
For now -Werror is turned of for 7.10.1.
2015-03-28Markdown Reader: Require nonempty value in mmd title blockNikolay Yakimov1-0/+1
`many1Till` will gobble up newline, and then whole following line will match, so I had to use guard here.
2015-03-28Markdown Reader: Req. " " after key in mmd title blockNikolay Yakimov1-1/+4
Require space after key-value delimiter colon in mmd title block. Issue #2026 Amend: parsec's `spaces` include newlines, but we don't want that. Had to make custom `spaceNoNewline` parser here
2015-03-28Markdown Reader: Disable meta exts for meta valuesNikolay Yakimov1-1/+6
Disable all metadata block extensions when parsing metadata field values. Issue #2026
2015-03-27Require highlighting-kate 0.5.13.John MacFarlane1-3/+3
Closes #1903.
2015-03-27README: make defn lists for options all "loose" for consistency.John MacFarlane1-0/+78
2015-03-24Merge pull request #2023 from lierdakil/fix-stylemapMatthew Pickering1-18/+19
Docx Writer: Fix StyleMap
2015-03-24Docx Writer: Fix StyleMapNikolay Yakimov1-18/+19
I've messed up badly with it, so it didn't work properly most of the time. At the plus side, fallback mechanic is working wonderfully.
2015-03-23Allow pipe tables with header but no body.John MacFarlane1-1/+1
Closes #2017.
2015-03-22Merge pull request #1947 from mpickering/FmonadJohn MacFarlane4-621/+569
Remove F Monad from Markdown and Org readers.
2015-03-23Fix accidently usage of list monad instanceMatthew Pickering1-1/+1
2015-03-22Add missing importMatthew Pickering1-1/+1
2015-03-22Factor out "returnState" into Parsing moduleMatthew Pickering3-16/+7
2015-03-22HLint changesMatthew Pickering1-82/+76
2015-03-22Remove F Monad from Markdown readerMatthew Pickering1-313/+306
2015-03-22Generalise signature of addWarningMatthew Pickering1-1/+1
2015-03-22Add check to see whether in a footnote to ParserState (to avoid circular ↵Matthew Pickering1-2/+4
footnotes)
2015-03-22Remove F monad from ParsingMatthew Pickering2-26/+3
2015-03-22Changed parseWithWarnings to the more general returnWarnings parser transformerMatthew Pickering2-7/+6
2015-03-22Remove F monad from Org Reader.Matthew Pickering1-239/+227
2015-03-22Added generalize function which can be used to lift specialised parsers.Matthew Pickering1-0/+4
Monad m => Parsec s st a -> Parsec T s st m a
2015-03-19Markdown writer: fixes for GHC 7.10.John MacFarlane1-3/+3
2015-03-19Bumped upper bounds for filepath, QuickCheck.John MacFarlane1-9/+9
Bumped lower bounds for highlighting-kate, texmath.
2015-03-19Merge pull request #2013 from ShabbyX/masterJohn MacFarlane2-11/+16
Derive from Data and Typeable for libpandoc
2015-03-19Derive from Data and Typeable for libpandocShahbaz Youssefi2-11/+16
This commit derives a few types from Data and Typeable used by libpandoc. Requires corresponding pull-request for Highlighting-Kate: https://github.com/jgm/highlighting-kate/pull/64 Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
2015-03-17Fixed a compiler warning.John MacFarlane1-1/+1
2015-03-17Added CommonMark reader using cmark (libcmark bindings).John MacFarlane5-18/+150
- Added commonmark as an input format. - Added `Text.Pandoc.Readers.CommonMark.readCommonMark`. - For now, we use the markdown writer to generate benchmark text for the CommonMark reader. We can change this when we get a writer.
2015-03-17Bump criterion version bound.John MacFarlane1-1/+1
2015-03-16Merge pull request #1968 from lierdakil/issue1607John MacFarlane16-100/+401
Fixes for multiple docx writer style bugs.
2015-03-16Merge pull request #2008 from tomleese/fix-github-phrasingJohn MacFarlane4-5/+5
Replace occurrences of 'Github' with 'GitHub'
2015-03-16Replace occurrences of 'Github' with 'GitHub'Tom Leese4-5/+5
The website is called 'GitHub' afterall.
2015-03-15AsciiDoc writer: avoid wrapping after list marker.John MacFarlane2-3/+3
Closes #1858.
2015-03-15AsciiDoc writer: insert some needed blank lines.John MacFarlane2-1/+6
Closes #1860.
2015-03-15Moved and rewrote documentation for `shortcut_reference_links` ext.John MacFarlane1-7/+11
2015-03-15Merge pull request #1989 from zudov/shortcut_ref_link_prJohn MacFarlane5-31/+158
Support shortcut reference links in markdown writer
2015-03-14Really fix #1394.John MacFarlane1-5/+6
This closes #1394, which actually wasn't fixed by the earlier commit. This ensures that lists in speaker notes don't add "fragment" classes, which can cause additional keypresses to be needed to advance a slide.
2015-03-14Properly gobble spaces after \\.John MacFarlane1-10/+12
Closes #2007.
2015-03-14LaTeX reader: allow block content in \title{}.John MacFarlane1-1/+3
Closes #2001.
2015-03-10Support shortcut reference links in markdown writerKonstantin Zudov5-31/+158
Issue #1977 Most markdown processors support the [shortcut format] for reference links. Pandoc's markdown reader parsed this shortcuts unoptionally. Pandoc's markdown writer (with --reference-links option) never shortcutted links. This commit adds an extension `shortcut_reference_links`. The extension is enabled by default for those markdown flavors that support reading shortcut reference links, namely: - pandoc - strict pandoc - github flavoured - PHPmarkdown If extension is enabled, reader parses the shortcuts in the same way as it preveously did. Otherwise it would parse them as normal text. If extension is enabled, writer outputs shortcut reference links unless doing so would cause problems (see test cases in `tests/Tests/Writers/Markdown.hs`).
2015-03-09Merge pull request #2000 from bosmacs/org-smartJohn MacFarlane2-8/+74
Org reader: add support for smart punctuation
2015-03-09Org reader: add support for smart punctuationCraig S. Bosma2-8/+74