aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-01-25Fixed something small that broke in rebase.John MacFarlane1-1/+1
2017-01-25Class: Warn instead or erroring if we can't fetch mediaJesse Rosenthal1-5/+18
If deferred media can't be fetched, we catch the error and warn instead. We add an internal function for fetching which returns a Maybe value, and then run catMaybes to only keep the Just's.
2017-01-25Class: Refactor fetchItem.Jesse Rosenthal1-38/+44
Move the downloading/reading-in logic out of fetchItem, so we can use it to fill the MediaBag. Now when other modules use `fetchItem` it will fill the MediaBag as expected.
2017-01-25Class: Add insertDeferredMedia function.Jesse Rosenthal1-0/+7
2017-01-25Integrate DeferredMediaBag into CommonStateJesse Rosenthal1-10/+17
The DeferredMediaBag is now the object that is held in state. It should not be visible to users, who will still deal with MediaBag through exported getters and setters. We now have a function `fetchDeferredMedia` which returns () but downloads/reads in all of the deferred media. Note that getMediaBag first fetches all deferred media.
2017-01-25Introduce DeferredMediaBag.Jesse Rosenthal1-0/+24
This is a lazy MediaBag, that will only be evaluated (downloaded/read in) upon demand. Note that we use fetchItem in getDefferedMedia at the moment to read in/download. This means that we don't need to distinguish between URIs and FilePaths. But there is an inefficiency here: `fetchItem` will pull an item out of the mediaBag if it's already there, and then we'll reinsert it. We could separate out `fetchItem` into the function that checks the MediaBag and the underlying downloader/read-inner.
2017-01-25Use latest pandoc-citeproc for windows build.John MacFarlane1-1/+1
2017-01-25Expose Text.Pandoc.MIME, unexpose Text.Pandoc.CSSJohn MacFarlane1-2/+2
2017-01-25Class: have pure instance of openURL throw an error, for now.John MacFarlane1-1/+1
Later we may want to include a map of URLs and mime type, bytestring pairs in pure state to serve as a fake internet.
2017-01-25Text.Pandoc.Shared: Removed fetchItem, fetchItem'.John MacFarlane9-108/+58
Made changes where these are used, so that the version of fetchItem from PandocMonad can be used instead.
2017-01-25Add openURL and readFileStrict to PandocMonad.John MacFarlane1-38/+98
Removed fetchItem and fetchItem'. Provide fetchItem in PandocMonad (it uses openURL and readFileStrict). TODO: - PandocPure instance for openURL. - Fix places where fetchItem is used so that we trap the exception instead of checking for a Left value. (At least in the places where we want a warning rather than a failure.)
2017-01-25Moved extract-changes.hs and github-upload.sh to tools/.John MacFarlane3-1/+1
2017-01-25Removed hush from Text.Pandoc.Shared.John MacFarlane2-8/+3
Not used anywhere.
2017-01-25Removed `--normalize` option and normalization functions from Shared.John MacFarlane13-214/+30
* Removed normalize, normalizeInlines, normalizeBlocks from Text.Pandoc.Shared. These shouldn't now be necessary, since normalization is handled automatically by the Builder monoid instance. * Remove `--normalize` command-line option. * Don't use normalize in tests. * A few revisions to readers so they work well without normalize.
2017-01-25Class: Removed getDefaultReferenceDocx/ODT from PandocMonad.John MacFarlane3-25/+7
We don't need these, since the default docx and odt can be retrieved using `readDataFile datadir "reference.docx"` (or odt).
2017-01-25Removed commented-out vestigaes of fail in Class.John MacFarlane1-8/+0
2017-01-25Fixed up weigh-pandoc and benchmark-pandoc so they build.John MacFarlane3-13/+17
2017-01-25Class: removed 'fail' from PandocMonad.John MacFarlane2-13/+13
Do we need this? I don't see why. There's a name clash which would better be avoided.
2017-01-25CONTRIBUTING: instructions for building weigh-pandoc.John MacFarlane1-0/+5
2017-01-25Generic instance for PandocError.John MacFarlane1-1/+2
2017-01-25Text.Pandoc: limit exports from Text.Pandoc.Class.John MacFarlane1-2/+5
2017-01-25Updated RELEASE-CHECKLIST and markdownified.John MacFarlane2-35/+27
2017-01-25Removed PROFILING, added profiling info to CONTRIBUTING.md.John MacFarlane2-6/+17
2017-01-25Removed Interact.hs, not needed any more with modern tools.John MacFarlane1-34/+0
2017-01-25Removed ancient HCAR-Pandoc.tex.John MacFarlane1-35/+0
2017-01-25Use dev pandoc-citeproc for appveyor build.John MacFarlane1-1/+3
2017-01-25Added ReaderOptions parameter to readNative.John MacFarlane6-8/+10
This makes it similar to the other readers -- even though ReaderOptions is essentially ignored, the uniformity is nice.
2017-01-25Version to 2.0.John MacFarlane1-1/+1
2017-01-25pandoc.hs: moved main loop to beginning of file.John MacFarlane1-368/+371
2017-01-25Refactored pandoc.hs so that all the runIO' part comes at the end.John MacFarlane1-50/+50
2017-01-25Travis: allow ghc 7.8.4 to fail. For now anyway.John MacFarlane1-0/+1
2017-01-25MediaBag: put extractMediaBag into MonadIO.John MacFarlane1-3/+7
2017-01-25SelfContained: put makeSelfContained in MonadIO.John MacFarlane1-2/+3
2017-01-25PDF: put makePDF in MonadIO.John MacFarlane1-4/+6
2017-01-25pandoc.hs - moved some utility functions out of main loop.John MacFarlane1-28/+30
2017-01-25More refactoring of pandoc.hs for clarity.John MacFarlane1-28/+21
2017-01-25Put filter running code into MonadIOJohn MacFarlane1-11/+12
2017-01-25Shared: put err into MonadIO.John MacFarlane1-2/+2
2017-01-25Fixed a misleading comment.John MacFarlane1-1/+1
2017-01-25Added a type signatureJohn MacFarlane1-1/+2
2017-01-25More refactoring of pandoc.hs for clarity.John MacFarlane1-22/+25
2017-01-25Slight code rearrangement in preparation for...John MacFarlane1-45/+47
...passing mediabag in the PandocIO monad.
2017-01-25Finished previous commit; removed export of toJsonFilter.John MacFarlane1-2/+0
2017-01-25Removed deprecated toJsonFilter.John MacFarlane1-6/+0
Use toJSONFilter from Text.Pandoc.JSON.
2017-01-25Removed deprecated `--no-wrap` option.John MacFarlane2-11/+0
2017-01-25Removed deprecated `--chapters` option.John MacFarlane2-11/+0
2017-01-25Simplified reference-docx/reference-odt to reference-doc.John MacFarlane6-62/+49
* Text.Pandoc.Options.WriterOptions: removed writerReferenceDocx and writerReferenceODT, replaced them with writerReferenceDoc. This can hold either an ODT or a Docx. In this way, writerReferenceDoc is like writerTemplate, which can hold templates of different formats. [API change] * Removed `--reference-docx` and `--reference-odt` options. * Added `--reference-doc` option.
2017-01-25Process.pipeProcess: stream stderr rather than capturing.John MacFarlane3-29/+16
Signature of pipeProcess has changed: the return value is now IO (ExitCode, ByteString) -- with only stdout. Stderr is just inherited from the parent. This means that stderr from filters will now be streamed as the filters are run. Closes #2729.
2017-01-25RST reader: rebase-related fixes to warnings.John MacFarlane1-13/+12
2017-01-25Removed unneeded pragmas.John MacFarlane1-2/+1