aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-08-04Merge pull request #1486 from Aelve/minorJohn MacFarlane13-106/+123
Very minor cleanup and readability changes
2014-08-04Merge pull request #1476 from jkr/endnote-fixJohn MacFarlane1-2/+2
Docx Parser: Produce endnotes.
2014-08-04HTML reader: ignore <?xml..> and <DOCTYPE..> tags.John MacFarlane1-1/+1
Previously they were parsed as raw.
2014-08-04README: Removed duplicate ref of [EPUB].John MacFarlane1-1/+0
2014-08-04Use texmath 0.7 interface.John MacFarlane8-24/+32
2014-08-04Slightly fix readability of main program file.Artyom Kazak1-37/+52
2014-08-04Add PatternGuards pragmas.Artyom Kazak4-3/+6
2014-08-04Remove redundant isHexDigit function.Artyom Kazak1-4/+1
2014-08-04Remove dangling `where` from one function.Artyom Kazak1-1/+0
2014-08-04Use `stripPrefix` where appropriate.Artyom Kazak9-54/+57
2014-08-04Clean up `mediaTypeOf` a bit.Artyom Kazak1-6/+6
2014-08-04Use `mapM_` instead of `() <$ mapM` in one place.Artyom Kazak1-1/+1
2014-08-04Merge branch 'epubend' of https://github.com/mpickering/pandoc into ↵John MacFarlane13-44/+1462
mpickering-epubend Conflicts: pandoc.cabal
2014-08-03Merge pull request #1461 from cben/readme-linkable-extensionsJohn MacFarlane1-67/+71
README: linkable extensions
2014-08-03Merge pull request #1479 from Aelve/capitaliseJohn MacFarlane6-15/+43
Correctly implement capitalisation.
2014-08-03Add plain writer testing module to .cabal file.Artyom Kazak1-0/+1
2014-08-03Correctly implement capitalisation.Artyom Kazak5-15/+42
Using `map toUpper` to capitalise text is wrong, as e.g. “Straße” should be converted to “STRASSE”, which is 1 character longer. This commit adds a `capitalize` function and replaces 2 identical implementations in different modules (`toCaps` and `capitalize`) with it.
2014-08-02SelfContained: Fixed determining of source URL from within CSS files.John MacFarlane1-2/+9
(This fixes a bug introduced a couple commits back.)
2014-08-02fetchItem: improved mime type guessing.John MacFarlane1-4/+5
Strip a fragment like `?#iefix` from the extension before doing the mime lookup.
2014-08-02Shared: fetchItem improvements.John MacFarlane1-11/+12
* More consistent logic: absolute URIs are fetched from the net; other things are treated as relative URIs if sourceURL is a Just, otherwise as file paths. * We escape characters that are not allowed in URIs before trying to parse them (e.g. '|', which often occurs in the wild). * When treating relative paths as local file paths, we drop any fragment or query. This is useful e.g. when you've downloaded web fonts locally, but your source still contains the original relative URLs. Together with the previous commit, this should close #1477.
2014-08-02Text.Pandoc.SelfContained changes.John MacFarlane3-62/+30
* mkSelfContained now takes just two arguments, WriterOptions and the string. * It no longer looks in data files. This only made sense when we had copies of slidy and S5 code there. * Shared.fetchItem' is used instead of the nearly duplicate getItem.
2014-08-02Bump aeson upper bound.John MacFarlane1-2/+2
2014-08-01benchmark: use only test suite for benchmark.John MacFarlane1-3/+2
This way the benchmarks don't take so long to run.
2014-08-01Use nfIO in benchmark instead of getLength trick.John MacFarlane1-3/+1
2014-08-01Merge pull request #1475 from Aelve/fix-benchmarkJohn MacFarlane1-15/+20
Make benchmarks compile again.
2014-08-01Docx Parser: Produce endnotes.Jesse Rosenthal1-2/+2
The parser had been changing footnotes and endnotes into footnotes. This isn't a problem, because pandoc collapses them, but the parser should maintain as much of the docx structure as is collapsed, and let the toplevel reader worry about how to translate it into Pandoc. (This would be an issue when, as is planned, the docx parser spins off into its own module.) The output is the same, so no test change is required.
2014-08-01Make benchmarks compile again.Artyom Kazak1-15/+20
Additionally, fix the problem which caused one failing benchmark to stop other benchmarks from running.
2014-07-31Merge branch 'underline-option' of https://github.com/jkr/pandocJohn MacFarlane2-2/+3
2014-07-31pandoc.hs: More code reorganization.John MacFarlane1-72/+80
2014-07-31Update docx test to interpret single underline as emph.Jesse Rosenthal1-1/+1
2014-07-31Docx Reader: Single underlines are "emph"Jesse Rosenthal1-1/+2
All other underlines are ignored.
2014-07-31Merge pull request #1473 from jkr/mediabag-test-2John MacFarlane5-23/+44
Docx tests: rewrite mediabag tests.
2014-07-31EPUB Reader: Now uses the new MediaBag for imagesMatthew Pickering1-20/+45
2014-07-31README: make all extension headers H4Beni Cherniavsky-Paskin1-35/+35
2014-07-31README: Updated with EPUB informationMatthew Pickering1-5/+8
2014-07-31EPUB Reader: Added testsMatthew Pickering5-1/+942
2014-07-31EPUB Reader: Integrated into programMatthew Pickering3-2/+8
2014-07-31HTML Reader: Added ability to read MathML formatted <math> blocksMatthew Pickering1-0/+16
2014-07-31HTML Reader: Added support for anchors on links and list itemsMatthew Pickering1-4/+22
2014-07-31HTML Reader: Extended HTML Reader to recognise EPUB specific elementsMatthew Pickering1-28/+178
2014-07-31Options: Added option to turn on epub html extensionsMatthew Pickering1-0/+1
2014-07-31Except Compat: Updated to export more module functionsMatthew Pickering1-1/+11
2014-07-31EPUB Reader: Added EPUB readerMatthew Pickering1-0/+248
2014-07-31README: blank line after headersBeni Cherniavsky-Paskin1-0/+13
2014-07-31pandoc.hs: Rewrote some of the logic for clarity.John MacFarlane1-25/+31
2014-07-31Remove now unneeded JSON test file.Jesse Rosenthal1-1/+0
2014-07-31Docx tests: rewrite mediabag tests.Jesse Rosenthal6-23/+45
This will allow us to test the whole mediabag (making sure, for example, that images are added with the correct keys) instead of just individual extracted images. We compare each entry in the media bag to an image extracted on the fly from the docx. As a result, we only need one file to test with. The image in the current tests was also replaced with a smaller one.
2014-07-31New module, Text.Pandoc.MediaBag.John MacFarlane10-86/+129
Moved `MediaBag` definition and functions from Shared: `lookupMedia`, `mediaDirectory`, `insertMedia`, `extractMediaBag`. Removed `emptyMediaBag`; use `mempty` instead, since `MediaBag` is a Monoid.
2014-07-31Made MediaBag a newtype, and added mime type information to media.John MacFarlane7-50/+98
Shared now exports functions for interacting with a MediaBag: - `emptyMediaBag` - `lookuMedia` - `insertMedia` - `mediaDirectory` - `extractMediaBag`
2014-07-31Merge branch 'master' of github.com:jgm/pandocJohn MacFarlane1-1/+8