aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-08-09Merge pull request #1507 from mpickering/masterJohn MacFarlane2-16/+16
Images are now relative to manifest file.
2014-08-09Updated EPUB testsMatthew Pickering1-10/+10
2014-08-09EPUB Reader: Changed image paths to be relative to manifest fileMatthew Pickering1-6/+6
2014-08-09HTML writer: Don't include empty TOC items for slide shows.John MacFarlane1-0/+3
Previously creating a slide with a horizontal rule would result in an empty list item in the TOC. This patch fixes that.
2014-08-08Updated changelog.John MacFarlane1-0/+6
2014-08-08Merge branch 'newbranch' of https://github.com/mpickering/pandoc into ↵John MacFarlane3-30/+68
mpickering-newbranch Conflicts: src/Text/Pandoc/Readers/EPUB.hs
2014-08-08Added `native_divs` and `native_spans` extensions.John MacFarlane6-11/+38
This allows users to turn off the default pandoc behavior of parsing contents of div and span tags in markdown and HTML as native pandoc Div blocks and Span inlines. Setting of default epub extensions has been moved from the EPUB reader to Text.Pandoc.
2014-08-08Updated changelog.John MacFarlane1-7/+158
2014-08-08Plain writer: Use ALL CAPS for level 1 headers.John MacFarlane2-16/+19
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-08Added tests for collapseFilePathMatthew Pickering1-1/+23
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 MacFarlane2-13/+15
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 MacFarlane3-5/+26
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-08Merge pull request #1502 from jkr/streamlineMathJohn MacFarlane2-508/+305
Streamline OMML parser
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-07EPUB test renaming.John MacFarlane6-2/+4
Renamed epub test files so they're identified more clearly as epub: features.{epub,native} -> epub.features.{epub,native}, and similarly with formatting.{epub,native}. Added epub test files to cabal file, so they'll be included in the tarball.
2014-08-07HTML reader: Really ignore DOCTYPE and xml declarations.John MacFarlane3-27/+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 MacFarlane2-42/+64
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 tests: Updated test fileMatthew Pickering1-19/+19
2014-08-07EPUB Reader: Improved how images are extractedMatthew Pickering1-23/+45
2014-08-07Merge pull request #1494 from jkr/math-moduleJohn MacFarlane4-585/+657
Math module
2014-08-07Merge pull request #1495 from jkr/inline-drawingsJohn MacFarlane6-4/+30
Docx reader: Inline image fix
2014-08-07Docx reader: Test inline image code.Jesse Rosenthal4-1/+8
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 Rosenthal3-560/+15
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-06pandoc: Don't strip path off of sourceURL.John MacFarlane1-2/+1
We need this information for relative URLs! This should resolve the continuing problem noted in #750.
2014-08-06Merge pull request #1492 from jkr/nodocxenvJohn MacFarlane1-5/+3
Get rid of unused docx variable.
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 MacFarlane4-4568/+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 Rosenthal2-4387/+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-05Merge pull request #1490 from ulikoehler/masterJohn MacFarlane1-1/+2
MediaWiki reader doesn't recognize german "Bild"
2014-08-06MediaWiki reader doesn't recognize german "Bild"Uli Köhler1-1/+2