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

5741 commits

This branch
This branch
All branches
Author SHA1 Message Date
John MacFarlane
19b744191f Fixed Makefile tab 2014-12-16 17:27:39 -08:00
John MacFarlane
658f01f072 Added bindist target to Makefile. 
This creates a binary package with a standalone executable and
man pages.
 2014-12-16 13:58:34 -08:00
John MacFarlane
7e41d0b1ee LaTeX reader: parse math environments as inline when possible. 
Closes #1821.
 2014-12-16 12:27:04 -08:00
John MacFarlane
fcd1599b09 FB2 writer: Add newline to output. 2014-12-15 22:14:29 -08:00
John MacFarlane
4c03231e9b getDefaultTemplate: don't fail when called with "fb2". 
Closes #1660.
 2014-12-15 22:10:03 -08:00
John MacFarlane
08abbc4604 LaTeX writer: Handle consecutive linebreaks. 
Closes #1733.
 2014-12-15 22:04:18 -08:00
John MacFarlane
58ea1ce5f1 LaTeX reader: parse label after caption into a span... 
instead of inserting an additional paragraph of bracketed text.
Closes #1747.
 2014-12-15 21:50:10 -08:00
John MacFarlane
0eb3f8cff2 HTML writer: put newline btw img and caption paragraph. 2014-12-15 21:49:16 -08:00
John MacFarlane
9ea7164d81 Reworded paragraph on citation data in README. 
Closes #1814.
 2014-12-15 21:20:27 -08:00
John MacFarlane
61d2c2e8cb LaTeX writer: better handling of display math in simple tables. 
We convert display math to inline math in simple tables,
since LaTeX can't deal with display math in simple tables.

Closes #1754.
 2014-12-15 21:14:07 -08:00
John MacFarlane
cb8bb4705f EPUB writer: include "landmarks" section in nav document for epub3. 
Closes #1757.
 2014-12-15 20:56:03 -08:00
John MacFarlane
8a3363a269 Merge branch 'patch-1' of https://github.com/Wikiwide/pandoc into Wikiwide-patch-1 
Conflicts:
	src/Text/Pandoc/Readers/LaTeX.hs
 2014-12-15 20:27:42 -08:00
John MacFarlane
d5c7d66735 Merge pull request #1803 from mpickering/bugfixes 
Bugfixes
 2014-12-15 20:15:25 -08:00
Matthew Pickering
e6bd29e9b8 Text.Pandoc.Writers.RTF: Add blankline at end of output 
Closes #1732
 2014-12-15 21:35:47 +00:00
Matthew Pickering
a17f6f2f39 Text.Pandoc.Readers.HTML: Retain display type of MathML output 
Closes #1719
 2014-12-15 21:35:47 +00:00
Matthew Pickering
58e4e4a608 Text.Pandoc.Parsing: Change parseFromString to fail if not all input is 
consumed.
 2014-12-15 21:35:46 +00:00
John MacFarlane
a5cac0a0c4 Don't treat a citation as a reference link label. 
Closes #1763.
 2014-12-15 10:54:12 -08:00
John MacFarlane
9bf76fa5a2 LaTeX reader: better handling of \noindent and \greektext. 
Closes #1783.
 2014-12-15 10:34:59 -08:00
John MacFarlane
c37db57c9a EPUB writer: Removed playOrder from navpoint elements in ncx file. 
These aren't required, and they make manual modification of epubs
difficult.  Closes #1760.
 2014-12-15 10:22:19 -08:00
John MacFarlane
47c360e079 Improved texorpdfstring patch #1148. 
* Make LaTeX reader recognize texorpdfstring.
* Don't use texorpdfstring unless it's actually needed.
* Fix tests.
 2014-12-15 10:06:03 -08:00
John MacFarlane
544f3e5b45 Merge branch 'use-texorpdfstring' of https://github.com/wilx/pandoc into wilx-use-texorpdfstring 
Conflicts:
	src/Text/Pandoc/Writers/LaTeX.hs
	tests/Tests/Writers/LaTeX.hs
 2014-12-15 10:01:50 -08:00
John MacFarlane
d009646de7 Added a note about the need for -s to include YAML in Markdown output. 
Closes #1715. Thanks to @nichtich for the suggestion.
 2014-12-15 09:20:03 -08:00
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