aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-07-01ZimWiki writer: removed commented out code that confused Haddock.John MacFarlane1-8/+8
See https://travis-ci.org/jgm/pandoc/jobs/141542247
2016-07-01Added ZimWiki format to documentation and cabal description.Alex Ivkin2-13/+19
2016-06-30Added Zim Wiki writer, template and tests.Alex Ivkin7-6/+1057
2016-07-01Docx writer: set paragraph to FirstPara after display mathJesse Rosenthal1-0/+1
We treat display math like block quotes, and apply FirstParagraph style to paragraphs that follow them. These can be styled as the user wishes. (But, when the user is using indentation, this allows for paragraphs to continue after display math without indentation.)
2016-07-01Writers: treat SoftBreak as space for strippingJesse Rosenthal1-0/+1
In Writers.Shared, we strip leading and trailing spaces for display math. Since SoftBreak's are treated as spaces, we should strip those too.
2016-06-29LaTeX reader: fixed `\cite` so it is a NormalCitation not AuthorInText.John MacFarlane3-4/+4
2016-06-26Merge pull request #3001 from tarleb/org-figure-labelJohn MacFarlane2-32/+47
Org reader: support figure labels
2016-06-26Include table of contents in README.html in Windows package.John MacFarlane2-2/+2
2016-06-26Org reader: support figure labelsAlbert Krewinkel2-32/+47
Figure labels given as `#+LABEL: thelabel` are used as the ID of the respective image. This allows e.g. the LaTeX to add proper `\label` markup. This fixes half of #2496 and #2999.
2016-06-25Textile reader: Fix overly aggressive interpretation as images.John MacFarlane1-7/+4
Spaces are not allowed in the image URL in textile. Closes #2998.
2016-06-25Added `secnumdepth` variable to LaTeX template.John MacFarlane2-22/+8
Closes #2920.
2016-06-25Fixed RST links with no explicit link text.John MacFarlane3-1/+7
The link `<foo>`_ should have `foo` as both its link text and its URL. See RST spec at <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#embedded-uris-and-aliases> "The reference text may also be omitted, in which case the URI will be duplicated for use as the reference text. This is useful for relative URIs where the address or file name is also the desired reference text: See `<a_named_relative_link>`_ or `<an_anonymous_relative_link>`__ for details." Closes Debian #828167 -- reported by Christian Heller.
2016-06-24Make --webtex work with the Markdown writer.John MacFarlane2-12/+19
Closes #1177. This is a convenient option for people using websites whose Markdown flavors don't provide for math.
2016-06-24Added texmath 0.8.6.4 to windows/stack.yaml.John MacFarlane1-0/+1
2016-06-23Process markdown extensions on command line in L->R order.John MacFarlane1-1/+1
Previously they were processed, very unintuitively, in R->L order, so that `markdown-tex_math_dollars+tex_math_dollars` had `tex_math_dollars` disabled. Closes #2995.
2016-06-23Improved Windows installer - don't ignore properties set on command-line.John MacFarlane1-2/+5
See #2708. Needs testing to see if this resolves the issue. Thanks to @nkalvi.
2016-06-23Textile reader: fixed attributes.John MacFarlane3-2/+10
Attributes can't be followed by a space. So, _(class)emph_ but _(noclass) emph_ Closes #2984.
2016-06-23Markdown writer: use raw HTML for simple, pipe tables with linebreaks.John MacFarlane1-1/+5
Markdown line breaks involve a newline, and simple and pipe tables can't contain one. Closes #2993.
2016-06-23README: update to include track-changes comments.Jesse Rosenthal1-5/+7
2016-06-23Docx reader: add tests for commentsJesse Rosenthal5-0/+32
We test for comments, using all track-changes options. Note that we should only output comments if `--track-changes=all`. We also test for emitting warnings if there is complicated formatting.
2016-06-23Docx reader tests: Add tests for warnings.Jesse Rosenthal1-0/+13
We test to see if we emit any warnings.
2016-06-23Docx reader: Add warning for advanced comment formatting.Jesse Rosenthal1-2/+18
We can't guarantee we'll convert every comment correctly, though we'll do the best we can. This warns if the comment includes something other than Para or Plain.
2016-06-23docx reader: enable warnings in top-level readerJesse Rosenthal1-6/+10
Previously we had only allowed for warnings in the parser. Now we allow for them in the `Docx.hs` as well. The warnings are simply concatenated.
2016-06-23Docx reader: add simple comment functionality.Jesse Rosenthal2-1/+73
This adds simple track-changes comment parsing to the docx reader. It is turned on with `--track-changes=all`. All comments are converted to inlines, which can list some information. In the future a warning will be added for comments with formatting that seems like it will be excessively denatured. Note that comments can extend across blocks. For that reason there are two spans: `comment-start` and `comment-end`. `comment-start` will contain the comment. `comment-end` will always be empty. The two will be associated by a numeric id.
2016-06-23Shared: Add BlockQuote to blocksToInlinesJesse Rosenthal1-0/+1
2016-06-23Shared: introduce blocksToInlines functionJesse Rosenthal1-0/+37
This is a lossy function for converting `[Block] -> [Inline]`. Its main use, at the moment, is for docx comments, which can contain arbitrary blocks (except for footnotes), but which will be converted to spans. This is, at the moment, pretty useless for everything but the basic `Para` and `Plain` comments. It can be improved, but the docx reader should probably emit a warning if the comment contains more than this.
2016-06-22Merge pull request #2992 from tarleb/org-partial-functionsJohn MacFarlane2-19/+21
Org reader: remove partial functions
2016-06-22HTML writer: Better support for raw LaTeX environments.John MacFarlane1-12/+41
Previously we just passed all raw TeX through when MathJax was used for HTML math. This passed through too much. With this patch, only raw LaTeX environments that MathJax can handle get passed through. This patch also causes raw LaTeX environments to be treated as math, when possible, with MathML and WebTeX output. Closes #2758.
2016-06-22Update texmath lower bound.John MacFarlane2-1/+2
2016-06-21Org reader: remove partial functionsAlbert Krewinkel2-19/+21
Partial functions like `head` lead to avoidable errors and should be avoided. They are replaced with total functions. This fixes #2991.
2016-06-20Implement RawInline and RawBlock in sample lua custom writer.John MacFarlane1-0/+12
Closes #2985.
2016-06-20Changed email-obfuscation default to no obfuscation.John MacFarlane4-15/+5
- `writerEmailObfuscation` in `defaultWriterOptions` is now `NoObfuscation` - the default for the command-line `--email-obfuscation` option is now `none`. Closes #2988.
2016-06-14Merge pull request #2979 from tarleb/doc-updateJohn MacFarlane1-21/+22
Documentation updates
2016-06-14Merge pull request #2980 from tarleb/org-raw-inlinesJohn MacFarlane3-4/+17
Org reader: raw inlines in arbitrary formats
2016-06-14Merge pull request #2981 from felixonmars/patch-1John MacFarlane1-1/+1
Allow tagsoup 0.14
2016-06-14Allow tagsoup 0.14Felix Yan1-1/+1
Building with the new release went fine here, and it works correctly.
2016-06-14Document Org mode as a format containing raw HTMLAlbert Krewinkel1-4/+4
Raw HTML is kept when the output format is Emacs Org mode.
2016-06-13Org reader: support arbitrary raw inlinesAlbert Krewinkel2-1/+13
Org mode allows arbitrary raw inlines ("export snippets" in Emacs parlance) to be included as `@@format:raw foreign format text@@`. Support for this features is added to the Org reader.
2016-06-13Org writer: support arbitrary raw inlinesAlbert Krewinkel1-3/+4
Org mode allows arbitrary raw inlines ("export snippets" in Emacs parlance) to be included as `@@format:raw foreign format text@@`. Support for this features is added to the Org writer.
2016-06-12Document Org mode as a format containing raw TeXAlbert Krewinkel1-5/+5
Raw TeX is kept verbatim when the output format is Emacs Org mode.
2016-06-12Document MultiMarkdown as input/output formatAlbert Krewinkel1-12/+13
MultiMarkdown was only mentioned as a supported Markdown dialect but not as a possible input or output format. A brief mention is added everywhere the other supported markdown dialects are mentioned. This closes #2973.
2016-06-07trypandoc: call results 'html' instead of 'result'.John MacFarlane2-2/+2
This is for better compatibility with babelmark2.
2016-06-07Merge pull request #2968 from IvoBCD/docbook5-xlink-nsJohn MacFarlane1-1/+1
Docbook writer: Declare xlink namespace in Docbook5 output
2016-06-07latex template: fix for obscure hyperref/xelatex issue.John MacFarlane5-15/+29
Here's a minimal case: \documentclass[]{article} \usepackage{hyperref} \begin{document} \section{\%á} \end{document} Without this change, this fails on the second invocation of xelatex. See https://tex.stackexchange.com/questions/313266/and-non-ascii-characters-in-headings This affects inputs this like # %á with pdf output via xelatex.
2016-06-07Docbook writer: Declare xlink namespace in Docbook5 outputIvo Clarysse1-1/+1
2016-06-05Merge pull request #2964 from tarleb/org-berkeley-refJohn MacFarlane3-8/+177
Org reader: "Berkeley style" citation support
2016-06-05Org reader: add support for "Berkeley-style" citesAlbert Krewinkel3-7/+176
A specification for an official Org-mode citation syntax was drafted by Richard Lawrence and enhanced with the help of others on the orgmode mailing list. Basic support for this citation style is added to the reader. This closes #1978.
2016-06-05Org reader: add semicolon to list of special charsAlbert Krewinkel1-1/+1
Semicolons are used as special characters in citations syntax. This ensures the correct parsing of Pandoc-style citations: [prefix; @key; suffix] Previously, parsing would have failed unless there was a space or other special character as the last <prefix> character.
2016-06-04Use pandoc-citeproc-0.10 in binary pkgs.John MacFarlane3-3/+3
2016-06-04Removed -rtsopts from library stanza.John MacFarlane1-2/+2
It has no effect, and Hackage wouldn't accept the package.