Commit graph

806 commits

Author SHA1 Message Date
John MacFarlane
a6dcae1648 Merge commit 'd25656571a4662a4e67b195daed69e77d80c4c2c'
Conflicts:
	src/Text/Pandoc/Writers/ODT.hs
2012-08-23 19:39:58 -07:00
John MacFarlane
d7e658c643 Don't strip meta and link elements in epub metadata.
Per
http://idpf.org/epub/30/spec/epub30-publications.html#sec-metadata-elem,
a metadata element can contain not just Dublin Core elements but also
meta and link elements, but Pandoc currently strips those out.

Patch from aberrancy. Closes #589.
2012-08-23 19:09:56 -07:00
John MacFarlane
dc8e5970bf Implemented Ext_backtick_code_blocks.
This is the variant github prefers.
2012-08-21 20:11:10 -07:00
John MacFarlane
dc6a133dbf Added Ext_fenced_code_attributes. 2012-08-21 19:35:36 -07:00
John MacFarlane
b985d33406 Changed nomenclature, delimited -> fenced code blocks. 2012-08-21 19:21:51 -07:00
John MacFarlane
5d3b295568 Man writer: Escape - as \-.
Unescaped -'s become hyphens, while \-'s are left as ascii
minus signs.  That is preferable for use with command-line
options.

See  http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html.
Thanks to Andrea Bolognani for bringing the issue to our
attention.
2012-08-18 10:29:15 -07:00
John MacFarlane
fd616665ac Docx line breaks: Use w:cr in w:r instead of w:br.
This seems to fix a problem viewing pandoc-generated
docx files in LibreOffice.
2012-08-17 18:27:48 -07:00
John MacFarlane
e8e8468d69 Implemented Ext_mmd_title_block in markdown reader & writer. 2012-08-12 19:27:13 -07:00
John MacFarlane
5d83751af4 Implemented tex_math extensions in markdown writer. 2012-08-11 22:24:06 -07:00
John MacFarlane
e520762543 Implemented Ext_markdown_attribute in markdown writer. 2012-08-11 22:04:37 -07:00
John MacFarlane
a740de0508 Use safeRead instead of using reads directly (various modules). 2012-08-09 08:11:28 -07:00
John MacFarlane
dfa4b76630 Changes to literate haskell options.
- Removed writerLiterateHaskell from WriterOptions.
- Removed readerLiterateHaskell from ReaderOptions.
- Added Ext_literate_haskell to Extensions.  Test for this
  instead of the above.
- Removed failUnlessLHS from Shared.

Note:  At this point, +lhs and .lhs extension no longer has any effect.
Need to fix.
2012-08-08 23:18:19 -07:00
John MacFarlane
dc071f807d Markdown writer: Tables now sensitive to table extension options.
Ext_simple_table, Ext_multiline_tables, Ext_pipe_tables.
Simple tables are preferred over pipe tables when both are
enabled.  If no appropriate table style is available,
a raw HTML table is used.

So far there is no option for output of grid tables.
2012-08-05 10:23:30 -07:00
John MacFarlane
437b9ec5a4 Started making markdown table writer sensitive to options.
So far incomplete.
2012-08-05 00:02:08 -07:00
John MacFarlane
3f913c0cc5 Don't include empty captions in figures.
Closes #581.
2012-08-04 11:34:01 -07:00
John MacFarlane
64f1d68d4e Don't use escaped line breaks in plain output. 2012-08-02 22:22:52 -07:00
John MacFarlane
b6ab2d3cb8 Made markdown writer sensitive to Ext_subscript/superscript/strikeout.
HTML is used if these are disabled.
2012-08-02 21:40:54 -07:00
John MacFarlane
aef0f1d7c7 Made markdown writer sensitive to Ext_definition_lists.
IF not set, definition lists will be rendered as regular
paragraphs, with the term set off by a line break.
2012-08-02 21:35:02 -07:00
John MacFarlane
03b1ba546f Made markdown writer sensitive to Ext_startnum, Ext_fancy_lists. 2012-08-02 21:20:31 -07:00
John MacFarlane
d21304bab0 Made markdown reader sensitive to Ext_raw_tex. 2012-08-02 21:14:43 -07:00
John MacFarlane
214fef9e27 Made markdown writer sensitive to Ext_table_captions. 2012-08-02 21:07:40 -07:00
John MacFarlane
b98049ee6c Made markdown writer sensitive to Ext_pandoc_title_blocks. 2012-08-02 21:03:54 -07:00
John MacFarlane
1d7fd8012d Made markdown writer sensitive to Ext_footnotes.
If footnotes not enabled, footnotes are formatted like normal
markdown paragraphs, with a marker like [3].
2012-08-02 21:00:02 -07:00
John MacFarlane
b98219773b Replaced writerStrict with writerExtensions in WriterOptions.
Still have not implemented individual tests for all the extensions
in the markdown writer.
2012-07-27 09:18:51 -07:00
John MacFarlane
00dc1e715e Moved WriterOptions and associated types Shared -> Options. 2012-07-26 22:59:56 -07:00
John MacFarlane
6d7f0a1b81 Fixed whitespace errors. 2012-07-26 22:32:53 -07:00
John MacFarlane
308436996e Use catch from Control.Exception to avoid warnings. 2012-07-24 19:38:16 -07:00
John MacFarlane
999edd9608 Changed signatures of writeODT, writeDocx, writeEPUB.
These now take WriterOptions and Pandoc only.
The extra parameters for epub stylesheet, epub fonts,
reference Docx, and reference ODT have been removed, since
these things are now in WriterOptions.

Note:  breaking API change!
2012-07-24 09:56:00 -07:00
Sergey Astanin
436a585c3b FB2: support images embedded as data URIs + tests. 2012-07-22 11:13:14 -07:00
Sergey Astanin
b39597a910 Added a new FictionBook2 (FB2) writer. 2012-07-22 11:13:14 -07:00
John MacFarlane
2c30c48757 Use Parser as type synonym for Parsec. 2012-07-20 15:54:57 -07:00
John MacFarlane
5085962c28 Text.Pandoc.Parsing: Export all Parsec functions used in pandoc code.
No other module directly imports Parsec.  This will make it easier
to change the parsing backend in the future, if we want to.
2012-07-20 14:41:44 -07:00
John MacFarlane
a4c28ead79 Use Text.Parsec instead of Text.ParserCombinators.Parsec. 2012-07-20 14:19:06 -07:00
Arlo O'Keeffe
d25656571a Set ODT title property 2012-07-13 15:19:39 -06:00
John MacFarlane
6442e185b3 HTML writer: Put mathjax in span with class "math".
Closes #562.
2012-07-11 16:54:13 -07:00
John MacFarlane
7da913dbd7 ConTeXt writer: don't escape &,^,<,>.
Simplified escapes for `}` and `{` to `\{` and `\}`.

Thanks to Aditya Mahajan.
2012-06-27 15:05:13 -07:00
John MacFarlane
d320c2eac5 MediaWiki writer: Avoid extra blank lines after sublists.
Thanks to Gavin Beatty.
2012-06-27 14:46:46 -07:00
John MacFarlane
e9f6366af7 Don't escape _ as \letterunderscore{} in ConTeXt. 2012-06-26 19:50:52 -07:00
John MacFarlane
527be1ddf2 Don't generate empty H1 after hrule slide breaks.
We now use a slide-level header with contents [Str "\0"] to mark
an hrule break.  This avoids creation of an empty H1 in these
contexts.

Closes #484.
2012-06-25 14:52:09 -07:00
John MacFarlane
34fac208d2 Fixed --incremental behavior for Beamer.
When `--incremental` is used, lists inside block quotes should
appear all at once (as in HTML).
2012-06-03 09:14:09 -07:00
John MacFarlane
5669dc2a47 Simplified bullet characters so they work with Word 2007.
Closes #520.
2012-06-01 18:44:00 -07:00
John MacFarlane
e14712dabd LaTeX writer: Ensure newline after Verbatim at end of footnote.
This fixes a regression. Also added a test for this.
2012-06-01 10:50:22 -07:00
John MacFarlane
4834865653 Escape % as \letterpercent{} not \letterpercent in ConTeXt. 2012-05-31 19:15:42 -07:00
John MacFarlane
81be8fbf77 Merge pull request #521 from jonassmedegaard/master
Slidy lang support, and new Slideous writer
2012-05-30 18:21:26 -07:00
John MacFarlane
91e9d904b5 Org writer: Add space before language name.
Closes #523.
2012-05-29 16:27:19 -07:00
John MacFarlane
3b4e4de52b ConTeXt writer: ensure space after \stopformula. 2012-05-29 12:43:11 -07:00
Jonas Smedegaard
61f8dd4da8 Add support for Slideous output. 2012-05-24 10:31:18 +02:00
John MacFarlane
79a17ef9b9 Markdown Use a nonzero space to prevent false recognition of list marker.
This addresses #516, but in a rather hackish way.  There ought to
be a better solution.
2012-05-19 17:44:15 -07:00
John MacFarlane
4991852edb Markdown writer: Improved definition lists.
* Use `:` form instead of `~`, for better compatibility with other
  markdown implementations.

* Don't wrap the term, because it breaks definition lists.
2012-05-16 13:07:58 -07:00
John MacFarlane
4e35c67c23 LaTeX writer: More consistent interblock spacing. 2012-05-14 07:04:47 -07:00