aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers
AgeCommit message (Collapse)AuthorFilesLines
2014-11-16Make `embed` tag either block or inline.John MacFarlane1-2/+2
Closes #1756.
2014-11-13Fixed bug in org with bulleted lists:John MacFarlane1-5/+5
- a - b * c was being parsed as a list, even though an unindented `*` should make a heading. See <http://orgmode.org/manual/Plain-lists.html#fn-1>.
2014-11-13Account for external link URLs with anchorsCaleb McDaniel1-7/+10
Previously, if a URL had an anchor, such as http://johnmacfarlane.net/pandoc/README.html#synopsis the reader would incorrectly identify it as an internal link and return "#synopsis" for the link in output.
2014-11-12Merge pull request #1645 from neongreen/issue1636John MacFarlane1-2/+9
Fix 'Ext_lists_without_preceding_blankline' bug.
2014-11-05Org reader: allow empty links for gitit interopAlbert Krewinkel1-1/+5
While empty links are not allowed in Emacs org-mode, Pandoc org-mode should support them: gitit relies on empty links as they are used to create wiki links. Fixes jgm/gitit#471
2014-11-05Org reader: absolute, relative paths in linksAlbert Krewinkel1-14/+19
The org reader was to restrictive when parsing links, some relative links and links to files given as absolute paths were not recognized correctly. The org reader's link parsing function was amended to handle such cases properly. This fixes #1741
2014-10-30TWiki Reader: add new new twiki readerAlexander Sulfrian1-0/+526
2014-10-25Docx reader: fix for Issue #1692 (i18n styles)Nikolay Yakimov2-56/+130
This patch builds paragraph styles tree, then checks if paragraph has style.styleId or style/name.val matching predetermined patterns. Works with "Heading#" (name.val="heading #") for headings and "Quote"|"BlockQuote"|"BlockQuotation" (name.val="Quote"|"Block Text") for block quotes.
2014-10-20Org reader: parse LaTeX-style MathML entitiesAlbert Krewinkel1-1/+8
Org supports special symbols which can be included using LaTeX syntax, but are actually MathML entities. Examples for this are `\nbsp` (non-breaking space), `\Aacute` (the letter A with accent acute) or `\copy` (the copyright sign ©). This fixes #1657.
2014-10-18Markdown reader: allow `startnum` to work without `fancy_lists`.John MacFarlane1-2/+2
Formerly `pandoc -f markdown-fancy_lists+startnum` did not work properly.
2014-10-18Merge pull request #1680 from shelf/masterJohn MacFarlane1-7/+26
Respect indent when parsing Org bullet lists
2014-10-18Merge pull request #1700 from tarleb/org-emphasis-fixJohn MacFarlane1-5/+5
Org reader: fix rules for emphasis recognition
2014-10-18Org reader: Drop COMMENT document treesAlbert Krewinkel1-1/+26
Document trees under a header starting with the word `COMMENT` are comment trees and should not be exported. Those trees are dropped silently. This closes #1678.
2014-10-18Org reader: fix rules for emphasis recognitionAlbert Krewinkel1-5/+5
Things like `/hello,/` or `/hi'/` were falsy recognized as emphasised strings. This is wrong, as `,` and `'` are forbidden border chars and may not occur on the inner border of emphasized text. This patch enables the reader to matches the reference implementation in that it reads the above strings as plain text.
2014-10-17Fix indent issue for definition listsTimothy Humphries1-14/+25
Tidy up fix for #1650, #1698 as per comments in #1680. Fix same issue for definition lists with the same method.
2014-10-12Respect indent when parsing Org bullet listsTimothy Humphries1-2/+10
Fixes issue with top-level bullet list parsing. Previously we would use `many1 spaceChars` rather than respecting the list's indent level. We also permitted `*` bullets on unindented lists, which should unambiguously parse as `header 1`. Combined, this meant headers at a different indent level were being unwittingly slurped into preceding bullet lists, as per Issue #1650.
2014-09-27Merge pull request #1601 from jkr/windowsfixJohn MacFarlane1-1/+1
Fix path-slashes inside archive for windows
2014-09-27Org Reader: Parse multi-inline terms correctly in definition listMatthew Pickering1-1/+1
Closes #1649
2014-09-26Fix 'Ext_lists_without_preceding_blankline' bug.Artyom1-2/+9
* Fixes #1636. * Adds a test.
2014-09-25HTML Reader: Recognise <br> tags inside <pre> blocksmpickering1-1/+6
Closes #1620
2014-09-06Docx Reader: Remove header class properly in other langsJesse Rosenthal1-4/+4
When we encounter one of the polyglot header styles, we want to remove that from the par styles after we convert to a header. To do that, we have to keep track of the style name, and remove it appropriately.
2014-09-05Docx reader: Use polyglot header list.Jesse Rosenthal1-7/+7
We're just keeping a list of header formats that different languages use as their default styles. At the moment, we have English, German, Danish, and French. We can continue to add to this. This is simpler than parsing the styles file, and perhaps less error-prone, since there seems to be some variations, even within a language, of how a style file will define headers.
2014-09-05Docx Reader: Start list of polyglot section headers.Jesse Rosenthal1-0/+7
2014-09-04Org reader: Added state changing blanklines.Jesse Rosenthal1-1/+8
This allows us to emphasize at the beginning of a new paragraph (or, in general, after blank lines).
2014-09-04Docx reader: Rewrite rewriteLink to work with new headers.Jesse Rosenthal1-9/+4
There could be new top-level headers after making lists, so we have to rewrite links after that.
2014-09-04Docx reader: Single-item headers in ordered lists are headers.Jesse Rosenthal1-4/+6
When users number their headers, Word understands that as a single item enumerated list. We make the assumption that such a list is, in fact, a header.
2014-09-02Docx reader: Fix window path for image lookup.Jesse Rosenthal1-1/+1
Don't use os-sensitive "combine", since we always want the paths in our zip-archive to use forward-slashes.
2014-08-31Markdown reader: better handling of paragraph in div.John MacFarlane1-0/+7
Previously text that ended a div would be parsed as Plain unless there was a blank line before the closing div tag. Test case: <div class="first"> This is a paragraph. This is another paragraph. </div> Closes #1591.
2014-08-30Merge branch 'mime' of https://github.com/Aelve/John into Aelve-mimeJohn MacFarlane1-8/+7
Conflicts: src/Text/Pandoc/Writers/Docx.hs
2014-08-28Docx Reader: Read single para in table cell as plainJesse Rosenthal1-1/+12
This makes to docx reader's native output fit with the way the markdown reader understands its markdown output. Ie, as far as table cells go: docx -> native == docx -> native -> markdown -> native (This identity isn't true for other things outside of table cells, of course).
2014-08-26Fixed exampleLine parser to accept example lines which have indentation at ↵Calvin Beck1-1/+1
the start of the line.
2014-08-21Txt2Tags Reader: Fixed crash when reading from stdinmpickering1-3/+5
2014-08-21Txt2Tags Reader: Corrected formatting of %%mtime macrompickering1-1/+1
2014-08-21Txt2Tags Reader: Parse Meta informationmpickering1-10/+36
The header is now parsed as meta information. The first line is the `title`, the second is the `author` and third line is the `date`.
2014-08-20Txt2Tags reader: Header is now parsed only if standalone flag is setmpickering1-1/+4
2014-08-18Merge pull request #1547 from jkr/styleparseJohn MacFarlane2-36/+110
Docx reader: parsing styles
2014-08-18HTML reader: improved handling of tags that can be block or inline.John MacFarlane1-5/+13
Previously a section like this would be enclosed in a paragraph, with RawInline for the video tags (since video is a tag that can be either block or inline): <video controls="controls"> <source src="../videos/test.mp4" type="video/mp4" /> <source src="../videos/test.webm" type="video/webm" /> <p> The videos can not be played back on your system.<br/> Try viewing on Youtube (requires Internet connection): <a href="http://youtu.be/etE5urBps_w">Relative Velocity on Youtube</a>. </p> </video> This change will cause the video and source tags to be parsed as RawBlock instead, giving better output. The general change is this: when we're parsing a "plain" sequence of inlines, we don't parse anything that COULD be a block-level tag.
2014-08-17Docx reader: whitespace fix.Jesse Rosenthal1-6/+6
2014-08-17Docx reader: remove emph styles and strong styles list.Jesse Rosenthal1-6/+0
We no longer need the explicit lists since we're deriving them from the ground up.
2014-08-17Docx reader: Add "Hyperlink" to blacklisted styles.Jesse Rosenthal1-2/+2
This is the only one so far. We'll add others as they show up.
2014-08-17Docx reader: Use style resolver.Jesse Rosenthal1-23/+9
We now no longer check against explicit styles.
2014-08-17Docx Reader: Introduce function for resolving dependent run styles.Jesse Rosenthal1-0/+31
We always favor an explicit positive or negative in a style in a descendent, and only turn to the ancestor if nothing is set. We also introduce an (empty) list of styles that are black-listed. We won't check them. (Think underlines in hyperlinks).
2014-08-17Docx Parse: build a bottom-up style tree.Jesse Rosenthal1-6/+31
Two points here: (1) We're going bottom-up, from styles not based on anything, to avoid circular dependencies or any other sort of maliciousness/incompetence. And (2) each style points to its parent. That way, we don't need the whole tree to pass a style over to Docx.hs
2014-08-17Update Reader.EPUB to use `MimeType`.Artyom Kazak1-8/+7
2014-08-17Alias string and runStyle to CharStyle type.Jesse Rosenthal1-7/+10
2014-08-17Docx Style parser: Basic one now just takes a parent style.Jesse Rosenthal1-13/+15
This will make it easier to build the style map from the bottom up (to avoid any infinite references).
2014-08-17Docx reader: work with new rStyle.Jesse Rosenthal1-4/+4
Just discards info at the moment, so at least it works the same.
2014-08-17Parser: Framework for parsing styles.Jesse Rosenthal1-11/+44
We want to be able to read user-defined styles. Eventually we'll be able to figure out styles in terms of inheritance as well. The actual cascading will happen in the docx reader.
2014-08-17Docx reader: Change behavior of Super/SubscriptJesse Rosenthal2-16/+17
In docx, super- and subscript are attributes of Vertalign. It makes more sense to follow this, and have different possible values of Vertalign in runStyle. This is mainly a preparatory step for real style parsing, since it can distinguish between vertical align being explicitly turned off and it not being set. In addition, it makes parsing a bit clearer, and makes sure we don't do docx-impossible things like being simultaneously super and sub.
2014-08-16HTML reader: Parse appropriately styled span as SmallCaps.John MacFarlane1-1/+6