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

772 commits

Author SHA1 Message Date
John MacFarlane
7119715a6a LaTeX reader rawLaTeXBlock: handle macros that resolve to a... 
...`\begin` or `\end`.
Fixes #4667.
 2018-05-30 12:49:01 -07:00
John MacFarlane
252ab9b773 Markdown writer: preserve implicit_figures with attributes... 
...even if `implicit_attributes` is not set, by rendering in
raw HTML.

Fixes #4677.
 2018-05-30 09:24:52 -07:00
Alexander Krotov
1100bfc0e6 Muse reader: parse image URLs without "guard" and "takeExtension" 2018-05-30 02:29:43 +03:00
Alexander Krotov
6907985e82 Muse reader: test image with space in filename 2018-05-27 22:22:04 +03:00
John MacFarlane
58447bba98 rawLaTeXBlock: don't expand macros in macro definitions! 
Closes #4653.  Note that this only affected LaTeX in markdown.
Added regression test.
 2018-05-15 09:19:13 -07:00
John MacFarlane
2b89aaf04d Make internal links work in ODT/OpenDocument. 
This adds proper bookmarks to the headers with non-null IDs.
Closes #4358.
 2018-05-14 10:37:46 -07:00
John MacFarlane
a00ca6f0d8 Removed inadvertently added .orig files from repository. 
These were added by
96d10c72cc

Closes #4648.
 2018-05-11 17:10:32 -07:00
John MacFarlane
c3d2572c5f Use texmath-0.11. 2018-05-10 12:10:35 -07:00
John MacFarlane
d3be567a73 Fix regression with tex math environments in HTML + MathJax. 
Closes #4639.
 2018-05-09 10:37:04 -07:00
John MacFarlane
81881ce470 Parsing: Lookahead for non-whitespace after single/double quote start. 
Closes #4637.
 2018-05-09 10:00:34 -07:00
John MacFarlane
5f33d2e0cd Another try at test-pandoc-utils.lua on windows. 2018-05-08 22:32:44 -07:00
John MacFarlane
691f38f3d6 test-pandoc-utils.lua - add diagnostic for windows test. 2018-05-08 22:08:23 -07:00
John MacFarlane
9f2af30c06 More adjustments to test-pandoc-utils.lua. 
We need to find something that will work on windows.
 2018-05-08 12:28:12 -07:00
John MacFarlane
fa4f3c5c17 test-pandoc-utils.lua - use tr instead of sed. 
It should be installed on all *nix systems.
 2018-05-08 11:51:50 -07:00
John MacFarlane
83fb9d5495 test-pandoc-utils.lua: workaround some local differences in 'echo'. 2018-05-08 11:22:10 -07:00
John MacFarlane
e6d85927ea test-pandoc-utils.lua: remove problems with missing /bin/false. 
Previously it was assumed that the system would have `/bin/false`
and `/bin/sed`, and these tests were skipped otherwise.

On MacOS, these utilities are located in `/usr/bin`.

Fixed by just using `sed` and `false` -- these should always be
in the path.  Removed the "skipping" behavior, replaced with a
check for Windows.  On Windowns, we use `echo` and `cd`, which
should always exist.

Not yet checked on Windows.
 2018-05-08 11:07:57 -07:00
John MacFarlane
40603dd4cd Support underline in docx writer. 
Updated golden test and confirmed validity of file.

Closes #4633.
 2018-05-08 10:17:51 -07:00
John MacFarlane
44f1c72b28 Add test for #4576. 
Closes #4576.
 2018-05-08 09:14:58 -07:00
Alexander Krotov
5879923422 Muse writer: add support for left-align and right-align classes 
Address issue #4542
 2018-05-07 14:54:20 +03:00
John MacFarlane
516025248e Update tests for #4605. 2018-05-01 21:26:08 -07:00
Alexander Krotov
4139e3e92b Test Lua filter converting display math to inline math 2018-04-29 16:20:38 +03:00
Francesco Occhipinti
8b01f03eaa RST writer: preserve empty inline parents in flatten (#4603) 2018-04-27 09:01:20 -07:00
Alexander
1927bc9aac Add FB2 reader (#4539) 2018-04-26 12:33:18 -07:00
John MacFarlane
619aaf29aa Merge branch 'fb2-hrblankline' of https://github.com/labdsf/pandoc into labdsf-fb2-hrblankline 2018-04-26 12:29:06 -07:00
John MacFarlane
a96c762a10 RST reader: fix anonymous redirects with backticks. 
Closes #4598.
 2018-04-26 12:23:25 -07:00
Francesco Occhipinti
eef1c211f5 RST reader: flatten nested inlines, closes #4368 (#4554) 
nested inlines are not valid RST syntax, so we flatten them following
some readability criteria discussed in #4368.
 2018-04-26 12:17:51 -07:00
Alexander Krotov
4d89a1db7f Muse reader: allow nested footnotes 2018-04-26 12:38:17 +03:00
John MacFarlane
aba0f7e063 Add tests for #4589 and #4594 (currently failing). 2018-04-25 23:04:08 -07:00
John MacFarlane
d0940c6e00 Ms template: Fix date. 
Previously .ND was used, but this only works if you
have a title page, which we don't.  Thanks to @teoric.
 2018-04-25 17:49:01 -07:00
John MacFarlane
16f36eee43 Removed deprecated ancient HTML math methods. 
Removed `--latexmathml`, `--gladtex`, `--mimetex`, `--jsmath`, `-m`,
`--asciimathml` options.

Removed `JsMath`, `LaTeXMathML`, and `GladTeX` constructors from
`Text.Pandoc.Options.HTMLMathMethod` [API change].

Removed unneeded data file LaTeXMathML.js and updated tests.

Bumped version to 2.2.
 2018-04-25 17:18:56 -07:00
John MacFarlane
97916f0881 Remove nonfree ICC profiles from thumbnails in test docx files. 
Closes #4588.
 2018-04-25 17:00:21 -07:00
John MacFarlane
dab3330a58 RST reader: allow < 3 spaces indent under directives. 
Closes #4579.
 2018-04-22 12:20:25 -07:00
John MacFarlane
076093fe62 Small test suite update. Markdown tables. 2018-04-21 14:16:24 -07:00
John MacFarlane
7fbe473b2e Markdown reader/writer: spacing adjustments in tables. 
* Markdown writer now includes a blank line at the end
  of the row in a single-row multiline table, to prevent it from being
  interpreted as a simple table.  Closes #4578.
* Markdown reader does a better job computing the relative width of
  the last column in a multiline table, so we can round-trip tables
  without constantly shrinking the last column.
 2018-04-21 13:06:57 -07:00
John MacFarlane
276894a2f2 RST writer: use more consistent indentation. 
Previously we used an odd mix of 3- and 4-space indentation.
Now we use 3-space indentation, except for ordered lists,
where indentation must depend on the width of the list marker.

Closes #4563.
 2018-04-19 13:47:16 -07:00
Alexander Krotov
caeb963447 FB2 writer: convert metadata value "abstract" to book annotation 2018-04-19 17:03:21 +03:00
Alexander Krotov
ce4326a4f1 Muse reader: allow "-" in anchors 2018-04-19 14:17:59 +03:00
Jesse Rosenthal
c5d8fab058 Docx reader tests: Test for combining adjacent code blocks. 2018-04-17 09:29:54 -04:00
Alexander Krotov
3443df6068 Markdown reader: add regression test for previous commit 2018-04-17 11:55:37 +03:00
Alexander Krotov
a8122987fc Muse reader: allow verse to be indented 
Muse writer indents verse blocks in definition list more than necessary, so Muse reader should parse them.
 2018-04-16 15:08:34 +03:00
Alexander Krotov
ce7301de02 Fix a typo in Muse reader testsuite comment 2018-04-16 12:12:25 +03:00
Alexander Krotov
f39931fd6c Muse writer: escape definition list terms starting with list markers 2018-04-16 11:40:18 +03:00
John MacFarlane
8ca012f139 Ms writer: font improvements. 
* Use `\f[R]` rather than `\f[]` to reset.  The latter
  returns to the previous font, which gives unintended
  results in some cases.
* Use `\f[BI]` and `\f[CB]` in headers, instead of `\f[I]` and `\f[C]`,
  since the header font is automatically bold.
* Use `\f[CB]` rather than `\f[BC]` for monospace bold.

Closes #4552.
 2018-04-15 22:44:16 -07:00
Alexander Krotov
01f5ed14e6 Muse reader: don't allow footnote references inside links 2018-04-15 17:53:53 +03:00
Alexander Krotov
17767bd29d Muse writer: escape strings starting with space 2018-04-15 16:28:45 +03:00
Alexander Krotov
9cc2bf0295 Muse reader: allow URL to be empty 
Muse writer can write links with empty URLs, so Muse reader should read them.
 2018-04-15 14:50:46 +03:00
Alexander Krotov
6be0139145 Muse reader: require that comment semicolons are in the first column 
Fixes #4551
 2018-04-15 12:17:33 +03:00
John MacFarlane
d5b98c8c6e Man writer: Don't escape U+2019 as '. 
Closes #4550.
 2018-04-14 10:42:05 -07:00
Alexander Krotov
782ab73aa3 Muse writer: escape > less often 
> should be escaped only when it can start verse, i.e., at the beginning of the line.
 2018-04-10 23:38:30 +03:00
Alexander Krotov
52803e2960 Muse writer: don't break headers, line blocks and tables with line breaks 2018-04-09 04:24:08 +03:00
Alexander Krotov
44093930a8 Muse writer: correctly output empty headings 2018-04-09 04:10:05 +03:00
Alexander Krotov
17b0499516 Muse reader: add support for Text:Amuse multiline headings 2018-04-09 02:05:57 +03:00
Alexander Krotov
ebbd441d06 Muse reader: add support for <biblio> and <play> tags 2018-04-07 18:31:06 +03:00
Alexander Krotov
f9aa2eb353 FB2 writer: output links inline instead of producing notes 
Previously all links were turned into footnotes with unclickable URLs inside.
 2018-04-07 17:12:55 +03:00
John MacFarlane
7e99178a09 Changes to tests to accommodate changes in pandoc-types. 
In https://github.com/jgm/pandoc-types/pull/36 we changed
the table builder to pad cells.  This commit changes tests
(and two readers) to accord with this behavior.
 2018-04-05 10:14:06 -07:00
John MacFarlane
d77e8f45c9 LaTEX reader: properly resolve section numbers with \ref and chapters. 
Closes #4529.
 2018-04-05 10:14:06 -07:00
Alexander Krotov
f224567d52 FB2 writer: represent HorizontalRule as empty line 
HorizontalRule corresponds to <hr> element in the default output
format, HTML. Current HTML standard defines <hr> element as
"paragraph-level thematic break". In typography it is often
represented by extra space or centered asterism ("⁂"), but since
FB2 does not support text centering, empty line (similar to extra space)
is the only solution.

Line breaks, on the other hand, don't generate <empty-line />
anymore. Previously line breaks generated <empty-line /> element
inside paragraph, which is not allowed. So, this commit addresses
issue #2424 ("FB2 produced by pandoc doesn't validate").

FB2 does not have a way to represent line breaks inside paragraphs.
They are replaced with LF character, which is not rendered by
FB2 readers, but at least preserves some information.
 2018-04-05 19:53:36 +03:00
Alexander Krotov
87dda2109d Muse writer: escape horizontal rule only if at the beginning of the line 2018-04-05 19:49:09 +03:00
quasicomputational
13538ce6eb CommonMark writer: correctly ignore LaTeX raw blocks when not raw_tex (#4533) 
Issue #4527.
 2018-04-05 08:53:42 -07:00
Alexander Krotov
ff3ed5c9f8 FB2 writer: allow emphasis and notes in titles 
Only <p> and <empty-line /> are allowed in titles,
but <p> has the same type as an ordinary paragraphs.
Therefore, there is no need to remove emphasis from titles.

Also, don't intersperse paragraph with empty lines.
 2018-04-04 14:22:34 +03:00
Marc Schreiber
16523ea3d1 LaTeX reader: parse sloppypar environment (#4517) 2018-04-02 09:33:29 -07:00
Alexander Krotov
2380845206 Muse reader: add <math> tag support 2018-04-02 17:19:26 +03:00
Alexander Krotov
ca78d93b40 Muse writer: place header IDs before header 
See https://github.com/melmothx/text-amuse/issues/39
 2018-04-02 15:58:37 +03:00
Alexander Krotov
aca4137c40 Muse writer: only escape brackets when necessary 
It includes cases when they can be mistaken for footnotes
and links, as well as inside link description.
 2018-04-01 19:39:18 +03:00
Alexander Krotov
bdb8424697 Muse writer: do not escape list markers unless preceded by space 2018-03-31 23:40:31 +03:00
John MacFarlane
b9602766d8 Textile reader: fixed tables with no body rows. 
Previously these raised an exception.

Closes #4513.
 2018-03-30 14:56:36 -07:00
John MacFarlane
5a79948e0c Mediawiki reader: improve table parsing. 
This fixes detection of table attributes and also
handles `!` characters in cells.

Closes #4508.
 2018-03-28 08:59:34 -07:00
Alexander Krotov
b379a2903a Muse writer: escape semicolons and markers after line break 2018-03-28 13:19:39 +03:00
Alexander Krotov
aa929e462d Muse reader: enable round-trip test 
Close #4468
 2018-03-25 23:04:54 +03:00
Alexander Krotov
79592db66c Muse reader: allow links to have empty descriptions 2018-03-25 22:16:45 +03:00
Alexander Krotov
a3f659d2c0 Muse writer: escape ordered list markers 
Also reduced amount of <verbatim> tags in output to avoid escaping every "-" and word that ends in a full stop.
 2018-03-25 19:28:23 +03:00
Alexander Krotov
c24c9efd98 Muse writer: enable --wrap=preserve for all tests by default 2018-03-25 18:31:28 +03:00
Alexander Krotov
c6232d0f7d Muse reader: require block <literal> tags to be on separate lines 2018-03-25 18:31:28 +03:00
Alexander Krotov
4a8993f9b0 Muse writer: improve span writing 
Test more cases when span has or hasn't anchor, class and contents in different combinations.
 2018-03-25 01:18:33 +03:00
Alexander Krotov
d58b961a6d Muse writer: do not join Span's doing normalization 
Separate spans may have different semantics, for example if spans indicate syllables in a word.
 2018-03-25 00:30:05 +03:00
Jesse Rosenthal
a295fed873 Update powerpoint golden tests: 
Some internal changes in templating produced slightly different
xml. All have been checked, are not corrupt, and have output as expected.
 2018-03-24 11:07:47 -04:00
Alexander Krotov
6f50733691 Muse writer: don't align ordered list items 
It leads to problems with round-trip test,
because aligned line blocks can't be read back.
 2018-03-21 17:33:27 +03:00
Jesse Rosenthal
f12348cab5 Powerpoint writer: add tests for improved speaker notes. 
Tests speaker notes appearing after (and inside of) separating blocks.

Output checked on Windows10 (archlinux virtualbox), PowerPoint
2013. Not corrupted, and output as expected.
 2018-03-21 10:07:07 -04:00
Alexander Krotov
81afcdfaf8 Muse writer: escape "]" in image title 2018-03-20 15:01:53 +03:00
Alexander Krotov
268c73c873 Muse writer: escape ";" to avoid accidental comments 2018-03-20 12:16:34 +03:00
Alexander Krotov
d63bba3066 Muse writer: escape "]" brackets in URLs as "%5D" 2018-03-20 12:16:34 +03:00
John MacFarlane
3d21c184d4 Ms writer: don't escape hyphens. 
Previously we escaped hyphens as `\-`, but that's a minus sign.
Closes #4467.

Updated changelog.
 2018-03-18 14:52:03 -07:00
John MacFarlane
0ef56657ed Comment out Muse reader round-trip test. 
It fails too often.  Perhaps a separate test program should
be used to hunt for round-trip bugs.
 2018-03-18 12:43:36 -07:00
John MacFarlane
7e389cb3db Use NoImplicitPrelude and explicitly import Prelude. 
This seems to be necessary if we are to use our custom Prelude
with ghci.

Closes #4464.
 2018-03-18 10:46:28 -07:00
John MacFarlane
dfa1dc164a hlint fixes. 2018-03-17 22:00:55 -07:00
Marc Schreiber
155a2ac039 Add support to parse unit string of \SI command (closes #4296). 2018-03-17 20:59:20 -07:00
Francesco Occhipinti
ba965d1736 RST writer: filter out empty inline containers (#4434). 
There is nothing in RST that corresponds to e.g. `Emph []`, so we just filter out elements like this.
 2018-03-17 20:39:26 -07:00
Francesco Occhipinti
e5845f33ad Don't wrap lines in grid tables when --wrap=none (#4320) 
* Annotate gridTable code with comments and abstract small functions
* Don't wrap lines in tables when `--wrap=none`.  Instead, expand cells, even if
   it results in cells that don't respect relative widths or surpass page column width.
* This change affects RST, Markdown, and Haddock writers.
 2018-03-17 20:31:43 -07:00
Václav Haisman
2ddf2257dc Provide bidi package's option using \PassOptionsToPackage (#4357). 
* Provide `bidi` package's option using `\PassOptionsToPackage`.  This avoid clash when   `polyglossia` loads it first and then it is loaded again for XeLaTeX when `latex-dir-rtl` defined.

* Adjust test suite for LaTeX template change.
 2018-03-17 20:20:57 -07:00
Francesco Occhipinti
65cc909fde RST writer: strip whitespace within inlines, closes #4327 (#4329) 
+ Whitespace is ignored at the beginning and end of emphasis, as per
  <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#inline-markup>.
+ Export `stripLeadingTrailingSpace` from `Text.Pandoc.Writers.Shared`.
 2018-03-17 19:21:27 -07:00
John MacFarlane
049dacf85f Removed redundant import of <> 2018-03-17 17:17:47 -07:00
John MacFarlane
be12ae3bca Better table handling for Haddock. 
In the reader, we use the new Table type in Haddock.
Note that tables with col/rowspans will not translate
well into Pandoc.

In the writer, we now render tables always as grid tables,
since Haddock supports these.
 2018-03-16 22:38:34 -07:00
John MacFarlane
b76c0e6a4a RST reader: Allow unicode bullet characters. 
Closes #4454.
 2018-03-14 17:33:00 -07:00
Jesse Rosenthal
85a65c6a51 Docx reader: add tests for nested smart tags. 2018-03-13 22:16:54 -04:00
John MacFarlane
17725a0661 Beamer: put hyperlink after \begin{frame}. 
and not in the title.  If it's in the title, then we get
a titlebar on slides with the `plain` attribute, when
the id is non-null.  This fixes a regression from 1.9.x.

Closes #4307.
 2018-03-13 10:03:51 -07:00
Alexander Krotov
3ee45a7357 Muse reader: compare first rewrite to the second in round-trip test 2018-03-12 15:09:27 +03:00
Alexander Krotov
c3fbc492c8 Muse reader: require closing tag to have the same indentation as opening 2018-03-12 14:24:50 +03:00
Alexander Krotov
f0a029ac51 Muse reader: do not reparse blocks inside unclosed block tag 
Fixes #4425
 2018-03-12 13:44:27 +03:00
Mauro Bieg
a0da1e2723 Dokuwiki writer: fix LineBreaks in Tables (#4444) 
fixes #4313
 2018-03-11 18:20:36 -07:00
Alexander Krotov
19fd98e452 Muse writer: support spans with anchors 2018-03-12 01:47:20 +03:00