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

4892 commits

Author SHA1 Message Date
John MacFarlane
ed3d466384 Really fix #3989. 
The previous fix only worked in certain cases.
Other cases with `>` in an HTML attribute broke.
 2017-11-01 09:27:51 -07:00
Alexander Krotov
00b64f337d hlint 2017-11-01 14:40:10 +03:00
Alexander Krotov
3cee9c8976 FB2 writer: Add "unrecognised" genre to <title-info> 
XML schema requires at least one genre.
 2017-11-01 13:31:16 +03:00
Alexander Krotov
8a5541dca8 FB2 writer: remove <annotation> from <body> 
<annotation> is not allowed inside <body> according to FictionBook2 XML schema. Besides that, the same information is already placed inside <description>.

Related bug: #2424
 2017-11-01 13:08:52 +03:00
John MacFarlane
9b513b8a7a
Merge pull request #4009 from mb21/html-class-names 
HTML Writer: consistently use dashed class-names
 2017-11-01 00:39:08 -04:00
John MacFarlane
eef8118af0
Merge pull request #4008 from labdsf/fb2-bullets 
FB2 writer: make bullet lists consistent with ordered lists
 2017-11-01 00:38:02 -04:00
John MacFarlane
32f6938605 Properly pass through author metadata in JATS writer. 
Closes #4020.
 2017-10-31 21:27:08 -07:00
John MacFarlane
fb6e5812bc Fixed regression in parsing of HTML comments in markdown... 
and other non-HTML formats (`Text.Pandoc.Readers.HTML.htmlTag`).
The parser stopped at the first `>` character, even if it wasn't
the end of the comment.

Closes #4019.
 2017-10-31 21:14:38 -07:00
John MacFarlane
fd7e3cb18f
Merge pull request #4018 from swilde/creole-fixes 
Creole Reader: fix lists with triling white space
 2017-11-01 00:04:36 -04:00
Sascha Wilde
534e625ace Creole reader: fixed some minor typos and formatting. 2017-10-31 22:33:58 +01:00
John MacFarlane
0e57b8b85d Add Millimeter constructor to Dimension in ImageSize. 
Minor API change.

Now sizes given in 'mm' are no longer converted to 'cm'.

Closes #4012.
 2017-10-31 11:58:43 -07:00
John MacFarlane
5f9f458df3 LaTeX reader: handle % comment right after command. 
For example

    \emph%
    {hi}
 2017-10-31 11:31:35 -07:00
John MacFarlane
2a81ff3245 LaTeX/Beamer writer: support "blocks" inside columns and other Divs. 
Example:

```

<div class="columns">
<div class="column" width="40%">
- Item
</div>
<div class="column" width="60%">
- Item
</div>
</div>
```

Closes #4016.
 2017-10-31 11:07:39 -07:00
John MacFarlane
556c6c2c6d Markdown reader: make sure fenced div closers work in lists. 
Previously the following failed:

    ::: {.class}
    1. one
    2. two
    :::

and you needed a blank line before the closing `:::`.
 2017-10-31 10:57:20 -07:00
John MacFarlane
81610144f9 Make fenced_divs affect the Markdown writer. 
If `fenced_divs` is enabled, fenced divs will be used.
 2017-10-31 10:57:20 -07:00
Sascha Wilde
fa67d6e86f Creole reader: fixed lists with trailing white space. 2017-10-31 18:55:27 +01:00
Alexander Krotov
a496979c6d FB2 writer: write blocks outside of <p> in definitions 2017-10-31 20:19:00 +03:00
mb21
8d7ce0fdf0 HTML Writer: consistently use dashed class-names 
see #3556
 2017-10-31 10:40:16 +01:00
Alexander Krotov
94d02a6efa FB2 writer: make bullet lists consistent with ordered lists 
Previously bullet lists interacted in odd way with ordered lists.
For example, bullet lists nested in ordered list had incorrect
indentation. Besides that, indentation with spaces is not rendered
by FBReader and fbless. To avoid this problem, bullet lists are
indented by appending bullets to marker just the same way it is
done for ordered lists.
 2017-10-31 11:35:47 +03:00
John MacFarlane
c0e51c5710 EPUB writer: fixed filepaths for nonstandard epub-subdirectory values. 2017-10-30 17:43:08 -07:00
John MacFarlane
599d4aa032 EPUB writer fixes: 
- Ensure that epub2 is recognized as a non-text format,
  so that a template is used.

- Don't include "prefix" attribute for ibooks for epub2.
  It doesn't validate.

- Fix stylesheet paths; previously we had an incorrect
  stylesheet path for the cover page and nav page.
 2017-10-30 17:25:15 -07:00
John MacFarlane
90597fe292 LaTeX reader: insert space when needed in macro expansion. 
Sometimes we need to insert a space after a control sequence
to prevent it merging with a following letter.

Closes #4007.
 2017-10-30 11:51:49 -07:00
John MacFarlane
272b833ad5 Allow unbraced arguments for macros. 
See #4007.
 2017-10-30 11:35:40 -07:00
John MacFarlane
601a28fd36 Allow body of macro definition to be unbraced. 
e.g.

    \newcommand\arrow\to

See #4007.
 2017-10-30 10:59:52 -07:00
John MacFarlane
1e1a7a9b83 Fixed warnings. 2017-10-29 15:19:49 -07:00
John MacFarlane
6a1476e7e2 Export all of Text.Pandoc.Class from Text.Pandoc. 2017-10-29 15:00:49 -07:00
John MacFarlane
95ccbdaac2 Removed useless notes state in DokuWiki writer. 2017-10-29 14:55:22 -07:00
John MacFarlane
52ee19a825 Source code reformatting. 2017-10-29 14:29:32 -07:00
John MacFarlane
f270dd9b18 hlint suggestions. 2017-10-29 14:18:06 -07:00
John MacFarlane
271e1fe2f1 More hlint. 2017-10-29 13:19:15 -07:00
John MacFarlane
9ef4ad2e20 Small reformat. 2017-10-29 13:01:04 -07:00
John MacFarlane
b18dbfe792 Use uncurry. 2017-10-29 12:58:41 -07:00
John MacFarlane
8e5e8746d8 More hlint fixes. 2017-10-29 12:45:37 -07:00
Alexander
3263d0d7c4 Write FB2 lists without nesting blocks inside <p> (#4004) 
According to FB2 XML schema <empty-line /> cannot be placed inside
<p>. Linux FBReader can't display such paragraphs, e.g. any "loose"
lists produced by pandoc prior to this commit.  Besides that,
FB2 writer placed <p> inside <p> when writing nested lists,
this commit fixes the bug.

Also this commit removes leading non-breaking space from ordered
lists for consistency with bullet lists.

Definition lists are not affected at all.
 2017-10-29 14:46:44 -04:00
John MacFarlane
47e2719cc3 Fix warning for older GHC versions. 2017-10-28 09:56:20 -07:00
John MacFarlane
b39f782c8d Try to fix imports for older ghc. 2017-10-28 00:09:23 -07:00
John MacFarlane
cb42bb820c Change order of imports to satisfy older ghc. 2017-10-28 00:01:44 -07:00
John MacFarlane
cbcb9b36c0 hlint suggestions. 2017-10-27 23:13:55 -07:00
John MacFarlane
8481298357 Don't rely on syb when we don't need to. 2017-10-27 21:44:22 -07:00
John MacFarlane
b201a8aa58 hlint changes. 2017-10-27 21:32:53 -07:00
John MacFarlane
f3e901c29d hlint suggestions. 2017-10-27 21:26:16 -07:00
John MacFarlane
be7a29e9b9 hlint suggestions. 2017-10-27 21:11:26 -07:00
John MacFarlane
e77d08e439 hlint suggestions. 2017-10-27 21:07:47 -07:00
John MacFarlane
ff16db1aa3 Automatic reformating by stylish-haskell. 2017-10-27 20:28:29 -07:00
hftf
7f8a3c6cb7 Consistent underline for Readers (#2270) 
* Added underlineSpan builder function.  This can be easily updated if needed. The purpose is for Readers to transform underlines consistently.

* Docx Reader: Use underlineSpan and update test

* Org Reader: Use underlineSpan and add test

* Textile Reader: Use underlineSpan and add test case

* Txt2Tags Reader: Use underlineSpan and update test

* HTML Reader: Use underlineSpan and add test case
 2017-10-27 18:45:00 -04:00
Kolen Cheung
0b09409385 update years in copyright 2017-10-26 22:57:13 -07:00
Sascha Wilde
66fd3247ea Creole reader (#3994) 
This is feature complete but not very thoroughly tested yet.
 2017-10-26 19:19:28 -04:00
John MacFarlane
33eee0ceb8 Comment reformat. 2017-10-26 11:35:27 -07:00
John MacFarlane
424e94bd45 makePDF: add argument for pdf options, remove writerPdfArgs. 
- Removed writerPdfArgs from WriterOptions (API change).
- Added parameter for pdf args to makePDF.
 2017-10-26 11:11:45 -07:00
John MacFarlane
23fbf8a533 Text.Pandoc.App: export applyFilters, applyLuaFilters. (API change) 2017-10-24 22:46:06 -07:00
John MacFarlane
f82bcc2bf3 Added some haddock docs for Text.Pandoc.Class functions. 2017-10-24 22:12:05 -07:00
John MacFarlane
ebc801cfc5 HTML reader: close td/th should close any open block tag... 
Closes #3991.
 2017-10-24 14:45:43 -07:00
John MacFarlane
38b5f24a66 HTML reader: td should close an open th or td. 2017-10-24 14:42:33 -07:00
John MacFarlane
ad2df0655e Revert "HTML reader: td or th implicitly closes blocks within last td/th." 
This reverts commit d2c4243f89.
 2017-10-24 14:32:51 -07:00
John MacFarlane
d2c4243f89 HTML reader: td or th implicitly closes blocks within last td/th. 2017-10-24 14:27:49 -07:00
John MacFarlane
513b16a71b Fenced divs: ensure that paragraph at end doesn't become Plain. 
Added test case.
 2017-10-24 09:53:29 -07:00
John MacFarlane
ecb5475a2a Back to using [WARNING] and [INFO] to mark messages. 2017-10-23 23:01:37 -07:00
John MacFarlane
fda0c0119f Implemented fenced Divs. 
+ Added Ext_fenced_divs to Extensions (default for pandoc Markdown).
+ Document fenced_divs extension in manual.
+ Implemented fenced code divs in Markdown reader.
+ Added test.

Closes #168.
 2017-10-23 22:45:28 -07:00
John MacFarlane
896803b0d5 HTML reader: htmlTag improvements. 
We previously failed on cases where an attribute contained a `>`
character. This patch fixes the bug.

Closes #3989.
 2017-10-23 17:29:32 -07:00
John MacFarlane
1a82ecbb68 More pleasing presentation of warnings and info messages. 
!! warning
-- info
 2017-10-23 15:00:11 -07:00
John MacFarlane
6d862ff954 Downgraded SkippedContent and DocxParserWarning from WARNING to INFO 2017-10-23 10:54:51 -07:00
mb21
e2123a4033 LaTeX Reader: support \lettrine 2017-10-22 20:33:30 +02:00
mb21
05adbd6f19 LaTeX Reader: use opt function consistently 2017-10-22 20:33:30 +02:00
John MacFarlane
4aa84f4006 In rendering PandocParsecError, only print input at error location... 
if the source name is `source` (i.e., the top level). Otherwise
results will be misleading, since what readM does is to look
up the source position of the error in the *original* input,
which may not match the input used by parseFromString or
in parsing from an included file.

Closes #3865.  Not a great fix, maybe there's something better
that could be done, but this should at least avoid misleading
messages.
 2017-10-21 21:54:38 -07:00
John MacFarlane
5164ecd0ec SelfContained: data-background-image instead of data-background. 
Really closes #3979.
 2017-10-20 23:16:53 -07:00
John MacFarlane
21328a8771 LaTeX reader: be more forgiving in parsing command options. 
This was needed, for example, to make some minted options work.
 2017-10-19 15:58:29 -07:00
John MacFarlane
f615d7bb98 LaTeX reader: Strip off quotes in \include filenames. 2017-10-19 15:36:18 -07:00
John MacFarlane
28bb5d610d LaTeX reader: support \expandafter. 
Closes #3983.
 2017-10-19 13:23:50 -07:00
John MacFarlane
e941ba05b9 LaTeX reader: handle \DeclareRobustCommand. 
Currently it's just treated as a synonym for `\newcommand`.

Handles the second case mentioned in #3983.
 2017-10-19 11:50:16 -07:00
Ben Firshman
9046dbadb1
Latex reader: Skip spaces in image options 2017-10-17 16:42:11 +03:00
John MacFarlane
c2de9d749c SelfContained: handle data-background attribute on section. 
This should help with #3979.

In my test, I got a data uri for data-background. But it didn't
actually work in the browser (the background image didn't show).
Not sure whether this is a problem in reveal.js or a problem
in pandoc...
 2017-10-16 23:10:05 -07:00
John MacFarlane
514958f5ea HTML writer: don't add data- prefix to unknown attributes beginning with data-. 
Or we'll get data-data-blah.
 2017-10-16 23:06:13 -07:00
John MacFarlane
c40857b389 Improved handling of include files in LaTeX reader. 
Previously `\include` wouldn't work if the included file
contained, e.g., a begin without a matching end.

We've changed the Tok type so that it stores a full SourcePos,
rather than just a line and column.  So tokens keeep track
of the file they came from. This allows us to use a simpler
method for includes, which doesn't require parsing the included
document as a whole.

Closes #3971.
 2017-10-16 22:05:34 -07:00
John MacFarlane
9cf9a64923 RST writer: correctly handle inline code containing backticks. 
(Use a :literal: role.)

Closes #3974.
 2017-10-16 20:54:43 -07:00
John MacFarlane
cba18c19a6 RST writer: don't backslash-escape word-internal punctuation. 
Closes #3978.
 2017-10-16 20:39:19 -07:00
John MacFarlane
d8804f4747 App: added --request-header option. 2017-10-15 22:13:15 -07:00
John MacFarlane
2f66d57616 Remove openURL from Shared (API change). 
Now all the guts of openURL have been put into openURL from
Class.  openURL is now sensitive to stRequestHeaders in CommonState
and will add these custom headers when making a request.
It no longer looks at the USER_AGENT environment variable,
since you can now set the `User-Agent` header directly.
 2017-10-15 22:11:38 -07:00
John MacFarlane
a1f7a4263f Class: add stRequestHeaders to CommonState, and setRequestHeader. 2017-10-15 22:09:28 -07:00
John MacFarlane
5e1c422389 Handle unknown options in form --latex-engine=foo. 
Previously these were not triggering the helpful message
about option name changes.
 2017-10-15 18:27:48 -07:00
John MacFarlane
eb508c1330 Merge pull request #3970 from d-dorazio/master 
markdown writer: always write bracketed_spans' attributes
 2017-10-13 14:02:01 -04:00
John MacFarlane
6934b921b3 CommonMark writer: omit "fig:" prefix in image titles. 
This is used internally to indicate internal figures.
See https://groups.google.com/d/msgid/pandoc-discuss/892c5a25-086a-4e19-b4c1-8
975cea8df0f@googlegroups.com?utm_medium=email&utm_source=footer
 2017-10-13 10:36:27 -07:00
d-dorazio
8dd8f492c1 markdown writer: always write bracketed_spans' attributes 2017-10-13 12:00:28 +02:00
John MacFarlane
75d8c99c73 ConTeXt writer: Use identifiers for chapters. 
Closes #3968.
 2017-10-11 20:21:55 -07:00
Alexander Krotov
00013c21eb FB2 Writer: format LineBlock as poem 
Previously writer produced one paragraph with <empty-line/> elements,
which are not allowed inside <p> according to FB2 schema.
 2017-10-11 12:34:02 +03:00
Agustín Martín Barbero
cdb9efa823 docx writer - activate evenAndOddHeaders from reference doc 
Fixes #3901 by checking for the evenAndOddHeaders mark in the
reference doc, and copying it to the resulting docx if present.
 2017-10-10 00:58:25 +02:00
Alexander Krotov
4bfcbbfc30 FB2 writer: replace concatMap with cMap 2017-10-09 19:04:10 +03:00
Alexander Krotov
81d28412d0 hlint FB2 writer 2017-10-09 18:08:27 +03:00
John MacFarlane
7d2ff7ed6d Shared.stringify, removeFormatting: handle Quoted better. 
Previously we were losing the qutation marks in Quoted
elements.  See #3958.
 2017-10-08 21:55:57 -07:00
John MacFarlane
ad13189c8f LaTeX reader: don't treat "..." as Quoted. 
This caused quotes to be omitted in `\texttt` contexts.

Closes #3958.

However, a better fix would be to modify the
 2017-10-08 21:11:58 -07:00
John MacFarlane
fdaae5aec5 Small logic fix. 2017-10-08 09:53:03 -07:00
Albert Krewinkel
f176ad6f21
Org reader: end footnotes after two blank lines 
Footnotes can not only be terminated by the start of a new footnote or a
header, but also by two consecutive blank lines.
 2017-10-08 14:17:26 +02:00
John MacFarlane
89f1362660 Use mathjax 2.7.2 by default. 2017-10-06 21:12:54 -07:00
John MacFarlane
c0b3f7fc60 Removed redundant import 2017-10-06 20:29:11 -07:00
bucklereed
c359bdd9b1 LaTeX reader: read polyglossia/babel \text($LANG){...}. 2017-10-06 12:17:50 +01:00
John MacFarlane
23eaf2a74f KaTeX fixes: 
* In Options.HTMLMathMethod, the KaTeX contsructor now takes only
  one string (for the KaTeX base URL), rather than two [API change].
* The default URL has been updated to the latest version.
* The autoload script is now loaded by default.
 2017-10-05 10:08:04 -07:00
Albert Krewinkel
12f8efe012
pandoc.lua: throw better error when pipe command fails 
A table containing the error code, command, and command output is thrown
instead of just a string error message.
 2017-10-05 11:41:59 +02:00
Albert Krewinkel
2262f005ce
Use hslua v0.9.0 2017-10-05 11:30:44 +02:00
Albert Krewinkel
371f9b7084
pandoc.lua: use wrapper funciton for pipe command 
The pipe command is wrapped in a lua function, throwing a lua error if
the command returns with an error. A wrapper is needed as Haskell
functions exposed to lua may not throw lua errors due to limitations of
hslua.

The error handling is written such that a table can be returned as an
error object in the future. This is potentially useful when finer
control is required while catching the error in lua code. Current
limitations of hslua require error objects to be strings.
 2017-10-03 20:45:11 +02:00
Albert Krewinkel
9b750f7d87
Lua.PandocModule: promote addFunction to top level 
This reduces some boilerplate.
 2017-10-03 13:13:45 +02:00
John MacFarlane
492f496842 Markdown reader: Fixed bug with indented code following raw LaTeX. 
Closes #3947.
 2017-10-02 21:28:14 -07:00