Commit graph

4825 commits

Author SHA1 Message Date
John MacFarlane
4c3b3bf65a Lua: move sha1 from pandoc.mediabag to pandoc. 2017-10-01 00:33:56 -07:00
John MacFarlane
8768f7e5b0 Lua: use sha1 instead of hashname.
Better to leave control over the extension to the user.
2017-09-30 23:15:43 -07:00
John MacFarlane
9451d83058 Lua: make fetch return mime type first and then content. 2017-09-30 23:00:14 -07:00
John MacFarlane
17583cd99d Lua: simply mediabag module.
Now 'fetch' simply fetches content and mime type.
A new 'hashname' function is provided to get a filename based
on the sha1 hash of the contents and the mime type.
2017-09-30 22:54:12 -07:00
John MacFarlane
73c47a44d8 Lua: make lua.mediabag.fetch return filename and mime type.
This is necessary because you may need to insert the filename
into an image or link element.
2017-09-30 21:58:35 -07:00
John MacFarlane
896c288625 Lua filters: make sure whole CommonState is passed through...
to insertResource (`fetch`).
2017-09-30 17:20:44 -05:00
John MacFarlane
99aba1e788 EPUB writer: simplified some functions. 2017-09-30 17:19:07 -05:00
John MacFarlane
9004da4587 Removed unneeded import. 2017-09-30 17:18:37 -05:00
John MacFarlane
dfe816163c Removed Verbosity and MediaBag params from makePDF.
They can be obtained from CommonState since we're
in PandocIO.
2017-09-30 17:17:39 -05:00
John MacFarlane
9ec458f39f Text.Pandoc.Class - add getVerbosity. 2017-09-30 17:15:55 -05:00
John MacFarlane
f3a80034ff Removed writerSourceURL, add source URL to common state.
Removed `writerSourceURL` from `WriterOptions` (API change).
Added `stSourceURL` to `CommonState`.
It is set automatically by `setInputFiles`.

Text.Pandoc.Class now exports `setInputFiles`, `setOutputFile`.

The type of `getInputFiles` has changed; it now returns `[FilePath]`
instead of `Maybe [FilePath]`.

Functions in Class that formerly took the source URL as a parameter
now have one fewer parameter (`fetchItem`, `downloadOrRead`,
`setMediaResource`, `fillMediaBag`).

Removed `WriterOptions` parameter from `makeSelfContained` in
`SelfContained`.
2017-09-30 16:11:20 -05:00
Albert Krewinkel
358e8c2897
Run Lua filters before extracting media
This enables users to change the media files being extracted via lua
filters.
2017-09-30 09:57:03 +02:00
Albert Krewinkel
2f47e04206
Text.Pandoc.Lua: add mediabag submodule 2017-09-30 09:57:03 +02:00
Andrie de Vries
2f03f389e8 Support R filters #3940 (#3941) 2017-09-28 08:48:42 -07:00
Alexander Krotov
b5d064e8f0 Muse reader: parse anchors 2017-09-28 14:57:24 +03:00
John MacFarlane
2314534d4d RST writer: add header anchors when header has non-standard id.
Closes #3937.
2017-09-27 20:42:04 -07:00
John MacFarlane
9a47c7863b Lua filters: set global FORMAT instead of args.
This changes the type of runLuaFilter.
2017-09-26 20:20:09 -07:00
John MacFarlane
3fe4aad5a1 Lua: set "arg" instead of "PandocParameters".
This is standard for lua scripts, and I see no reason
to depart from the standard here.

Also, "arg" is now pushed onto the stack before the script
is loaded.  Previously it was not, and thus "PandocParameters"
was not available at the top level.
2017-09-26 10:07:15 -07:00
Alexander Krotov
2cdb8fe2e6 Muse reader: test metadata parsing 2017-09-26 19:31:10 +03:00
Alexander Krotov
3fb3af7579 Fix a typo: s/collabarators/collaborators/ 2017-09-26 18:28:40 +03:00
Albert Krewinkel
3a7663281a
Org reader: update emphasis border chars
The org reader was updated to match current org-mode behavior: the set
of characters which are acceptable to occur as the first or last
character in an org emphasis have been changed and now allows all
non-whitespace chars at the inner border of emphasized text (see
`org-emphasis-regexp-components`).

Fixes: #3933
2017-09-25 09:31:29 +02:00
Albert Krewinkel
71f69cd086 Allow lua filters to return lists of elements
Closes: #3918
2017-09-24 12:04:15 -07:00
John MacFarlane
e87db3739e Fixed bug in determining writer for xelatex engine.
This revises the last commit, fixing #3931.
2017-09-20 11:45:26 -07:00
John MacFarlane
582cb4b505 Fix and simply latex engine code in App.
Fixes #3931.
2017-09-19 17:22:32 -07:00
John MacFarlane
b1ee747a24 Added --strip-comments option, readerStripComments in ReaderOptions.
* Options:  Added readerStripComments to ReaderOptions.
* Added `--strip-comments` command-line option.
* Made `htmlTag` from the HTML reader sensitive to this feature.

This affects Markdown and Textile input.

Closes #2552.
2017-09-17 13:01:27 -07:00
John MacFarlane
86730f49be Markdown reader: added inlines, inlines1.
Eventually we'll add `processEmphasis` and `processBracketed`
to this.

This will allow us to conform to CommonMark rules and
fix #3903 and #1735.
2017-09-16 11:10:19 -07:00
John MacFarlane
684f055248 Set PANDOC_READER_OPTIONS in environment where filters are run.
This contains a JSON representation of ReaderOptions.
2017-09-15 17:26:14 -07:00
John MacFarlane
b1aa67f0c9 Remove To/FromJSON instance for WriterOptions.
This required the (now removed) instances for Syntax.
It was too long, anyway, to be of use.
2017-09-15 09:36:23 -07:00
John MacFarlane
64472a468c FromJSON/ToJSON instances for Reader, WriterOptions.
Depends on skylighting 0.3.5.
2017-09-14 22:38:23 -07:00
John MacFarlane
4177ee8626 Textile reader: allow 'pre' code in list item.
Closes #3916.
2017-09-12 08:58:47 -07:00
John MacFarlane
b71c7d97d1 Add default pdf engine for beamer. 2017-09-12 08:28:04 -07:00
John MacFarlane
6509501e90 Use defaultLatexEngine instead of head latexEngines.
Partial functions make me nervous.
2017-09-12 08:25:41 -07:00
Mauro Bieg
c7e3c1ec17 Support for PDF generation via weasyprint and prince (#3909)
* Rename --latex-engine to --pdf-engine
* In `Text.Pandoc.Options.WriterOptions`, rename `writerLaTeXEngine` to `writerPdfEngine` and `writerLaTeXArgs` to `writerPdfArgs`.
 * Add support for `weasyprint` and `prince`, in addition to `wkhtmltopdf`, for PDF generation via HTML (closes #3906).
* `Text.Pandoc.PDF.html2pdf`: use stdin instead of intermediate HTML file
2017-09-11 20:18:42 -07:00
John MacFarlane
ddecd72783 Merge pull request #3911 from labdsf/muse-reader-braces
Muse reader: parse {{{ }}} example syntax
2017-09-11 14:01:05 -07:00
Alexander Krotov
8e4ee66563 Muse reader: allow inline markup to be followed by punctuation
Previously code was not allowed to be followed by comma,
and emphasis was allowed to be followed by letter.
2017-09-11 18:34:32 +03:00
Alexander Krotov
508c3a64d8 Muse reader: parse {{{ }}} example syntax 2017-09-11 18:17:28 +03:00
Alexander Krotov
27cccfac84 Muse reader: parse verbatim tag 2017-09-11 12:13:09 +03:00
Alexander Krotov
afedb41b17 Muse reader: trim newlines from <example>s 2017-09-10 12:42:24 +03:00
Alexander Krotov
2230371304 Muse reader: debug inline code markup 2017-09-09 16:39:06 +03:00
Andrew Dunning
621e43e0ec Write euro symbol directly in LaTeX
The textcomp package allows pdfLaTeX to parse `€` directly, making the \euro command unneeded. Closes #3801.
2017-09-08 22:26:32 +01:00
John MacFarlane
3421f3eac7 Removed old beamer template.
We now use the default.latex template for both latex and beamer.
It contains conditionals for the beamer-specific things.

`pandoc -D beamer` will return this template.
2017-09-08 10:48:02 -07:00
John MacFarlane
5fc4980216 Markdown writer: Escape pipe characters when pipe_tables enabled.
Closes #3887.
2017-09-07 22:10:13 -07:00
John MacFarlane
a90f131937 LaTeX writer: use proper code for list enumerators.
This should fix problems with lists that don't use arabic
numerals.

Closes #3891.
2017-09-07 22:05:22 -07:00
Alexander
743413a5b5 Muse reader: Allow finishing header with EOF (#3897) 2017-09-06 08:48:06 -07:00
John MacFarlane
0b05222a9c LaTeX reader: Better support for ogonek accents. 2017-09-05 13:54:44 -07:00
John MacFarlane
bc5624dac2 Markdown writer: make Span with null attribute transparent.
That is, we don't use brackets or `<span>` tags to mark
spans when there are no attributes; we simply output the
contents.
2017-09-05 13:46:44 -07:00
John MacFarlane
d62c4a9247 LaTeX reader: Improve handling of accents.
Handle ogonek, and fall back correctly with forms like `\"{}`.
2017-09-05 10:58:34 -07:00
John MacFarlane
146a10780e LaTeX reader: support \k ogonek accent. 2017-09-05 09:55:42 -07:00
Alexander
350c282f20 Muse reader: require at least one space char after * in header (#3895) 2017-09-05 09:41:27 -07:00
John MacFarlane
9fdc089cd8 Plain writer: don't use &nbsp; to separate list and indented code.
There's no need for it in this context, since this isn't
to be interpreted using Markdown rules.
2017-09-04 21:56:06 -07:00