aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-04-20Merge pull request #2099 from RyanGlScott/masterJohn MacFarlane1-1/+1
Bump zlib upper version bounds
2015-04-20Bump zlib upper version boundsRyanGlScott1-1/+1
2015-04-20Merge pull request #2095 from pombreda/patch-1John MacFarlane1-1/+1
Fixed typo in URL for dzslides
2015-04-20Added license & copyright for lua to COPYRIGHT.John MacFarlane1-0/+24
Closes #2096.
2015-04-20Fixed typo in URL for dzslidesPhilippe Ombredanne1-1/+1
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-19Merge pull request #2090 from lierdakil/issue2083John MacFarlane2-2/+57
Fix for #2083 (citation suffix clashes with links and footnotes)
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-20MD Reader: Tests for links/footnotes after citationsNikolay Yakimov1-0/+41
In-text citation suffix clashes with links and footnotes
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-18Added test case for #2062.John MacFarlane1-0/+3
2015-04-18Markdown writer: improved escaping.John MacFarlane4-19/+20
`<` 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-18Merge pull request #2093 from gbataille/genericTypoJohn MacFarlane1-1/+1
Typo on Text.Pandoc.Generic
2015-04-18Markdown definition lists: don't require indent for first line.John MacFarlane2-2/+7
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-18Typo on Text.Pandoc.GenericGrégory Bataille1-1/+1
2015-04-17More principled fix for #1820.John MacFarlane2-5/+10
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 'jlduran-latex-tightlist'John MacFarlane6-40/+45
2015-04-17Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into ↵John MacFarlane6-40/+45
jlduran-latex-tightlist Conflicts: data/templates
2015-04-17Merge pull request #1954 from mcmtroffaes/feature/citekey-firstchar-alphanumJohn MacFarlane3-2/+24
Allow digit as first character of a citation key.
2015-04-17Merge pull request #2079 from lierdakil/rst-normalize-headingsJohn MacFarlane4-7/+118
RST Writer: Normalize headings to sequential levels
2015-04-17Merge pull request #2088 from AndreasLoow/masterJohn MacFarlane1-31/+31
Various minor formatting and consistency fixes for the README
2015-04-17Merge pull request #2092 from lierdakil/issue1909John MacFarlane3-2/+11
MD Reader: Smart apostrophe after inline math
2015-04-17LaTeX template: redefine `\paragraph`, `\subparagraph`...John MacFarlane4-6/+25
to behave more like section headers. Closes #1658.
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-18MD Reader: Test for smart `'` after inline mathNikolay Yakimov1-0/+3
2015-04-16Various minor formatting and consistency fixes for the program options.Andreas Lööw1-25/+25
2015-04-16Minor, fixed a Markdown error that caused formatting problems.Andreas Lööw1-6/+6
2015-04-16RST Writer: Tests for rubrics and heading normalizationNikolay Yakimov3-0/+82
2015-04-16RST Writer: treat headings in block quotes, etc as rubricsNikolay Yakimov1-7/+29
2015-04-15Updated changelog for 1.13.2.1 release.John MacFarlane1-0/+7
2015-04-14Document `toc-title` variable in README.John MacFarlane1-0/+3
See #2081.
2015-04-14Merge pull request #2081 from lierdakil/docx-content-titleJohn MacFarlane1-1/+15
Docx Writer: Take TOC title from toc-title metadata field
2015-04-14Docx Writer: Take TOC title from toc-title metadata fieldNikolay Yakimov1-1/+15
2015-04-13Bump texmath lower bound to 0.8.1John MacFarlane1-1/+1
2015-04-13RST Writer: Normalize headings to sequential levelsNikolay Yakimov1-1/+8
This is pretty much required by docutils.
2015-04-13Merge pull request #2078 from nickbart1980/patch-2John MacFarlane1-6/+10
Adds YAML biblio format
2015-04-13LaTeX template: include grffile together with graphicx.John MacFarlane3-9/+9
This properly handles filenames containing spaces and dots. Closes #2074.
2015-04-13Adds YAML biblio formatnickbart19801-6/+10
Also, adds note on pandoc-citeproc --bib2json and pandoc-citeproc --bib2yaml, and sorts table
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 MacFarlane2-92/+92
LaTeX Reader: Code cleanup
2015-04-12OpenDocument template: use `text:p` instead of `text:h` for title.John MacFarlane2-6/+9
Using `text:h` causes problems with numbering. Closes #2059. Thansk to @nkalvi for diagnosing this.
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-13LaTeX Reader: Test for `^^` character escapesNikolay Yakimov1-0/+10
2015-04-12LaTeX Reader: Code cleanupNikolay Yakimov1-92/+82
2015-04-11Merge pull request #2070 from lierdakil/odt-image-captionsJohn MacFarlane5-9/+35
ODT Writer: Figure captions
2015-04-12ODT Writer: Figure captions - Tests updateNikolay Yakimov2-5/+6
2015-04-12ODT Writer: Figure captionsNikolay Yakimov3-4/+29
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-10Merge pull request #2064 from nickbart1980/patch-1John MacFarlane1-23/+29
Fix obsolete reference to mods2yaml