aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-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.
2014-07-30Merge pull request #1468 from jkr/mediabagJohn MacFarlane7-43/+49
Mediabag
2014-07-30Make toplevel pandoc bin make use of mediabag.Jesse Rosenthal1-1/+2
Note that at the moment the mediabag is discarded. This will have to be changed to make use of it.
2014-07-30Pandoc.hs: change BSReader to output MediaBag as well as pandoc.Jesse Rosenthal1-3/+3
2014-07-30Shared: Make MediaBag available through Shared.Jesse Rosenthal1-0/+11
2014-07-30Docx reader: change tests to make use of media bag.Jesse Rosenthal2-2/+3
2014-07-30Docx reader: Make docx reader put image data in MediaBag.Jesse Rosenthal2-37/+30
Image data will not be put in a media bag map, which will be output along with the pandoc output.
2014-07-29Mediawiki writer: don't escape inside `<source>`.John MacFarlane1-4/+8
Closes #1445. Escapes can still be used with `<code>` and `<pre>`.
2014-07-29Docx writer: Print subtitle from metadata if present.John MacFarlane3-6/+12
Use Subtitle style. See #1451.
2014-07-29LaTeX writer: use \(..\) instead of $..$ for inline math.John MacFarlane3-8/+8
Closes #1464.
2014-07-29Merge pull request #1463 from jkr/metadataJohn MacFarlane7-11/+105
Make metadata out of styled pars
2014-07-29Add and update docx tests in pandoc.cabal.Jesse Rosenthal6-6/+12
2014-07-29Docx reader: Make metavalues out of styled paragraphs.Jesse Rosenthal8-11/+99
This will make paragraphs styled with `Author`, `Title`, `Subtitle`, `Date`, and `Abstract` into pandoc metavalues, rather than text. The implementation only takes those elements from the beginning of the document (ignoring empty paragraphs). Multiple paragraphs in the `Author` style will be made into a metaList, one paragraph per item. Hard linebreaks (shift-return) in the paragraph will be maintained, and can be used for institution, email, etc.
2014-07-27Merge pull request #1459 from mpickering/formatsJohn MacFarlane1-2/+2
Parsing: Added isbn and pmid schemes
2014-07-27Parsing: Added isbn and pmid schemesMatthew Pickering1-2/+2
2014-07-27Markdown writer: Separate adjacent lists of the same kind with comment.John MacFarlane1-3/+9
Closes #1458.
2014-07-27Markdown writer: More improvements to 'plain' output, updated tests.John MacFarlane4-128/+187
Math now appears in unicode if possible, without the distracting italics around identifiers. Blank lines around headers are more consistent. Footnotes appear in regular [n] style.