aboutsummaryrefslogtreecommitdiff
path: root/src/Text
AgeCommit message (Collapse)AuthorFilesLines
2014-04-24Markdown writer: Use proper escapes to avoid unwanted lists.John MacFarlane1-11/+16
Previously we used 0-width spaces, an ugly hack. Closes #980.
2014-04-24Render numbers in YAML metadata without decimals when possible.John MacFarlane1-1/+6
The change to aeson > 0.7 caused numbers to be rendered with decimals. This change causes them to be rendered without decimals wehn possible.
2014-04-23EPUB writer: include extension in epub ids.John MacFarlane1-6/+11
This fixes a problem with duplicate extensions for fonts and images with the same base name but different extensions. Closes #1254.
2014-04-19Merge pull request #1256 from tarleb/org-reader-improvementsJohn MacFarlane3-224/+439
Org reader improvements
2014-04-19Org reader: Allow for compact definition listsAlbert Krewinkel1-2/+2
Use `Text.Pandoc.Shared.compactify'DL` to allow for compact definition lists.
2014-04-19Move `compactify'DL` from Markdown reader into SharedAlbert Krewinkel2-20/+17
The function `compactify'DL`, used to change the final definition item of a definition list into a `Plain` iff all other items are `Plain`s as well, is useful in many parsers and hence moved into Text.Pandoc.Shared.
2014-04-19Org reader: Fix parsing of footnotesAlbert Krewinkel1-2/+6
Footnotes can consist of multiple blocks and end only at a header or at the beginning of another footnote. This fixes the previous behavior, which restricted notes to a single paragraph.
2014-04-19Org reader: Fix distinction of images and normal linksAlbert Krewinkel1-2/+2
Fixed a false assumption about the precedence of (&&) vs (||).
2014-04-19Org reader: Apply captions to code blocks and tablesAlbert Krewinkel1-40/+94
The `Table` blocktype already takes the caption as an argument, while code blocks are wrapped in a `Div` block together with a labelling `Span`.
2014-04-18Org reader: Add support for plain LaTeX fragmentsAlbert Krewinkel1-1/+40
This adds support for LaTeX fragments like the following: ``` \begin{equation} \int fg \mathrm{d}x \end{equation} ```
2014-04-18Org reader: Fix parsing of loose listsAlbert Krewinkel1-4/+7
Loose lists (i.e. lists with blankline separated items), were parsed as multiple lists, each containing a single item. This patch fixes this issue.
2014-04-17Org reader: Support more types of '#+BEGIN_<type>' blocksAlbert Krewinkel1-7/+34
Support for standard org-blocks is improved. The parser now handles "HTML", "LATEX", "ASCII", "EXAMPLE", "QUOTE" and "VERSE" blocks in a sensible fashion.
2014-04-17Org reader: Support footnotesAlbert Krewinkel1-2/+64
2014-04-16Org reader: introduce Reader environment around Blocks/InlinesAlbert Krewinkel1-130/+176
This introduces a Reader environment in the style of Text.Pandoc.Parsing.F, but adapted to the Org reader parser.
2014-04-16Org reader: Fix code for subexpression parsingAlbert Krewinkel1-21/+4
2014-04-16Org reader: Better module description, minor style changesAlbert Krewinkel1-6/+6
Use module description analogous to the markdown reader's. Use (<$) where it makes sense.
2014-04-15Shared: Fixed bug in toRomanNumeral.John MacFarlane1-2/+2
9 and numbers ending in 9 would end with "IXIV." Thanks to Jesse Rosenthal. Closes #1249.
2014-04-13Merge pull request #1240 from neilmayhew/masterJohn MacFarlane1-3/+16
Docbook output of Line Blocks
2014-04-13Merge pull request #1239 from tarleb/org-linebreakJohn MacFarlane2-1/+5
Org linebreaks
2014-04-13Merge pull request #1238 from tarleb/org-figuresJohn MacFarlane1-8/+49
Org reader: Add support for figures
2014-04-12Org reader: Removed ANN pragma.John MacFarlane1-3/+0
This relies on Template Haskell, which causes problems in Windows due to libraries with C dependencies. We need to avoid using TH in pandoc code.
2014-04-12Improve handling of hard line breaks in Docbook writerNeil Mayhew1-3/+16
* Use a <literallayout> for the entire paragraph, not just for the newline character * Don't let LineBreaks inside footnotes influence the enclosing paragraph
2014-04-12Org reader: Read linebreaksAlbert Krewinkel1-0/+4
Linebreaks are marked by the string `\\` at the end of a line.
2014-04-12Org writer: Fix output for linebreaksAlbert Krewinkel1-1/+1
Hard linebreaks in Org mode are represented by the string "\\" as the last characters in a line. Adds this feature to the Org-mode writer.
2014-04-12Org reader: Add support for figuresAlbert Krewinkel1-8/+49
Support for figures (images with name and caption) is added.
2014-04-11HTML reader: Treat processing instructions & declarations as block.John MacFarlane1-5/+9
Previously these were treated as inline, and included in paragraph tags in HTML or DocBook output, which is generally not what is wanted. Closes #1233.
2014-04-11Org reader: Fix parsing of sub-/superscript expressionsAlbert Krewinkel1-10/+37
This fixes the org-reader's handling of sub- and superscript expressions. Simple expressions (like `2^+10`), expressions in parentheses (`a_(n+1)`) and nested sexp (like `a_(nested()parens)`) are now read correctly.
2014-04-10MediaWiki reader: Handle table rows containing just an HTML comment.John MacFarlane1-1/+2
Closes #1230.
2014-04-10Org reader: Improve code by following HLint recommendationsAlbert Krewinkel1-20/+24
HLint's recommendations for better code are applied to the Org-mode reader code.
2014-04-10Org reader: Support more inline/display math variantsAlbert Krewinkel1-2/+26
Support all of the following variants as valid ways to define inline or display math inlines: - `\[..\]` (display) - `$$..$$` (display) - `\(..\)` (inline) - `$..$` (inline) This closes #1223. Again.
2014-04-09Merge pull request #1226 from tarleb/org-emphasis-readerJohn MacFarlane1-120/+260
Org reader: Precise rules for the recognition of markup
2014-04-09Org reader: Precise rules for the recognition of markupAlbert Krewinkel1-120/+260
The inline parsers have been rewritten using the org source code as a reference. This fixes a couple of bugs related to erroneous markup recognition.
2014-04-07Textile reader: Improved link parsing.John MacFarlane1-19/+15
In particular we now pick up on attributes. Since pandoc links can't have attributes, we enclose the whole link in a span if there are attributes. Closes #1008.
2014-04-07Merge pull request #1224 from tarleb/org-mathJohn MacFarlane1-37/+53
Org reader: Read inline math, recognize definition lists
2014-04-07Org reader: Support inline math (like $E=mc^2$)Albert Krewinkel1-6/+16
Closes #1223.
2014-04-06LaTeX writer: Workaround for level 4-5 headers in quotes.John MacFarlane1-2/+14
These previously produced invalid LaTeX: `\paragraph` or `\subparagraph` in a `quote` environment. This adds an `mbox{}` in these contexts to work around the problem. See http://tex.stackexchange.com/a/169833/22451. Closes #1221.
2014-04-06LaTeX reader: handle @{} and p{length} in tabular.John MacFarlane1-2/+3
The length is not actually recorded, but at least we get a table. Closes #1180.
2014-04-06Org reader: Add support for definition listsAlbert Krewinkel1-1/+16
2014-04-06Org reader: Minor code clean-upAlbert Krewinkel1-30/+21
2014-04-05HTML reader: Updated `closes` with rules from HTML5 spec.John MacFarlane1-5/+12
2014-04-05Textile reader: Better support for attributes.John MacFarlane1-9/+12
Instead of being ignored, attributes are now parsed and included in Span inlines. The output will be a bit different from stock textile: e.g. for `*(foo)hi*`, we'll get `<em><span class="foo">hi</span></em>` instead of `<em class="foo">hi</em>`. But at least the data is not lost.
2014-04-05Textile reader: Improved treatment of HTML spans (%).John MacFarlane1-5/+1
Closes #1115.
2014-04-05Removed whitespace at ends of lines.John MacFarlane1-15/+15
2014-04-05Text.Pandoc.PDF: Ensure that temp directories deleted on Windows.John MacFarlane1-1/+4
The PDF is now read as a strict bytestring, ensuring that process ownership will be terminated, so the temp directory can be deleted. Closes #1192.
2014-04-05Org reader: Added type signature.John MacFarlane1-0/+1
2014-04-05Merge pull request #1219 from tarleb/org-imagesJohn MacFarlane1-57/+127
Org-reader: support inline images, clean-up code, fix bugs
2014-04-05Shared.openURL: Set proxy with value of http_proxy env variable.John MacFarlane1-3/+11
Note: proxies with non-root paths are not supported, because of limitations in http-conduit. Closes #1211.
2014-04-05Org reader: Support inline imagesAlbert Krewinkel1-10/+24
2014-04-05Org reader: Provide more language identifier translationsAlbert Krewinkel1-1/+8
Org-mode and Pandoc use different language identifiers, marking source code as being written in a certain programming language. This adds more translations from identifiers as used in Org to identifiers used in Pandoc. The full list of identifiers used in Org and Pandoc is available through http://orgmode.org/manual/Languages.html and `pandoc -v`, respectively.
2014-04-05Org reader: Fix parsing of nested inlinesAlbert Krewinkel1-7/+20
Text such as /*this*/ was not correctly parsed as a strong, emphasised word. This was due to the end-of-word recognition being to strict as it did not accept markup chars as part of a word. The fix involves an additional parser state field, listing the markup chars which might be parsed as part of a word.