Commit graph

1811 commits

Author SHA1 Message Date
John MacFarlane
4c74b7aaab Parsing: Much faster new version of anyLine.
Not only faster but uses less memory.
2013-01-25 15:32:10 -08:00
John MacFarlane
fe337b07f7 Use hsb2hs preprocessor instead of TH for embed_data_files.
This should work on Windows, unlike the TH solution with
file-embed.
2013-01-23 19:26:39 -08:00
John MacFarlane
9c299d282f Added Text.Pandoc.Data (non-exported) if embed_data_files selected.
This module just exports the association list of embedded data files,
which is used by Shared.
2013-01-23 19:26:39 -08:00
John MacFarlane
7a0062a8d5 Fixed regressions in fenced code blocks.
*   Tilde code fences can again take bare language.

    So

        ~~~ haskell

    is okay, not just

        ~~~ {.haskell}

*   Backtick code blocks can take the bracketed attributes.
*   Backtick code blocks don't require a language.
*   Consolidated code for the two kinds of fenced code blocks.

Closes #722.
2013-01-23 13:21:53 -08:00
John MacFarlane
d52a1ec18f Another fix to the CPP macro in EPUB writer. 2013-01-22 08:48:43 -08:00
John MacFarlane
294df9deed Fixed MIN_VERSION - need to sub _ for - in blaze-html. 2013-01-22 08:32:33 -08:00
John MacFarlane
7415462dc9 Markdown reader: Try lhsCodeBlock before rawTeXBlock.
Otherwise \begin{code}...\end{code} isn't handled
properly in markdown+lhs.

Thanks to Daniel Miot for noticing the bug and
suggesting the fix.
2013-01-21 21:36:31 -08:00
Jens Petersen
88d0ca8ea7 EPUB: condition Blaze Utf8 module name import on blaze-html version
blaze-html/blaze-markup-0.5 has Text.Blaze.Html.Renderer.Utf8
whereas blaze-html-0.4 has Text.Blaze.Renderer.Utf8.
So this needs to be conditional on the version for pandoc
still be with blaze-html-0.4.x
2013-01-22 10:27:34 +09:00
John MacFarlane
26d30d6d38 Use proportional font for email autolinks with obfuscation.
Closes #714.
2013-01-21 11:28:35 -08:00
John MacFarlane
af84953781 Markdown reader: Fixed bug with headerless grid tables.
The 1.10 code assumed that each table header cell contains
exactly one block. That failed for headerless tables (0) and also
for tables with multiple blocks in a header cell.

The code is fixed and tests provided. Thanks to Andrew Lee for
pointing out the bug.
2013-01-21 09:52:24 -08:00
John MacFarlane
c4b93bc3e7 Fixed bug in uri parser.
The bug prevented an autolink at the end of a string (e.g.
at the end of a line block line) from counting as a link.

Closes #711.
2013-01-20 20:23:50 -08:00
John MacFarlane
9cc1cf1f40 Fixed bug with escaped % in LaTeX reader.
Also added tests.  Closes #710.
2013-01-20 19:21:13 -08:00
John MacFarlane
4ed82686e4 Add data-cites field to citations in HTML5.
This contains a space-separated list of citation IDs.
2013-01-18 12:16:12 -08:00
John MacFarlane
8eab759a9c RTF writer: Added writeRTFWithEmbeddedImages.
* RTF writer:  Export writeRTFWithEmbeddedImages instead of
  rtfEmbedImage.
* Text.Pandoc: Use writeRTFWithEmbeddedImages for RTF.
* Moved code for embedding images in RTF out of pandoc.hs.
2013-01-18 10:33:37 -08:00
John MacFarlane
4aea26e8e1 Convert highlighting-kate language to listings language
if --listings is used.

Closes #704.
2013-01-17 19:47:03 -08:00
John MacFarlane
820a9143e7 MIME: Support vs and fs as text/plain.
These are used in revealjs css.
2013-01-17 11:40:14 -08:00
John MacFarlane
054283d12f Revert "Markdown reader: Be less restrictive about class attributes."
This reverts commit b158b3fb21.
2013-01-17 11:24:45 -08:00
John MacFarlane
b158b3fb21 Markdown reader: Be less restrictive about class attributes.
This allows attributes like `C++`.  Any nonspace and non-}.
2013-01-16 15:35:51 -08:00
John MacFarlane
31fa80fdcb Fixed problem with duplicate ids in epub. 2013-01-16 12:16:49 -08:00
John MacFarlane
49820d5b51 Implemented Ext_link_attributes in markdown reader.
Also simplified source URL and link title parsers.
2013-01-16 11:25:17 -08:00
John MacFarlane
7194107733 Implemented Ext_mmd_header_identifiers in markdown writer. 2013-01-16 09:20:48 -08:00
John MacFarlane
4926645578 Implemented Ext_mmd_header_identifiers in markdown reader. 2013-01-16 09:17:20 -08:00
John MacFarlane
923204d553 Options: Added multimarkdownExtensions.
Also added 'markdown_mmd' as input/output option.
2013-01-16 08:52:54 -08:00
John MacFarlane
fa71969e81 LaTeX writer: Prevent paragraphs containing only linebreaks or spaces. 2013-01-15 23:02:08 -08:00
John MacFarlane
eebed6bc48 Added writerHtmlQTags and --html-q-tags option.
The previous default was to use `<q>` tags in HTML5.
But `<q>` tags are also valid HTML4, and they are not very
robust in HTML5.  Some user agents don't support them,
and some CSS resets prevent pandoc's quotes CSS from working
properly (e.g. bootstrap).  It seems a better default just
to insert quote characters, but the option is provided  for
those who have gotten used to using `<q>` tags.
2013-01-15 18:50:36 -08:00
John MacFarlane
bf3a911a1c Changed Ext_autolink_urls -> Ext_autolink_bare_uris.
Added tests.
2013-01-15 12:44:50 -08:00
John MacFarlane
5971721ec1 Case-insensitive parsing of URI schemes. 2013-01-15 11:48:21 -08:00
John MacFarlane
95c02f6b57 Parsing: Improve oneOfStrings, export oneOfStringsCI.
oneOfStrings will now take the longest match it can in a
list of strings, so if 'foo' and 'foobar' are both included,
'foobar' will match even if 'foo' is first in the list.
2013-01-15 11:47:35 -08:00
John MacFarlane
e0e36ce543 Revised URI parser.
* It no longer uses Network.URIs URI parser, which is too restrictive
  (not allowing unicode URIs unless encoded).
* It allows many more schemes.
* It better handles punctuation so as to avoid capturing trailing
  punctuation in bare URLs.
2013-01-15 10:52:02 -08:00
John MacFarlane
7bc37e4414 Use 'fig:' instead of '\SOH' in title to indicate figure.
Revises 1a4b47e933
2013-01-15 08:46:09 -08:00
John MacFarlane
1a4b47e933 Implemented Ext_implicit_figures.
* In markdown reader, add a '\1' character to the beginning
  of the title of an image that is alone in its paragraph,
  if implicit_figures extension is selected.
* In writers, check for Para [Image alt (src,'\1':tit)] and treat
  it as a figure if possible.
* Updated tests.

This is a bit of a hack, but it allows us to make implicit_figures
an extension of the markdown reader, rather than the writers.
2013-01-14 20:53:08 -08:00
John MacFarlane
56aa257ddb Removed some cruft. 2013-01-14 20:18:53 -08:00
John MacFarlane
51e0bd277a Parsing: Fixed uri -- escape unicode URLs.
Otherwise Network.URI.parseURI fails on e.g. Chinese
URLs.  Changed an incorrect test in markdown-reader-more.
2013-01-14 17:38:34 -08:00
John MacFarlane
0ef24d1518 Added Ext_implicit_figures.
No code to hook this in yet.
2013-01-14 17:08:56 -08:00
John MacFarlane
127851ea61 Parsing: Simplified and improved singleQuoteStart.
This makes 's', 'l', etc. parse properly.
Formerly we had some English-centric heuristics, but they
are no longer needed now that we keep track of the last
'Str' position in state.

Closes #698.
2013-01-14 16:06:45 -08:00
John MacFarlane
45895b561f RST writer: Fixes bug with links with duplicate text.
We now (a) use anonymous links for links with inline URLs, and
(b) use an inline link instead of a reference link if the
reference link would require a label that has already been
used for a different link.

Closes #511.
2013-01-13 23:00:05 -08:00
John MacFarlane
f191aa4a98 RST writer: Properly handle images with no alt text.
Closes #678.
2013-01-13 20:24:34 -08:00
John MacFarlane
6b5302e063 Markdown reader: Support RST-style line blocks.
This depends on the new Ext_line_blocks extension.
2013-01-13 12:34:18 -08:00
John MacFarlane
0598cf0fee Moved lineBlockLines to Parsing.
This will be used by both RST and markdown readers.
2013-01-13 11:39:32 -08:00
John MacFarlane
b92b8e8a3d RST reader: Refactored line block parser. 2013-01-13 11:29:00 -08:00
John MacFarlane
a2c93c5a33 RST writer: Allow soft breaks w continuations in line blocks. 2013-01-13 11:15:51 -08:00
John MacFarlane
5c067bb457 RST reader: Line block improvements.
* Use nonbreaking spaces for initial indent (otherwise lost in HTML and
  LaTeX).
* Allow multiple paragraphs in a single line block.
2013-01-13 11:15:31 -08:00
John MacFarlane
5ecadd7bfa Use line block in RST writer when a paragraph contains linebreaks.
Previously linebreaks weren't supported in RST, since RST
has no native linebreak construct.
2013-01-13 09:25:56 -08:00
John MacFarlane
15829d5c3a Markdown writer: Support Ext_auto_identifiers and Ext_header_attributes. 2013-01-12 22:44:01 -08:00
John MacFarlane
c8022f0419 HTML reader: Added html5 tags to list of block-level tags. 2013-01-12 12:23:15 -08:00
John MacFarlane
70e308f2f9 Escape | as \vert in LaTeX math.
This avoids a clash with highlighting-kate's macros, which
redefine | as a short verbatim delimiter.  Thanks to
Björn Peemöller for raising this issue.
2013-01-12 10:21:19 -08:00
John MacFarlane
f07ce6fead Changed hspace in last commit to 0.333em.
This seems to match the spacing of ~ exactly.
2013-01-11 20:44:39 -08:00
John MacFarlane
c29a1942d0 LaTeX writer: Use \hspace* for nonbreaking space after line break.
Since `~` spaces after a line break are just ignored.
Closes #687.
2013-01-11 20:40:00 -08:00
John MacFarlane
98bc0d17ab Revised EPUB writer given changes in header attributes.
We need to ensure that all headers have attributes, since
this is no longer guaranteed by hierarchicalize.
Explicitly given headers remain the same.
2013-01-11 17:07:25 -08:00
John MacFarlane
f3f3638f21 EPUB writer: Download images at URLs. 2013-01-11 17:07:04 -08:00