aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc
AgeCommit message (Collapse)AuthorFilesLines
2014-08-08EPUB Reader: Improved robustness of image extractionMatthew Pickering1-7/+9
We now maintain the invariant that when fetchImages is called, all images have absolute paths. This patch fixes several bugs relating to this as there are three places where images can be introduced. (1) During the HTML parse (2) As spine elements (3) As a cover image For (1), the paths are corrected by the transformation renameImages For (2) and (3), we need to append the "root" to the path we parse from the spine
2014-08-08EPUB Reader: Fixed regressions in image extractionMatthew Pickering1-7/+7
Before the images were relative to the position of the package file. The collapse function changed this so that they were then absolute in the archive but the fetchImages function wasn't updated to recognise this.
2014-08-08EPUB Reader: Use collapseFilePathMatthew Pickering1-14/+3
2014-08-08Shared: Added collapseFilePath functionMatthew Pickering1-1/+26
This function removes intermediate "." and ".." from a path.
2014-08-08EPUB Reader: Removed incorrectly set reader flagMatthew Pickering1-5/+9
2014-08-08Merge pull request #1503 from jkr/streamlineMathJohn MacFarlane3-12/+24
OMath parser: Change signature of exported function.
2014-08-08Markdown writer: Respect -raw_html.John MacFarlane1-12/+14
pandoc -t markdown-raw_html should not emit any raw HTML, even span and div tags that go with pandoc Span and Div elements. Cleaned up a bit of the logic with extensions and plain.
2014-08-08OMath parser: Change signature of exported function.Jesse Rosenthal3-12/+24
This changes the signature of the exported `readOMML` to `String -> Either String [Exp]`, so it can now, in theory, be slotted into TeXMath. It doesn't have any real error reporting yet, but that might make more sense once I put it in a branch, and understand how it works in the other readers. It also now reads strings that parse to either oMath or oMathPara elements. Note that the distinction is lost in the output. It's up to the caller to remember the display type.
2014-08-08Textile reader: fixed list parsing bug. Closes #1500.John MacFarlane1-5/+16
2014-08-08Textile reader: don't allow inline formatting to extend over newline.John MacFarlane1-1/+2
This matches behavior of RedCarpet, avoids some ugly bugs, and improves performance.
2014-08-08OMath: Finish initial cleanup.Jesse Rosenthal2-536/+54
This gets rid of commented-out functions, cleans up whitespace errors, and exports and imports the correct functions.
2014-08-08OMath: Remove NamespacesJesse Rosenthal2-287/+290
We still need to test against prefixes, but this is only going to look at oMath fragments, so we're not going to be worried about looking up the real namespace.
2014-08-08OMath: Start phasing out internal OMath type.Jesse Rosenthal1-0/+276
This is the first step in removing the intermediate OMath type, which we no longer need since we're writing straight to TeXMath Exp.
2014-08-08OMath parser: don't group expressions if there's only one.Jesse Rosenthal1-3/+3
2014-08-08HTML EPUB exts: switch element can now be in either the inline or block positionMatthew Pickering1-9/+10
2014-08-07HTML reader: Really ignore DOCTYPE and xml declarations.John MacFarlane1-2/+2
This actually does what d71b013841f3c9c8c595591e312a31df16a728cb said it did. Revised epub tests to remove the repeated DOCTYPE and xml tags.
2014-08-07Merge pull request #1488 from mpickering/epubfixesJohn MacFarlane1-23/+45
EPUB Reader: Improved image extraction
2014-08-07Merge pull request #1496 from mpickering/masterJohn MacFarlane1-0/+2
Org Writer: Write anchor elements
2014-08-08Org Writer: Write anchor elementsMatthew Pickering1-0/+2
The Org Writer now writes empty span elements which have an id as an anchor. For example `Span ("uid", [], []) []` becomes `<<uid>>`
2014-08-07EPUB Reader: Improved how images are extractedMatthew Pickering1-23/+45
2014-08-07Merge pull request #1494 from jkr/math-moduleJohn MacFarlane3-585/+656
Math module
2014-08-07Docx reader: Handle inline drawings.Jesse Rosenthal2-3/+22
Previous drawings that were under some other toplevel run (i.e., a hyperlink) wouldn't be properly handled. This should fix that.
2014-08-07OMath module: Add new file.Jesse Rosenthal1-0/+622
2014-08-07Docx reader: Split math out into math module.Jesse Rosenthal2-560/+14
Could use some cleanup, but this is the first step for getting an OMML reader into TeXMath.
2014-08-06Docx Reader: Added Default instances and removed withDStateMatthew Pickering1-28/+23
Signed-off-by: Jesse Rosenthal <jrosenthal@jhu.edu>
2014-08-06Get rid of unused docx variable.Jesse Rosenthal1-5/+3
Since changing the Docx type, this is no longer necessary. Thanks to Matthew Pickering for picking up on this.
2014-08-06Merge pull request #1491 from jkr/texmath-equationsJohn MacFarlane3-4567/+320
Docx Reader: Use TeXMath for writing equations.
2014-08-06Docx reader: remove now-unnecessary state variable.Jesse Rosenthal1-4/+2
This also introduces a `defaultDState` value.
2014-08-06Remove now-unnecessary TexCharJesse Rosenthal1-4386/+0
TeXMath does the work now.
2014-08-06Add a note on how `mapD` works.Jesse Rosenthal1-0/+3
2014-08-06Docx reader: Use TeXMath to write mathJesse Rosenthal2-177/+315
The new version of TeXMath can translate from its type system into LaTeX. So instead of writing the LaTeX ourself, we write to the TeXMath `Exp` type, and let TeXMath do the rest.
2014-08-06MediaWiki reader doesn't recognize german "Bild"Uli Köhler1-1/+2
2014-08-05MediaBag: Improved normalisation when writing filesMatthew Pickering1-1/+1
2014-08-04Merge pull request #1486 from Aelve/minorJohn MacFarlane12-69/+71
Very minor cleanup and readability changes
2014-08-04Merge pull request #1476 from jkr/endnote-fixJohn MacFarlane1-2/+2
Docx Parser: Produce endnotes.
2014-08-04HTML reader: ignore <?xml..> and <DOCTYPE..> tags.John MacFarlane1-1/+1
Previously they were parsed as raw.
2014-08-04Use texmath 0.7 interface.John MacFarlane8-24/+32
2014-08-04Add PatternGuards pragmas.Artyom Kazak4-3/+6
2014-08-04Remove redundant isHexDigit function.Artyom Kazak1-4/+1
2014-08-04Remove dangling `where` from one function.Artyom Kazak1-1/+0
2014-08-04Use `stripPrefix` where appropriate.Artyom Kazak9-54/+57
2014-08-04Clean up `mediaTypeOf` a bit.Artyom Kazak1-6/+6
2014-08-04Use `mapM_` instead of `() <$ mapM` in one place.Artyom Kazak1-1/+1
2014-08-04Merge branch 'epubend' of https://github.com/mpickering/pandoc into ↵John MacFarlane4-33/+501
mpickering-epubend Conflicts: pandoc.cabal
2014-08-03Correctly implement capitalisation.Artyom Kazak3-15/+19
Using `map toUpper` to capitalise text is wrong, as e.g. “Straße” should be converted to “STRASSE”, which is 1 character longer. This commit adds a `capitalize` function and replaces 2 identical implementations in different modules (`toCaps` and `capitalize`) with it.
2014-08-02SelfContained: Fixed determining of source URL from within CSS files.John MacFarlane1-2/+9
(This fixes a bug introduced a couple commits back.)
2014-08-02fetchItem: improved mime type guessing.John MacFarlane1-4/+5
Strip a fragment like `?#iefix` from the extension before doing the mime lookup.
2014-08-02Shared: fetchItem improvements.John MacFarlane1-11/+12
* More consistent logic: absolute URIs are fetched from the net; other things are treated as relative URIs if sourceURL is a Just, otherwise as file paths. * We escape characters that are not allowed in URIs before trying to parse them (e.g. '|', which often occurs in the wild). * When treating relative paths as local file paths, we drop any fragment or query. This is useful e.g. when you've downloaded web fonts locally, but your source still contains the original relative URLs. Together with the previous commit, this should close #1477.
2014-08-02Text.Pandoc.SelfContained changes.John MacFarlane2-59/+28
* mkSelfContained now takes just two arguments, WriterOptions and the string. * It no longer looks in data files. This only made sense when we had copies of slidy and S5 code there. * Shared.fetchItem' is used instead of the nearly duplicate getItem.
2014-08-01Docx Parser: Produce endnotes.Jesse Rosenthal1-2/+2
The parser had been changing footnotes and endnotes into footnotes. This isn't a problem, because pandoc collapses them, but the parser should maintain as much of the docx structure as is collapsed, and let the toplevel reader worry about how to translate it into Pandoc. (This would be an issue when, as is planned, the docx parser spins off into its own module.) The output is the same, so no test change is required.