summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch 'master' of git://github.com/jgm/pandoc into dokuwikiClare Macrae2014-07-01
|\
| * Docx reader: clean up parStyle processing.Jesse Rosenthal2014-06-30
| | | | | | | | | | | | | | 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.
| * Rewrote normalize for efficiency. (Closes #1385.)John MacFarlane2014-06-29
| | | | | | | | | | | | | | | | * 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`.
| * Merge pull request #1386 from jkr/hanging_indentJohn MacFarlane2014-06-29
| |\ | | | | | | Fix hanging indent behavior
| | * Docx reader: Make use of new ParIndentation info.Jesse Rosenthal2014-06-29
| | | | | | | | | | | | | | | | | | 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.)
| | * Docx reader: Add ParIndentation type to parser.Jesse Rosenthal2014-06-29
| | | | | | | | | | | | | | | This lets us keep more information about the indentation, and act accordingly in the reader.
| * | Merge pull request #1383 from jkr/writer-bookmark-fixJohn MacFarlane2014-06-29
| |\ \ | | | | | | | | Docx writer: insert bookmark tags inside <w:p> tag.
| | * | Docx writer: insert bookmark tags inside <w:p> tag.Jesse Rosenthal2014-06-29
| | |/ | | | | | | | | | | | | This makes the header anchors in pandoc-generated ooxml match those generated by word.
| * / Docx Reader: Update state properlyJesse Rosenthal2014-06-29
| |/ | | | | | | | | | | 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.
* | Remove stray <div> and </div> from DokuWiki output (#386)Clare Macrae2014-07-01
| |
* | Improved HTML Blocks in DokuWiki output (#386)Clare Macrae2014-07-01
| | | | | | | | For example, this fixes the display of a broken table, and it also fixes the various HTML horizontal rules.
* | Disable warnings about unused parameters.Clare Macrae2014-06-30
| |
* | Updated Copyright year, for consistency with MediaWiki.hsClare Macrae2014-06-29
| |
* | Updated DokuWiki code and tests to work with latest code from jgm.Clare Macrae2014-06-29
| | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'jgm/master' into dokuwikiClare Macrae2014-06-29
|\|
| * Docx Reader: All headers get auto id.Jesse Rosenthal2014-06-28
| | | | | | | | | | Previously, only those with an anchor got an auto id. Now, all do, which puts it in line with pandoc's markdown extension.
| * Docx Reader: Introduce link rewriting.Jesse Rosenthal2014-06-28
| |
| * make makeHeaderAnchors make an auto idJesse Rosenthal2014-06-28
| | | | | | | | | | Record relationship between original id and auto id, so we can fix links after.
| * Rewrote header generation.Jesse Rosenthal2014-06-28
| | | | | | | | In preparation for auto ids.
| * Docx Reader: Simplify makeHeaderAnchorsJesse Rosenthal2014-06-28
| | | | | | | | | | | | Using pattern guard, in preparation for doing some more complicated stuff with it (recording header anchors, so we can change them to auto ids.)
| * Docx Reader: Clean up guardsJesse Rosenthal2014-06-28
| | | | | | | | | | Use PatternGuards to get rid of need for `isJust`, `fromJust` altogether.
| * Docx rdr: Avoid mapping makeHeaderAnchors globallyJesse Rosenthal2014-06-28
| | | | | | | | | | It only applies to headers, so we can just apply it when we make a header.
| * Move Docx reader to DocxContext monadJesse Rosenthal2014-06-28
| | | | | | | | | | | | | | This is a ReaderT State stack, which keeps track of some environment info, such as the options and the docx doc. The state will come in handy in the future, for a couple of planned features (rewriting the section anchors as auto_idents, and hopefully smart-quoting).
| * Require haddock-library >= 1.1 and simplify haddock reader code.John MacFarlane2014-06-26
| | | | | | | | See #1346.
| * Merge pull request #1374 from jkr/track-changes-optionsJohn MacFarlane2014-06-25
| |\ | | | | | | Track changes with options
| | * Docx reader: Make use of track-changes option.Jesse Rosenthal2014-06-25
| | |
| | * Add TrackChanges to Options export.Jesse Rosenthal2014-06-25
| | |
| | * Add reader option for track changes.Jesse Rosenthal2014-06-25
| | |
| | * Add TrackChanges type to options.Jesse Rosenthal2014-06-25
| | |
| * | Docx reader: Code cleanup in parse.Jesse Rosenthal2014-06-25
| |/ | | | | | | Remove some redundant ways of dealing with Maybe.
| * Docx reader: Remove unnecessary filter in Parse.Jesse Rosenthal2014-06-25
| | | | | | | | mapMaybe does the filtering for us.
| * Docx reader: Add rudimentary track changes support.Jesse Rosenthal2014-06-25
| | | | | | | | This will only read the insertions, and ignore the deletions.
| * Docx reader: Parse Insertions and Deletions.Jesse Rosenthal2014-06-25
| | | | | | | | | | This is just for the Parse module, reading it into the Docx format. It still has to be translated into pandoc.
| * Docx Reader: Add change typesJesse Rosenthal2014-06-25
| | | | | | | | Insertion and deletion. Dates are just strings for now.
| * Docx reader: Ignore zero (or negative) indentJesse Rosenthal2014-06-24
| | | | | | | | | | If a block has an indentation less than or equal to zero, it should not be treated as a block quote.
| * Docx reader: remove T.P.Generic import.Jesse Rosenthal2014-06-24
| | | | | | | | | | This marks the removal of the final tree-walk in the code. (Though there is still one in the Lists module.)
| * Docx reader: pass definition test.Jesse Rosenthal2014-06-24
| | | | | | | | | | This commit also fixes a problem with the previous code pushes, which wouldn't allow code blocks to share a div.
| * Docx reader: pass code tests.Jesse Rosenthal2014-06-24
| |
| * Add copyright block to T.P.R.Docx.Reducible.Jesse Rosenthal2014-06-23
| |
| * Merge pull request #1366 from jkr/reducible3John MacFarlane2014-06-23
| |\ | | | | | | Docx rewrite and cleanup (in terms of Reducible typeclass)
| | * Use Reducible in docx reader.Jesse Rosenthal2014-06-23
| | | | | | | | | | | | | | | This cleans up them implementation, and cuts down on tree-walking. Anecdotally, I've seen about a 3-fold speedup.
| | * Move some of the clean-up logic into List module.Jesse Rosenthal2014-06-23
| | | | | | | | | | | | | | | This will allow us to get rid of more general functions we no longer need in the main reader.
| | * Add new typeclass, ReducibleJesse Rosenthal2014-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This defines a typeclass `Reducible` which allows us to "reduce" pandoc Inlines and Blocks, like so Emph [Strong [Str "foo", Space]] <++> Strong [Emph [Str "bar"]], Str "baz"] = [Strong [Emph [Str "foo", Space, Str "bar"], Space, Str "baz"]] So adjacent formattings and strings are appropriately grouped. Another set of operators for `(Reducible a) => (Many a)` are also included.
| * | LaTeX writer: Use `\textquotesingle` for `'` in inline code.John MacFarlane2014-06-23
| | | | | | | | | | | | | | | Otherwise we get curly quotes in the PDF output. Closes #1364.
| * | Markdown reader: Combine consecutive latex environments.John MacFarlane2014-06-23
| |/ | | | | | | | | | | | | This helps when you have two minipages which can't have blank lines between them. See #690, #1196.
| * Docx reader: Fix spacing in formatting.Jesse Rosenthal2014-06-22
| | | | | | | | | | | | The normalizing tests revealed a problem with unformatted spaces, brought about by `spanTrim`. This fixes by not trimming the spaces out of spans until they are in their final form.
| * Implement new normalization.Jesse Rosenthal2014-06-22
| | | | | | | | | | | | There were some problems with the old str normalization. This fixes those problems. Also, since it drills down on its own, it only needs to be mapped over the blocks, not walked over the tree.
| * Markdown reader: Support smallcaps through span.John MacFarlane2014-06-20
| | | | | | | | | | | | | | | | `<span style="font-variant:small-caps;">foo</span>` will be parsed as a `SmallCaps` inline, and will work in all output formats that support small caps. Closes #1360.
| * MediaWiki reader: Tightened up template parsing.John MacFarlane2014-06-20
| | | | | | | | | | | | The opening "{{" must be followed by an alphanumeric or ':'. This prevents the exponential slowdown in #1033. Closes #1033.
| * MediaWiki reader: Support --trace.John MacFarlane2014-06-20
| |