aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc
AgeCommit message (Collapse)AuthorFilesLines
2015-05-09ImageSize: make imageSize return an Either, not a Maybe.John MacFarlane4-16/+22
This will give us better error reporting options. This is part of a fix for #1834.
2015-05-09Revert "EPUB writer: stylesheet changes. Closes #2040."John MacFarlane1-26/+18
This reverts commit 1c2951dfd9ee72e5270cb974a06098adb9178f89. See #2040. The semantics was too squishy. `--css` takes a URL, but for EPUB we need files that we can read. I prefer keeping the old system for now, with `--epub-stylesheet`.
2015-05-08EPUB writer: stylesheet changes. Closes #2040.John MacFarlane1-18/+26
* Allow `--css` to be used to specify stylesheets. * Deprecated `--epub-stylesheet` and made it a synoynym of `--css`. * If a code block with class "css" is given as contents of the `stylesheet` metadata field, use its literal code as contents of the epub stylesheet. Otherwise, treat it as a filename and read the file. * Note: `--css` and `stylesheet` in metadata are not compatible. `stylesheet` takes precedence.
2015-05-05Deal with deprecation warning in Custom.John MacFarlane1-2/+10
2015-05-05UTF8: Better handling of bare CRs in input files.John MacFarlane1-2/+8
Previously we just stripped them out; now we convert other line ending styles to LF line endings. Closes #2132.
2015-05-04SelfContained: properly handle data URIs in css urls.John MacFarlane1-32/+48
Also use a proper css parser (adds dependency on text-css). Closes #2129.
2015-05-03Make sure a closing `</div>` doesn't get included in a defn list item.John MacFarlane1-0/+1
Closes #2127.
2015-05-02LaTeX writer: Add a `\label` in `\hyperdef` for Div, Span.John MacFarlane1-2/+4
Otherwise links don't work.
2015-05-01EPUB writer: Use plain writer for metadata dc: fields.John MacFarlane1-2/+5
This gives better results when we have, e.g. multiple paragraphs. Note that tags aren't allowed in these fields. Closes #2121.
2015-05-01SelfContained: cssURLs no longer tries to fetch fragment URLs.John MacFarlane1-7/+11
The current test is: does the URL start with a `#`? Closes #2121.
2015-04-29Added woff2 to MIME typesAlfred Wechselberger1-0/+1
2015-04-29HTML reader: Allow multiple colgroups in table.John MacFarlane1-1/+1
Closes #2122.
2015-04-26EPUB writer: Remove linear=no from cover itemref.John MacFarlane1-1/+1
Closes #1609.
2015-04-26Fixed regression with lists inside defintiion lists.John MacFarlane1-1/+1
This fixes a regression (not in any released version) on things like hi : - there Closes #2098.
2015-04-26Merge pull request #2112 from lierdakil/issue2101John MacFarlane1-33/+29
Custom Writer: Set foreign encoding to UTF-8
2015-04-26Updated copyright notices to -2015. Closes #2111.John MacFarlane47-93/+93
2015-04-26Custom Writer: Set foreign encoding to UTF-8Nikolay Yakimov1-33/+29
Closes #2101, #1634 Also factored out ByteString, since it's only used as an intermediate representation.
2015-04-22LaTeX reader: recognize `\newpage` as a block command.John MacFarlane1-0/+1
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 MacFarlane1-0/+178
Added `Text.Pandoc.Writers.CommonMark`, exporting `writeCommonMark`.