Commit graph

5616 commits

Author SHA1 Message Date
John MacFarlane
a864e9a348 Merge pull request #1805 from bergey/rst
RST Reader - Improved Role Support
2014-12-15 09:06:45 -08:00
John MacFarlane
9e75b9b84b DocBook readers: Include id on section headers.
Closes #1818.
2014-12-14 23:46:25 -08:00
John MacFarlane
269b33d24b DocBook reader: Handle menuchoice elements better.
They are now rendered with a `>` between them.
Closes #1817.
2014-12-14 23:37:54 -08:00
John MacFarlane
c350847943 DocBook reader: get string content in inner tags for literal elements.
Closes #1816.
2014-12-14 19:12:48 -08:00
John MacFarlane
9e83cd62a6 DocBook reader: handle keycombo, keycap.
Closes #1815.
2014-12-14 19:03:48 -08:00
John MacFarlane
1d3ca088f2 Merge pull request #1813 from tarleb/file-links
Org reader: properly handle links to `file:target`
2014-12-14 13:36:34 -08:00
Albert Krewinkel
4d85b17fc5 Org reader: properly handle links to file:target
Org links like `[[file:target][title]]` were not handled correctly,
parsing the link target verbatim.  The org reader is changed such that
the leading `file:` is dropped from the link target.

This is related to issues #756 and #1812.
2014-12-14 21:30:10 +01:00
John MacFarlane
2b08e32a90 Fixe autolinks with following punctuation.
Closes #1811.
The price of this is that autolinked bare URIs can no longer
contain `>` characters, but this is not a big issue.
2014-12-14 12:20:33 -08:00
Daniel Bergey
ea157cf23f RST: warn about ignored fields in role directives 2014-12-12 14:45:45 +00:00
Daniel Bergey
689fb112bf RST Reader: compute Attrs when role is defined
Move recursive role lookup from renderRole to addNewRole.  The Attr value
will be the same for every occurance of this role, so there's no reason
to compute it every time.  This allows simplifying the
stateRstCustomRoles map considerably.

We could go even further, and remove the fmt and attr arguments to
renderRole, which are null except for custom roles.
2014-12-12 14:45:45 +00:00
Daniel Bergey
4e040160e0 WIP: tests for RST roles 2014-12-12 14:45:45 +00:00
Daniel Bergey
dc3ea9840e RST reader: improve support for custom roles
- Add "sourceCode" to classes for :code: role, and anything inheriting
  from it.
- Add the name of the custom role to classes if the Inline constructor
  supports Attr.
- If the custom role directive does not specify a parent role, inherit
  from the :span: role.

This differs somewhat from the rst2xml.py behavior.  If a custom role
inherits from another custom role, Pandoc will attach both roles' names
as classes.  rst2xml.py will only use the class of the directly invoked
role (though in the case of inheriting from a :code: role with a
:language: defined, it will also provide the inherited language as a
class).
2014-12-12 14:45:45 +00:00
Daniel Bergey
dba066a33d RST: literal role should produce Code,
code role should have "code" class.

http://docutils.sourceforge.net/docs/ref/rst/roles.html says that
`text`:literal` is the same as ``text``.  docutils outputs a <literal>
element in both cases, whereas for the code role, it outputs a <literal>
element with the "code" class.
2014-12-12 14:45:44 +00:00
Daniel Bergey
15816853a3 expose warnings from RST reader; refactor
This commit moves some code which was only used for the Markdown Reader
into a generic form which can be used for any Reader.  Otherwise, it
takes naming and interface cues from the preexisting Markdown code.
2014-12-12 14:45:44 +00:00
John MacFarlane
4ffa70970d Merge pull request #1695 from bjornbm/master
Escape inline verbatim spaces in LaTeX output
2014-12-10 09:07:46 -08:00
John MacFarlane
2b1ddc2680 Merge pull request #1797 from bos/master
DocBook reader: add support for "classname", document and test "type"
2014-12-08 23:41:04 -08:00
Bryan O'Sullivan
2150903230 DocBook reader: document/test "type" as implemented 2014-12-08 23:17:27 -08:00
John MacFarlane
626cefeac3 Merge pull request #1795 from bos/master
DocBook reader: add support for calloutlist and callout
2014-12-08 23:16:30 -08:00
Bryan O'Sullivan
aaf93d8f4e Fix test suite 2014-12-08 23:16:21 -08:00
John MacFarlane
997d41636f Merge pull request #1796 from bos/threaded
Link the test suite using -threaded
2014-12-08 23:14:18 -08:00
Bryan O'Sullivan
fe1d147187 DocBook reader: add support for classname 2014-12-08 23:12:06 -08:00
Bryan O'Sullivan
dbfb2e1353 Link the test suite using -threaded
This allows the test suite to be run using "+RTS -N".

Doing so improves the performance of the test suite on my quad-core Mac laptop as follows:

Before: 8.2 seconds
After:  2.5 seconds
2014-12-08 22:42:45 -08:00
Bryan O'Sullivan
33fdb6bc15 DocBook reader: add support for calloutlist and callout
We treat a calloutlist as a bulleted list. This works well in practice.
2014-12-08 22:26:09 -08:00
Matthew Pickering
48e2586ec8 Merge pull request #1746 from shelf/dw-ext-images
DokuWiki writer: fix external images
2014-12-08 23:55:36 +00:00
John MacFarlane
dd9cb2c872 Merge pull request #1794 from mpickering/docxfix
Fix for #1641 (docx table captions above tables)
2014-12-08 15:50:39 -08:00
Matthew Pickering
4458fed972 Merge pull request #1646 from neongreen/issue1631
Add an -email address link- example to README.
2014-12-08 22:58:55 +00:00
Nikolay Yakimov
f7b265e2ff Fix for #1641 (docx table captions above tables)
Word doesn't really treat table captions as something special. It's just a paragraph with special style, nothing more, so simple reversal of output order in writer works fine.
2014-12-08 22:50:57 +00:00
Daniel Bergey
87e536b438 RST Reader: Warn about skipped directives
move `addWarning` to Parsing.hs, so it can be used by Markdown & RST readers.
2014-12-08 14:43:04 +00:00
John MacFarlane
1a130fa48e Updated INSTALL on building man pages.
Closes #1788.
2014-12-07 09:42:25 -08:00
Matthew Pickering
068bdbbc91 Merge pull request #1716 from lierdakil/issue1607-pullreq
First step to fixing internationalisation problems with docx output
2014-12-07 16:44:24 +00:00
John MacFarlane
dc16f21d98 Merge pull request #1790 from mpickering/master
Text.Pandoc.Pretty: Improve performance of realLength
2014-12-07 00:12:50 -08:00
Matthew Pickering
9761283c8f Text.Pandoc.Pretty: Improve performance of realLength
Eliminates memory usage and twofold increase in speed.
2014-12-06 22:58:40 +00:00
Matthew Pickering
ad242131b9 Merge pull request #1787 from Twinside/master
Update pandoc.cabal, Bumping JuicyPixels upper bound
2014-12-06 20:12:30 +00:00
Vincent
dffdb87bec Update pandoc.cabal, Bumping JuicyPixels upper bound 2014-12-06 15:41:34 +01:00
John MacFarlane
704cfc1e3c Merge pull request #1781 from bergey/rst
parse RST quoted literal blocks and class directives
2014-12-01 13:21:05 -08:00
Daniel Bergey
74c1b547c2 parse RST class directives
The class directive accepts one or more class names, and creates a Div
value with those classes.  If the directive has an indented body, the
body is parsed as the children of the Div.  If not, the first block
folowing the directive is made a child of the Div.

This differs from the behavior of rst2xml, which does not create a Div
element.  Instead, the specified classes are applied to each child of
the directive.  However, most Pandoc Block constructors to not take an
Attr argument, so we can't duplicate this behavior.
2014-12-01 18:22:03 +00:00
Daniel Bergey
2cdfa5eb20 parse RST quoted literal blocks
closes #65
RST quoted literal blocks are the same as indented literal blocks (which
pandoc already supports) except that the quote character is preserved in
each line.

This includes test cases for the quoted literal block, as well as
additional tests for line blocks and indented literal blocks, to verify
that these are unaffected by the changes.
2014-12-01 18:22:03 +00:00
John MacFarlane
4d296f70df ICML writer: Don't force all citations into footnotes. 2014-11-30 22:30:04 -08:00
John MacFarlane
d8fde9547e Reverted "omit blank lines after list items," better fix for #1777.
Now we do as before, including blank lines after list items in
loose lists (even though RST doesn't care -- this is just a matter
of visual appeal).  But we chomp any excess whitespace after the
last list item, which solves #1777.
2014-11-25 12:34:44 -08:00
John MacFarlane
25e2c42347 RST writer: Omit blank lines after list items.
They are optional in RST (except after the last list item,
of course).

Fixes #1777.
2014-11-25 12:24:33 -08:00
John MacFarlane
dc92a62883 RST writer: Ensure blank line after figure. 2014-11-25 12:24:14 -08:00
John MacFarlane
6c0943000d LaTeX reader: support \smartcite and \Smartcite from biblatex.
See jgm/pandoc-citeproc#26.
2014-11-25 10:03:43 -08:00
John MacFarlane
159c711675 Fixed double-rendering of footnotes in RST tables.
Closes #1769.
2014-11-19 16:20:07 -08:00
John MacFarlane
7a5cb29319 Really fix #1758. Add id="cover" to body on cover page.
Not title page!
2014-11-17 15:43:40 -08:00
John MacFarlane
91a26fcdc4 Use regular page template for nav.xhtml.
This includes the HTML doctype.

Closes #1759.
2014-11-16 21:43:05 -08:00
John MacFarlane
65db0ede88 Removed extra body tag from epub3 template.
This fixes a bug introduced by the previous fix.
2014-11-16 21:12:25 -08:00
John MacFarlane
e1d6c73327 epub, epub3 templates: Added id="cover" to body of titlepage.
This aids styling, making it possible for example to set 0 margins
on the title page.  Closes jgm/pandoc#1758.
2014-11-16 20:58:59 -08:00
John MacFarlane
4aadcd51b5 Make embed tag either block or inline.
Closes #1756.
2014-11-16 20:51:35 -08:00
John MacFarlane
9e5a8de95a Removed extra </body> tag from tests/html-reader.html. 2014-11-16 20:46:45 -08:00
John MacFarlane
333fc60684 Changed mime type for otf to application/vnd.ms-opentype.
Closes #1761.  This is needed for epub3 validation.
See http://www.idpf.org/epub/20/spec/OPF_2.0.1_draft.htm#Section2.3.1
2014-11-16 20:29:38 -08:00