aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2015-04-21Custom writer: use UTF-8 aware bytestring conversion.John MacFarlane1-7/+8
This might help with #2101.
2015-04-19Rewrote charsInBalancedBrackets.John MacFarlane1-12/+15
This version should be a bit more efficient. This doesn't help with #1735, however.
2015-04-20MD Reader: Fix links/footnotets after citationsNikolay Yakimov1-2/+16
Footnotes: check if '^' follows '[' Links: check if '[' or '(' follows ']' Shorthand links: attempt to lazily parse suffix as referenceLink
2015-04-18Revert "Merge pull request #1947 from mpickering/Fmonad"John MacFarlane4-575/+627
Closes #2062. This reverts commit c302bdcdbe97b38721015fe82403b2a8f488a702, reversing changes made to b983adf0d0cbc98d2da1e2751f46ae1f93352be6. Conflicts: src/Text/Pandoc/Parsing.hs src/Text/Pandoc/Readers/Markdown.hs src/Text/Pandoc/Readers/Org.hs src/Text/Pandoc/Readers/RST.hs
2015-04-18Markdown writer: improved escaping.John MacFarlane1-2/+3
`<` should not be escaped as `\<`, for compatibility with original Markdown. We now escape `<` and `>` with entities. Also, we now backslash-escape square brackets. Closes #2086.
2015-04-18Markdown definition lists: don't require indent for first line.John MacFarlane1-2/+4
Previously the body of the definition (after the `:` or `~` marker) needed to be in column 4. This commit relaxes that requirement, to better match the behavior of PHP Markdown Extra. So, now this is a valid definition list: foo : bar This patch also helps resolve a potentially ambiguity with table captions: foo : bar ----- table ----- Is "bar" a definition, or the caption for the table? We'll count it as a caption for the table. Closes #2087.
2015-04-17More principled fix for #1820.John MacFarlane1-5/+7
If the tag parses as a comment, we check to see if the input starts with `<!--`. If not, it's bogus comment mode and we fail htmlTag. Includes test case. Closes #1820.
2015-04-17Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into ↵John MacFarlane1-3/+3
jlduran-latex-tightlist Conflicts: data/templates
2015-04-17Merge pull request #1954 from mcmtroffaes/feature/citekey-firstchar-alphanumJohn MacFarlane1-1/+1
Allow digit as first character of a citation key.
2015-04-17Merge pull request #2079 from lierdakil/rst-normalize-headingsJohn MacFarlane1-7/+36
RST Writer: Normalize headings to sequential levels
2015-04-17Merge pull request #2092 from lierdakil/issue1909John MacFarlane2-2/+8
MD Reader: Smart apostrophe after inline math
2015-04-17Fixed `htmlTag` in HTML reader.John MacFarlane1-1/+1
Require that `<!` or `<?` be followed by nonspace. This prevents `</ div>` from being parsed as a comment. Closes #1820.
2015-04-18MD Reader: Smart `'` after inline mathNikolay Yakimov2-2/+8
Closes #1909. Adds new parser combinator to Parsing.hs `a <+?> b` : if a succeeds, applies b and mappends output (if any) to result of a. If b fails, it's just a, if a fails, whole expression fails.
2015-04-16RST Writer: treat headings in block quotes, etc as rubricsNikolay Yakimov1-7/+29
2015-04-14Docx Writer: Take TOC title from toc-title metadata fieldNikolay Yakimov1-1/+15
2015-04-13RST Writer: Normalize headings to sequential levelsNikolay Yakimov1-1/+8
This is pretty much required by docutils.
2015-04-12Fixed warning.John MacFarlane1-1/+1
2015-04-12Fixed toc depth in RST writer.John MacFarlane1-1/+1
Previously the depth was being rendered as a floating point number with a decimal point. Thanks to Nick Yakimov for noticing this.
2015-04-12Merge pull request #2072 from lierdakil/latex-reader-cleanupJohn MacFarlane1-92/+82
LaTeX Reader: Code cleanup
2015-04-12Text.Pandoc.PDF: more comprehensible errors on image conversion.John MacFarlane1-3/+3
Closes #2067. EPS can't be supported without shelling out to something like ImageMagick, but at least we can avoid mysterious error messages. We now get: pandoc: Unable to convert `circle.eps' for use with pdflatex. ! Package pdftex.def Error: File `circle-eps-converted-to.pdf' not found. which seems more straightforward.
2015-04-12LaTeX Reader: Code cleanupNikolay Yakimov1-92/+82
2015-04-12ODT Writer: Figure captionsNikolay Yakimov2-4/+13
Works pretty much the same as Word writer. Following styles are used for figures: Figure -- for figure with empty caption FigureWithCaption (based on Figure) -- for figure with caption FigureCaption (based on Caption) -- for figure captions Also, TableCaption (based on Caption) is used for table captions. We need FigureWithCaption to set keepWithNext, in order to keep caption with figure.
2015-04-07Removed redundat import.John MacFarlane1-1/+0
2015-04-07DocBook reader: look inside "info" elements for section titles.John MacFarlane1-1/+4
Closes #1931.
2015-04-07RST writer: better handling of raw latex inline.John MacFarlane1-6/+12
We use `` :raw-latex:`...` `` and add a definition for this role to the template. Closes #1961.
2015-04-07Markdown Reader: eliminate common subexpressionsJulien Cretel1-2/+5
2015-04-02EPUB writer: Take TOC title from toc-title metadata field.John MacFarlane1-2/+5
2015-04-01Added "noProof" to docx syntax highlighting SourceCode style.John MacFarlane1-0/+1
2015-03-31Merge pull request #2042 from lierdakil/issue1866John MacFarlane1-3/+13
LaTeX Reader: check for block-level newcommand aliases in blockCommand
2015-03-31Latex Reader: Block commands code cleanupNikolay Yakimov1-3/+2
2015-03-30Merge pull request #2035 from lierdakil/issue2031John MacFarlane1-0/+5
Docx Writer/Reference: Add keepNext to objects w/ captions
2015-03-29Added CommonMark writer.John MacFarlane2-0/+181
Added `Text.Pandoc.Writers.CommonMark`, exporting `writeCommonMark`.
2015-03-30Latex Reader: Guard against para starting with inline macroNikolay Yakimov1-0/+1
2015-03-30LaTeX Reader: check for block-level newcommand aliases in blockCommandNikolay Yakimov1-3/+13
2015-03-29Merge pull request #2038 from lierdakil/docx-hyphen-settingsJohn MacFarlane1-3/+26
Docx Writer: Copy hyphenation settings from reference.docx
2015-03-29Merge pull request #2037 from lierdakil/issue458John MacFarlane1-1/+29
Docx Writer: support for --toc option
2015-03-29Docx Writer: Filter out illegal XML charactersMatthew Pickering1-2/+19
Fixes #1992
2015-03-29Docx Writer: Place toc after abstract, rather than beforeNikolay Yakimov1-1/+1
2015-03-29Docx Writer: Copy hyphenation settings from reference.docxNikolay Yakimov1-3/+26
2015-03-29Docx Writer: Initial support for --toc option (issue #458)Nikolay Yakimov1-1/+29
Creates a "dirty" TOC at the beginning of document, before abstract
2015-03-29Docx Writer: Add a style to figure imagesNikolay Yakimov1-0/+5
Figures with empty captions use style "Figure" Figures with nonempty captions use style "Figure with Caption", which is based on "Figure", and additionally has keepNext set.
2015-03-28Merge branch 'master' of https://github.com/rootzlevel/pandoc into ↵John MacFarlane1-1/+1
rootzlevel-master Conflicts: src/Text/Pandoc/Readers/Org.hs
2015-03-28Updated code example in Text.Pandoc.John MacFarlane1-2/+4
2015-03-28Merge branch 'errortype' of https://github.com/mpickering/pandoc into ↵John MacFarlane22-221/+329
mpickering-errortype Conflicts: benchmark/benchmark-pandoc.hs src/Text/Pandoc/Readers/Markdown.hs src/Text/Pandoc/Readers/Org.hs src/Text/Pandoc/Readers/RST.hs tests/Tests/Readers/LaTeX.hs
2015-03-28Markdown Reader: Require nonempty value in mmd title blockNikolay Yakimov1-0/+1
`many1Till` will gobble up newline, and then whole following line will match, so I had to use guard here.
2015-03-28Markdown Reader: Req. " " after key in mmd title blockNikolay Yakimov1-1/+4
Require space after key-value delimiter colon in mmd title block. Issue #2026 Amend: parsec's `spaces` include newlines, but we don't want that. Had to make custom `spaceNoNewline` parser here
2015-03-28Markdown Reader: Disable meta exts for meta valuesNikolay Yakimov1-1/+6
Disable all metadata block extensions when parsing metadata field values. Issue #2026
2015-03-24Docx Writer: Fix StyleMapNikolay Yakimov1-18/+19
I've messed up badly with it, so it didn't work properly most of the time. At the plus side, fallback mechanic is working wonderfully.
2015-03-23Allow pipe tables with header but no body.John MacFarlane1-1/+1
Closes #2017.
2015-03-23Fix accidently usage of list monad instanceMatthew Pickering1-1/+1