aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-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-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-31README: make all extension headers H4Beni Cherniavsky-Paskin1-35/+35
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
2014-07-31Merge pull request #1472 from mpickering/masterJohn MacFarlane1-1/+8
Shared: Added function insertMedia which is an alias for M.insert
2014-07-31Added note in README about pipe tables not wrapping in LaTeX/PDF.John MacFarlane1-1/+4
See http://stackoverflow.com/questions/25037357/pandoc-long-tablerows-in-markdown-pdf-documents-do-not-get-linewrap/25050474#25050474
2014-07-31Shared: Added function insertMedia which is an alias for M.insertMatthew Pickering1-1/+8
2014-07-30Merge pull request #1470 from jkr/metadata-testJohn MacFarlane3-0/+27
Media test
2014-07-30Docx test: Test image from media bag.Jesse Rosenthal1-0/+7
2014-07-30Docx tests: Add test image.Jesse Rosenthal1-0/+0
This is the cow image extracted from `docx.image.docx`.
2014-07-30Docx tests: Added media test comparison function.Jesse Rosenthal2-0/+20
Also tell pandoc.cabal that we'll be needing base64, since we want to compare strings here.
2014-07-30Removed deprecated and no longer used readerStrict in ReaderOptions.John MacFarlane1-2/+0
This is handled by readerExtensions now.
2014-07-30getT2TMeta: Take list of source files instead of single.John MacFarlane2-10/+9
Get latest modification time.
2014-07-30Updated RTF writer tests.John MacFarlane1-2/+2
2014-07-30Allow --self-contained to get content from MediaBag.John MacFarlane3-27/+38
Added a parameter to makeSelfContained (API change).
2014-07-30RTF writer: Improved image embedding.John MacFarlane1-1/+12
Use calculated sizes.
2014-07-30RTF writer: refactored image embedding, using fetchItem'.John MacFarlane1-26/+21
2014-07-30PDF, Docx, EPUB, and ODT writers now automatically use MediaBag.John MacFarlane6-22/+25
The MediaBag is thread through from the reader, with no need to extract to files.
2014-07-30Shared: Added fetchItem', which searches a media bag too.John MacFarlane1-0/+14
2014-07-30Moved MediaBag back from Shared to Options, to avoid module cycle.John MacFarlane3-6/+13
2014-07-30pandoc: Thread media bag into WriterOptions.John MacFarlane1-12/+14
This will make it available to docx and epub readers, etc., so we don't have to extract media to a directory when going from docx -> epub.
2014-07-30Added writerMediaBag to WriterOptions.John MacFarlane1-1/+3
2014-07-30Moved MediaBag from Shared to Options.John MacFarlane3-12/+7
This will allow us to put a MediaBag in WriterOptions.
2014-07-30Moved withTempDir from PDF to Shared, export from Shared.John MacFarlane2-11/+17
API change.
2014-07-30Added --extract-media option.John MacFarlane2-17/+54
This has been documented to affect the epub and docx readers, so we should either add the epub reader before the next release or change the documentation.