aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-27Added txt2tags readerMatthew Pickering2-1/+509
http://txt2tags.org/ There are two points which currently do not match the official implementation. 1. In the official implementation lists can not be nested like the following but the reader would interpret this as a bullet list with the first item being a numbered list. ``` - + This is not a list ``` 2. The specification describes how URIs automatically becomes links. Unfortunately as is often the case, their definitiong of URI is not clear. I tried three solutions but was unsure about which to adopt. * Using isURI from Network.URI, this matches far too many strings and is therefore unsuitable * Using uri from Text.Pandoc.Shared, this doesn't match all strings that the reference implementation matches * Try to simulate the regex which is used in the native code I went with the third approach but it is not perfect, for example trailing punctuation is captured in Urls.
2014-07-26Generalised more in Parsing.hs to enable the use of custom stateMatthew Pickering2-58/+114
2014-07-25Fixed runtime error with compactify'DL on certain lists.John MacFarlane2-11/+23
Closes #1452. Added test.
2014-07-23DocBook reader: Better handle elements inside code environments.John MacFarlane3-1/+10
Of course, we can't include structure in the code block, but this way we at least preserve the text. Closes #1449.
2014-07-22Merge pull request #1444 from mpickering/masterJohn MacFarlane2-12/+22
Generalised readWith to readWithM
2014-07-22Exported runParserT and StreamMatthew Pickering2-2/+3
2014-07-22Generalised readWith to readWithMMatthew Pickering1-10/+19
2014-07-21Revert "Shared.hierarchicalize: Don't number subsections of unnumbered ↵John MacFarlane1-25/+18
sections." This reverts commit 2a46042661a088096ac54097db5cd3674438bb63.
2014-07-21Shared.hierarchicalize: Don't number subsections of unnumbered sections.John MacFarlane1-18/+25
They were previously numbered, starting from the previous numbered section, which was wrong.
2014-07-21Markdown writer: Avoid wrapping that might start a list.John MacFarlane1-1/+5
Or a blockquote or header. Closes #1013.
2014-07-20EPUB writer: Avoid excess whitespace in nav.xhtml.John MacFarlane1-1/+1
This should improve TOC view in iBooks. Closes #1392.
2014-07-20Include `lot` and `lof` variables in latex template.John MacFarlane2-5/+16
These can be set to get `\listoftables` and `\listoffigures`. Closes #1407. At this point we won't add a command line argument, because this only affects one writer. But the variables can be set at the command line with -Vlof -Vlot or in YAML metadata.
2014-07-20HTML reader: parse Div and Span elements even without `--parse-raw`.John MacFarlane2-3/+1
Closes #1434.
2014-07-20Fix behavior of `markdown_attribute` extension.John MacFarlane2-4/+17
It now works as in PHP markdown extra. Setting `markdown="1"` on an outer tag affects all contained tags until it is reversed with `markdown="0"`. Closes #1378. Added `stateMarkdownAttribute` to `ParserState`.
2014-07-20Markdown reader: Fixed small bug in HTML parsing with markdown_attribute.John MacFarlane1-3/+4
Test case: <aside markdown="1"> *hi* </aside> Previously gave: <article markdown="1"> <p><em>hi</em> </article></p>
2014-07-20Updated changelog.John MacFarlane1-1/+36
2014-07-20Markdown reader: revised definition list syntax (closes #1429).John MacFarlane5-36/+148
* This change brings pandoc's definition list syntax into alignment with that used in PHP markdown extra and multimarkdown (with the exception that pandoc is more flexible about the definition markers, allowing tildes as well as colons). * Lazily wrapped definitions are now allowed; blank space is required between list items; and the space before definition is used to determine whether it is a paragraph or a "plain" element. * For backwards compatibility, a new extension, `compact_definition_lists`, has been added that restores the behavior of pandoc 1.12.x, allowing tight definition lists with no blank space between items, and disallowing lazy wrapping.
2014-07-20readWith: reverted generalization from f201bdcb.John MacFarlane1-8/+8
We need input to be a string so we can print the offending line on an error.
2014-07-20Org reader: text adjacent to a list yields a Plain, not Para.John MacFarlane2-10/+14
This gives better results for tight lists. Closes #1437. An alternative solution would be to use Para everywhere, and never Plain. I am not sufficiently familiar with org to know which is best. Thoughts, @tarleb?
2014-07-20AsciiDoc writer: Double markers in intraword emphasis.John MacFarlane3-18/+72
Closes #1441.
2014-07-19Merge pull request #1438 from mpickering/masterJohn MacFarlane9-26/+17
Renamed readTeXMath' to avoid name conflict with texmath 0.6.7
2014-07-19Require highlighting-kate >= 0.5.8.5.John MacFarlane1-3/+3
2014-07-19Renamed readTeXMath' to avoid name conflict with texmath 0.6.7Matthew Pickering9-26/+17
Also removed deprecated readTeXMath.
2014-07-17Fixed typo in linkJohn MacFarlane1-1/+1
2014-07-17Merge pull request #1435 from bosmacs/org-babel-exportsJohn MacFarlane2-5/+87
Org reader: Respect :exports header arguments on code blocks
2014-07-17Org reader: Respect :exports header arguments on code blocksCraig S. Bosma2-5/+87
Adds support to the org reader for conditionally exporting either the code block, results block immediately following, both, or neither, depending on the value of the `:exports` header argument. If no such argument is supplied, the default org behavior (for most languages) of exporting code is used.
2014-07-16Remove unused import.John MacFarlane1-1/+0
2014-07-16Custom writers now work with `--template`.John MacFarlane2-21/+18
Removed HTML header scaffolding from data/sample.lua.
2014-07-16Updated changelog.John MacFarlane1-5/+288
2014-07-16Made Citation information available in lua custom writer.John MacFarlane2-4/+24
2014-07-16Removed redundant clause in markdown parser.John MacFarlane1-2/+1
Thanks @dubiousjim. Close #1431.
2014-07-15Merge pull request #1430 from jkr/anchor-fix-2John MacFarlane5-27/+39
Fix auto identified headers when already auto-id'ed
2014-07-16Docx Reader: Fix hdr auto-id when already auto-id.Jesse Rosenthal1-11/+19
If header anchors (bookmarks in a header paragraph) already have an auto-id, which will happen if they're generated by pandoc, we don't want to rename it twice, and thus end up with an unnecessary number at the end. So we add a state value to check if we're in a header. If we are, we don't rename the bookmark -- wait until we rename it in our header handling.
2014-07-16Docx Reader: Change state handling.Jesse Rosenthal1-16/+12
We don't need `updateDState` -- the built-in `modify` works just fine. And we redefine `withDState` to use modify.
2014-07-15HTML writer: Removed useless clause.John MacFarlane1-4/+0
2014-07-15LaTeX writer: Use \nolinkurl in email autolinks.John MacFarlane2-3/+11
This allows them to be styled using `\urlstyle{tt}`. Thanks to Ulrike Fischer for the solution.
2014-07-15EPUB writer: Keep newlines between block elements.John MacFarlane1-1/+1
This allows easier diff-ability. Closes #1424.
2014-07-15Require highlighting-kate 0.5.8.4.John MacFarlane1-3/+3
For correct highlighting of identifiers in prolog and other languages.
2014-07-15Shared.fetchItem: unescape URI encoding before reading local file.John MacFarlane1-1/+1
Close #1427.
2014-07-15Docx reader: Add testJesse Rosenthal4-0/+8
Test auto ident header anchors with pandoc-generated pandoc.
2014-07-13RTF writer: Avoid extra paragraph tags in metadata.John MacFarlane1-2/+10
Closes #1421.
2014-07-13Use raw HTML for complex block quotes.John MacFarlane2-3/+10
As far as I can see, dokuwiki markup is pretty limited in what can go in a `>` block quote: just a single line of paragraph text. (#1398)
2014-07-13DokuWiki writer: Use raw HTML for complex lists...John MacFarlane2-32/+75
as in the mediawiki writer. The dokuwiki markup isn't able to handle multiple block-level items within a list item, except in a few special cases (e.g. code blocks, and these must be started on the same line as the preceding paragraph). So we fall back to raw HTML for these. Perhaps there is a better solution. We can "fake" multiple paragraphs within list items using hard line breaks (`\\`), but we must keep everything on one line. (#1398)
2014-07-13DokuWiki writer: Normalize to collapse adjacent raw HTML blocks.John MacFarlane2-31/+1
2014-07-13DokuWiki writer: Updated tests.John MacFarlane1-51/+69
2014-07-13DokuWiki writer: More tweaks to email links. (#1398)John MacFarlane1-4/+3
2014-07-13DokuWiki writer: Use pointy brackets for email links.John MacFarlane1-0/+2
(#1398)
2014-07-13Dokuwiki writer: More idiomatic code for escaping.John MacFarlane1-2/+4
2014-07-13DokuWiki writer: More raw HTML fixes. (#1398)John MacFarlane1-2/+4
* Use uppercase HTML tags for block-level content, lowercase for inline. * Newline before closing HTML tag.
2014-07-13DokuWiki writer: Fix raw inlines and blocks.John MacFarlane1-6/+6
* mediawiki > dokuwiki * ignore raw content other than html or dokuwiki. (#1398)