aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-07-07`Parsing`: Added `stateInHtmlBlock` to `ParserState`.John MacFarlane1-0/+2
This is used to keep track of the ending tag we're waiting for when we're parsing inside HTML block tags.
2014-07-07normalize: consolidate adjacent RawBlocks when possible.John MacFarlane1-0/+5
2014-07-07HTML reader: adjust `blockTags` and `eitherBlockOrInline`.John MacFarlane1-9/+13
- Added `audio` and `source` in `eitherBlockOrInline`. - Moved `video`, `svg`, `progress`, `script`, `noscript`, `svg` from `blockTags` to `eitherBlockOrInline`. - `map` and `object` were mistakenly in both lists; they have been removed from `blockTags`.
2014-07-07Merge pull request #1397 from jkr/equationsJohn MacFarlane4-12/+4895
Docx Reader: Parse Docx OMML math/equations
2014-07-04MediaWiki writer: Minor renaming of 'st' prefixed names.John MacFarlane1-31/+31
2014-07-04Merge pull request #1399 from xkollar/readerJohn MacFarlane1-145/+133
Modad.Reader + HLint for MediaWiki writer
2014-07-04Little restructuralization.Matej Kollar1-9/+6
2014-07-04Move more things to Reader.Matej Kollar1-36/+29
2014-07-04HLint suggestions.Matej Kollar1-35/+34
2014-07-02Revert "DokuWiki writer: Whitespace to a testsuite output file."Clare Macrae1-0/+1
This reverts commit 23d71b13e7b462229427e2437a8dd9c8f72d72f1. This is now resulting in a testsuite failure, and I can't see why it didn't do so before
2014-07-02DokuWiki writer: Span no longer swallows textClare Macrae2-7/+3
2014-07-02DokuWiki writer: Add new test showing that span swallows content.Clare Macrae3-0/+16
2014-07-02DokuWiki writer: Whitespace to a testsuite output file.Clare Macrae1-1/+0
This doesn't change the testsuite behaviour, but it does mean that all the testsuite output files are exactly identical to the output obtained by running the current pandoc.
2014-07-02Docx Reader: Write LaTeX based on equations in word.Jesse Rosenthal1-4/+172
This is a first stab at writing out equations in LaTeX based on omml equations in Word. There are some glitches: unicode chars not known to LaTeX are silently skipped, and functions (such as `\oiiint`) not in the standard LaTeX packages are inserted, which can lead to pdf compilation errors (depending, of course, on your preamble). Adding, for example, `\usepackage[charter]{mathdesign}` to the preamble will allow you to use most of the more esoteric functions.
2014-07-02Docx Reader: Add new file, TexChar.Jesse Rosenthal2-0/+4387
This will allow us to deal with unicode characters from word equations. This part of the process will need to continue to be improved.
2014-07-02Docx Reader: Parse omml equations.Jesse Rosenthal1-8/+336
2014-07-02DokuWiki writer: Remove todos that I have already done.Clare Macrae1-2/+0
2014-07-02DokuWiki writer: Retain unknown RawBlock and RawInline textClare Macrae2-4/+8
This added \cite and \begin latex to the testuite output.
2014-07-02DokuWiki output: Implement blockquotes properly Clare Macrae2-14/+14
TODO Also implement nested blockquotes.
2014-07-02DokuWiki writer: remove unused codeClare Macrae1-25/+0
2014-07-02Use Reader.Matej Kollar1-96/+95
To avoid to pass opts explicitly around (as we do not use it very much at the moment anyway)
2014-07-01Merge branch 'master' of git://github.com/jgm/pandoc into dokuwikiClare Macrae10-109/+228
2014-07-01Remove stray <div> and </div> from DokuWiki output (#386)Clare Macrae2-23/+11
2014-07-01Improved HTML Blocks in DokuWiki output (#386)Clare Macrae2-8/+15
For example, this fixes the display of a broken table, and it also fixes the various HTML horizontal rules.
2014-06-30Disable warnings about unused parameters.Clare Macrae1-2/+2
2014-06-30Filters: respect shebang if filter is executable.John MacFarlane1-2/+6
Closes #1389.
2014-06-30Merge pull request #1388 from jkr/divattrToCont-cleanupJohn MacFarlane1-45/+36
Docx reader: clean up parStyle processing.
2014-06-30Docx reader: clean up parStyle processing.Jesse Rosenthal1-45/+36
This gets rid of `divAttrToContainers`: an internal convenience function which had become pretty inconvenient. Rather than converting classes and indentations to string lists and back, we deal with the `pPr` attribute directly.
2014-06-29Rewrote normalize for efficiency. (Closes #1385.)John MacFarlane3-66/+139
* Added normalizeInlines, normalizeBlocks. * Type signature is now more narrow, `Pandoc -> Pandoc` instead of `Data a :: a -> a`. Some users may need to change their uses of `normalize` to the newly exported `normalizeInlines` or `normalizeBlocks`.
2014-06-29Merge pull request #1386 from jkr/hanging_indentJohn MacFarlane5-15/+58
Fix hanging indent behavior
2014-06-29Docx reader: Add tests for hanging indent handline.Jesse Rosenthal3-0/+7
We want to treat it as a plain paragraph if the hanging amount is greater to or equal to the left indent---i.e., if the first line has zero indentation. But we still want it to be a block quote if it starts to the right of the margin. Someone might format verse with wrapping lines with a hanging indent, for example.
2014-06-29Docx reader: Make use of new ParIndentation info.Jesse Rosenthal1-10/+25
Here, when hanging indents are greater than or equal to left indents, we don't set it to block quote. Such indents are frequently used in academic bibliographies. (Thanks to Caleb McDaniel.)
2014-06-29Docx reader: Add ParIndentation type to parser.Jesse Rosenthal1-5/+26
This lets us keep more information about the indentation, and act accordingly in the reader.
2014-06-29Merge pull request #1383 from jkr/writer-bookmark-fixJohn MacFarlane1-3/+6
Docx writer: insert bookmark tags inside <w:p> tag.
2014-06-29Docx writer: insert bookmark tags inside <w:p> tag.Jesse Rosenthal1-3/+6
This makes the header anchors in pandoc-generated ooxml match those generated by word.
2014-06-29Updated Copyright year, for consistency with MediaWiki.hsClare Macrae1-2/+2
2014-06-29Updated DokuWiki code and tests to work with latest code from jgm.Clare Macrae2-15/+25
The new code was got from inspecting changes in MediaWiki.hs This slightly changes the output of Div blocks, but I'm not convinced the original behaviour was really correct anyway. The code for handling Span does nothing for now, until I can work out the desired behaviour, and add tests for it.
2014-06-29Merge pull request #1381 from jkr/updateDStateJohn MacFarlane1-3/+8
Docx Reader: Update state properly
2014-06-29Merge remote-tracking branch 'jgm/master' into dokuwikiClare Macrae269-14621/+18085
2014-06-29Docx Reader: Update state properlyJesse Rosenthal1-3/+8
Previously, a fresh state was created for the purpose of updating. In the future, when there is more than one field in the state, this obviously won't work.
2014-06-28Merge pull request #1379 from jkr/more_auto_idJohn MacFarlane8-10/+19
Docx Reader: Extend auto id behavior to all headers
2014-06-28Update docx tests to reflect new expected behaviorJesse Rosenthal7-9/+9
Now doing auto ids for all headers, so tests should reflect that.
2014-06-28Docx Reader: All headers get auto id.Jesse Rosenthal1-1/+10
Previously, only those with an anchor got an auto id. Now, all do, which puts it in line with pandoc's markdown extension.
2014-06-28Updated to latest version of jgm/pandoc-templates - including default.dokuwikiClare Macrae1-5/+8
2014-06-28Updated to latest version of jgm/pandoc-templatesClare Macrae1-8/+5
2014-06-28Merge pull request #1377 from jkr/monadJohn MacFarlane2-144/+201
New DocxContext Monad, and rewriting anchor ids
2014-06-28Change test result to match new behavior.Jesse Rosenthal1-2/+2
2014-06-28Docx Reader: Introduce link rewriting.Jesse Rosenthal1-7/+30
2014-06-28make makeHeaderAnchors make an auto idJesse Rosenthal1-3/+7
Record relationship between original id and auto id, so we can fix links after.
2014-06-28Rewrote header generation.Jesse Rosenthal1-25/+25
In preparation for auto ids.