Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
5907 commits 2 branches 0 tags 65 MiB
Commit graph

110 commits

Author SHA1 Message Date
John MacFarlane
6a3a04c428 Merge branch 'errortype' of https://github.com/mpickering/pandoc into 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-28 12:12:48 -07:00
John MacFarlane
62e802ae1e Merge pull request #1976 from wcaleb/json-help-message 
Clarify JSON input and output in usage message
 2015-03-07 10:08:13 -08:00
Sumit Sahrawat
ad9e4cde9d Fix issue #969, #1779 by providing --latex-engine-opt 2015-03-04 15:25:56 +05:30
Caleb McDaniel
6b6c9e8c66 Clarify JSON input and output in usage message 2015-02-27 11:29:33 -06:00
Matthew Pickering
70e0c4d41b Update executable file 2015-02-18 21:09:07 +00:00
Matthew Pickering
da93181d06 Better warning when trying to read multiple binary files 2015-01-19 02:44:04 +00:00
John MacFarlane
e3422dc438 Added --verbose flag for debugging output in PDF production. 
Closes #1840.
Closes #1653.
 2014-12-26 11:19:55 -07:00
John MacFarlane
88812c41ce Recognize .icml extension and use icml writer. See #1707. 2014-10-20 15:01:13 -07:00
John MacFarlane
6eda32871f Give better error messages when someone tries to convert pdf, doc, odt. 
Closes #1683.
 2014-10-19 16:59:59 -07:00
mpickering
515a120d04 Add support for KaTeX HTML math 
Closes #1626
 2014-09-25 18:32:42 +01:00
John MacFarlane
b9d524c703 Use protocol-relative URL for mathjax. 
See jgm/pandoc-templates#67.
 2014-08-31 11:18:43 -07:00
John MacFarlane
b36600092c Removed extra blank line after version. 2014-08-30 08:16:00 -07:00
John MacFarlane
58cbd20b1f Removed check for PATH variable in running filters. 
This cause problems on Windows 8, where the variable is called
`Path`.

Instead, simply trap the exception that will be raised by
`findExecutable` if path is not set.

This should fix #1542.
 2014-08-17 10:33:18 -07:00
John MacFarlane
482f7f8e15 pandoc: Don't strip path off of sourceURL. 
We need this information for relative URLs!

This should resolve the continuing problem noted in #750.
 2014-08-06 14:36:46 -07:00
John MacFarlane
2de2842bdd Merge pull request #1486 from Aelve/minor 
Very minor cleanup and readability changes
 2014-08-04 22:07:02 -07:00
Artyom Kazak
675b15458a Slightly fix readability of main program file. 2014-08-04 19:58:25 +04:00
John MacFarlane
4630cff2a6 Merge branch 'epubend' of https://github.com/mpickering/pandoc into mpickering-epubend 
Conflicts:
	pandoc.cabal
 2014-08-04 07:36:18 -07:00
John MacFarlane
ce8922437d Text.Pandoc.SelfContained changes. 
* 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-02 16:07:19 -07:00
John MacFarlane
f075b0e5d9 pandoc.hs: More code reorganization. 2014-07-31 16:27:06 -07:00
Matthew Pickering
8460ea417f EPUB Reader: Integrated into program 2014-07-31 21:39:50 +01:00
John MacFarlane
0565a81676 pandoc.hs: Rewrote some of the logic for clarity. 2014-07-31 12:51:01 -07:00
John MacFarlane
6dd2418476 New module, Text.Pandoc.MediaBag. 
Moved `MediaBag` definition and functions from Shared:
`lookupMedia`, `mediaDirectory`, `insertMedia`, `extractMediaBag`.
Removed `emptyMediaBag`; use `mempty` instead, since `MediaBag`
is a Monoid.
 2014-07-31 12:00:21 -07:00
John MacFarlane
00662faefb Made MediaBag a newtype, and added mime type information to media. 
Shared now exports functions for interacting with a MediaBag:

- `emptyMediaBag`
- `lookuMedia`
- `insertMedia`
- `mediaDirectory`
- `extractMediaBag`
 2014-07-31 11:05:35 -07:00
John MacFarlane
71e76175be getT2TMeta: Take list of source files instead of single. 
Get latest modification time.
 2014-07-30 17:25:00 -07:00
John MacFarlane
e4913d6dba Allow --self-contained to get content from MediaBag. 
Added a parameter to makeSelfContained (API change).
 2014-07-30 15:26:40 -07:00
John MacFarlane
234652a4b8 PDF, Docx, EPUB, and ODT writers now automatically use MediaBag. 
The MediaBag is thread through from the reader, with no need
to extract to files.
 2014-07-30 14:07:31 -07:00
John MacFarlane
77aa72ec24 pandoc: Thread media bag into WriterOptions. 
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-30 13:20:44 -07:00
John MacFarlane
b5210bc175 Added --extract-media option. 
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-30 11:44:25 -07:00
Jesse Rosenthal
f733b50150 Make toplevel pandoc bin make use of mediabag. 
Note that at the moment the mediabag is discarded. This will have to be
changed to make use of it.
 2014-07-30 12:48:07 -04:00
Matthew Pickering
43304d6bd6 Txt2Tags Reader: Added recognition of macros 2014-07-27 00:12:56 +01:00
Matthew Pickering
ab3589ff0b Txt2Tags Reader: Integrated into pandoc 2014-07-27 00:12:56 +01:00
Clare Macrae
3cb76d9560 Merge branch 'master' of git://github.com/jgm/pandoc into dokuwiki 2014-07-01 22:10:08 +01:00
John MacFarlane
264e366f1a Filters: respect shebang if filter is executable. 
Closes #1389.
 2014-06-30 14:03:47 -07:00
Clare Macrae
717e16660d Merge remote-tracking branch 'jgm/master' into dokuwiki 2014-06-29 19:22:31 +01:00
John MacFarlane
b1a8f1fa1a Fixed --filter so it doesn't search PATH for a filter with a path. 
This fixed a bug wherein `--filter ./caps.py` would run `caps.py` from
the system path, even if there was a `caps.py` in the working directory.
 2014-06-27 18:30:57 -07:00
Jesse Rosenthal
aa194d387c Add track changes option to command line. 2014-06-25 14:09:01 -04:00
John MacFarlane
08fe16e972 Fixed compiler warnings. 2014-06-21 11:26:43 -07:00
John MacFarlane
f5c8b05a1a Filters: don't print misleading error message. 
Previously pandoc would say that a filter was not found,
even in a case where the filter had a syntax error.
 2014-06-20 23:08:00 -07:00
mpickering
3bc818d2d3 Integrated the docx reader into the main pandoc program. 
Changes also include generalising the types of reader allowed. The
mechanism now mimics the more general output mechanism.
 2014-06-16 07:18:40 -04:00
Albert Krewinkel
8fdbef841d Update copyright notices for 2014, add missing notices 2014-05-09 00:46:08 +02:00
John MacFarlane
5dfeb5d52f Allow html4 as synonym of html as reader. 
It already worked for writer.
 2014-04-27 21:01:30 -07:00
John MacFarlane
c8f97d3d41 Fix #1267. 
We now check the writerName for a lua script in pandoc.hs, so that
lowercasing and format parsing aren't done.  Note this behavior
change: getWriter in Text.Pandoc no longer returns a custom writer on
input "foo.lua".
 2014-04-27 20:56:50 -07:00
John MacFarlane
f80678df7f A bit of refactoring that shouldn't change any semantics. 
In preparation for a fix to #1267.
 2014-04-27 20:38:15 -07:00
John MacFarlane
11120d619b Give more useful error message if '-t pdf' is specified. 
Closes #1155.
 2014-04-05 23:44:57 -07:00
John MacFarlane
3fe6b57b60 Make it possible to run filters that aren't executable. 
Pandoc first tries to find the executable (searching the path
if path isn't given).  If it fails, but the file exists and has
a .py, .pl, .rb, .hs, or .php extension, pandoc runs the filter
using the appropriate interpreter.

This should make it easier to use filters on Windows, and make
it more convenient for everyone.

Closes #1096.
 2014-04-05 15:51:04 -07:00
John MacFarlane
3df75bc160 PDF: Changes to error reporting, to handle non-UTF8 error output. 2014-03-19 11:09:36 -07:00
Albert Krewinkel
24b2ac43b0 Add a simple Emacs Org-mode reader 
The basic structure of org-mode documents is recognized; however,
org-mode features like todo markers, tags etc. are not supported yet.
 2014-03-04 10:40:40 +01:00
John MacFarlane
69f7b1dbf3 Added readerTrace to ReaderOptions, --trace command line opt. 
This is to debug backtracking-related parsing bugs.
So far it is only implemented for markdown, but it would
be good to extend it to latex and html readers.
 2014-02-25 22:43:58 -08:00
John MacFarlane
9ae10b4352 The --bibliography option now sets the biblio-files variable. 
So, if you're using `--natbib` or `--biblatex`, you can just use
`--bibliography=foo.bib` instead of `-V bibliofiles=foo`.
 2014-01-03 10:11:21 -08:00
John MacFarlane
36cda45d70 Merge pull request #1005 from nougad/consistent_bibliography 
Don't add pandoc-citeproc filter if natbib or biblatex is used
 2014-01-02 21:15:41 -08:00