Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2014-07-02 | DokuWiki writer: remove unused code | Clare Macrae | 1 | -25/+0 | |
2014-07-01 | Merge branch 'master' of git://github.com/jgm/pandoc into dokuwiki | Clare Macrae | 10 | -109/+228 | |
2014-07-01 | Remove stray <div> and </div> from DokuWiki output (#386) | Clare Macrae | 2 | -23/+11 | |
2014-07-01 | Improved HTML Blocks in DokuWiki output (#386) | Clare Macrae | 2 | -8/+15 | |
For example, this fixes the display of a broken table, and it also fixes the various HTML horizontal rules. | |||||
2014-06-30 | Disable warnings about unused parameters. | Clare Macrae | 1 | -2/+2 | |
2014-06-30 | Filters: respect shebang if filter is executable. | John MacFarlane | 1 | -2/+6 | |
Closes #1389. | |||||
2014-06-30 | Merge pull request #1388 from jkr/divattrToCont-cleanup | John MacFarlane | 1 | -45/+36 | |
Docx reader: clean up parStyle processing. | |||||
2014-06-30 | Docx reader: clean up parStyle processing. | Jesse Rosenthal | 1 | -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-29 | Rewrote normalize for efficiency. (Closes #1385.) | John MacFarlane | 3 | -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-29 | Merge pull request #1386 from jkr/hanging_indent | John MacFarlane | 5 | -15/+58 | |
Fix hanging indent behavior | |||||
2014-06-29 | Docx reader: Add tests for hanging indent handline. | Jesse Rosenthal | 3 | -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-29 | Docx reader: Make use of new ParIndentation info. | Jesse Rosenthal | 1 | -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-29 | Docx reader: Add ParIndentation type to parser. | Jesse Rosenthal | 1 | -5/+26 | |
This lets us keep more information about the indentation, and act accordingly in the reader. | |||||
2014-06-29 | Merge pull request #1383 from jkr/writer-bookmark-fix | John MacFarlane | 1 | -3/+6 | |
Docx writer: insert bookmark tags inside <w:p> tag. | |||||
2014-06-29 | Docx writer: insert bookmark tags inside <w:p> tag. | Jesse Rosenthal | 1 | -3/+6 | |
This makes the header anchors in pandoc-generated ooxml match those generated by word. | |||||
2014-06-29 | Updated Copyright year, for consistency with MediaWiki.hs | Clare Macrae | 1 | -2/+2 | |
2014-06-29 | Updated DokuWiki code and tests to work with latest code from jgm. | Clare Macrae | 2 | -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-29 | Merge pull request #1381 from jkr/updateDState | John MacFarlane | 1 | -3/+8 | |
Docx Reader: Update state properly | |||||
2014-06-29 | Merge remote-tracking branch 'jgm/master' into dokuwiki | Clare Macrae | 269 | -14621/+18085 | |
2014-06-29 | Docx Reader: Update state properly | Jesse Rosenthal | 1 | -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-28 | Merge pull request #1379 from jkr/more_auto_id | John MacFarlane | 8 | -10/+19 | |
Docx Reader: Extend auto id behavior to all headers | |||||
2014-06-28 | Update docx tests to reflect new expected behavior | Jesse Rosenthal | 7 | -9/+9 | |
Now doing auto ids for all headers, so tests should reflect that. | |||||
2014-06-28 | Docx Reader: All headers get auto id. | Jesse Rosenthal | 1 | -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-28 | Updated to latest version of jgm/pandoc-templates - including default.dokuwiki | Clare Macrae | 1 | -5/+8 | |
2014-06-28 | Updated to latest version of jgm/pandoc-templates | Clare Macrae | 1 | -8/+5 | |
2014-06-28 | Merge pull request #1377 from jkr/monad | John MacFarlane | 2 | -144/+201 | |
New DocxContext Monad, and rewriting anchor ids | |||||
2014-06-28 | Change test result to match new behavior. | Jesse Rosenthal | 1 | -2/+2 | |
2014-06-28 | Docx Reader: Introduce link rewriting. | Jesse Rosenthal | 1 | -7/+30 | |
2014-06-28 | make makeHeaderAnchors make an auto id | Jesse Rosenthal | 1 | -3/+7 | |
Record relationship between original id and auto id, so we can fix links after. | |||||
2014-06-28 | Rewrote header generation. | Jesse Rosenthal | 1 | -25/+25 | |
In preparation for auto ids. | |||||
2014-06-28 | Docx Reader: Simplify makeHeaderAnchors | Jesse Rosenthal | 1 | -8/+5 | |
Using pattern guard, in preparation for doing some more complicated stuff with it (recording header anchors, so we can change them to auto ids.) | |||||
2014-06-28 | Docx Reader: Clean up guards | Jesse Rosenthal | 1 | -9/+9 | |
Use PatternGuards to get rid of need for `isJust`, `fromJust` altogether. | |||||
2014-06-28 | Docx rdr: Avoid mapping makeHeaderAnchors globally | Jesse Rosenthal | 1 | -4/+4 | |
It only applies to headers, so we can just apply it when we make a header. | |||||
2014-06-28 | Move Docx reader to DocxContext monad | Jesse Rosenthal | 1 | -107/+140 | |
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). | |||||
2014-06-27 | Fixed `--filter` so it doesn't search PATH for a filter with a path. | John MacFarlane | 1 | -1/+3 | |
This fixed a bug wherein `--filter ./caps.py` would run `caps.py` from the system path, even if there was a `caps.py` in the working directory. | |||||
2014-06-26 | Require haddock-library >= 1.1 and simplify haddock reader code. | John MacFarlane | 2 | -40/+2 | |
See #1346. | |||||
2014-06-25 | Merge pull request #1374 from jkr/track-changes-options | John MacFarlane | 11 | -7/+85 | |
Track changes with options | |||||
2014-06-25 | Merge pull request #1375 from jkr/cleanup | John MacFarlane | 1 | -38/+12 | |
Docx reader: Code cleanup in parse. | |||||
2014-06-25 | Docx reader: Code cleanup in parse. | Jesse Rosenthal | 1 | -38/+12 | |
Remove some redundant ways of dealing with Maybe. | |||||
2014-06-25 | Fix typo in README. | Jesse Rosenthal | 1 | -2/+2 | |
2014-06-25 | Track changes tests. | Jesse Rosenthal | 7 | -4/+32 | |
2014-06-25 | Updated README to include "--track-changes" option. | Jesse Rosenthal | 1 | -0/+11 | |
2014-06-25 | Merge pull request #1372 from jkr/track-changes | John MacFarlane | 7 | -9/+39 | |
Rudimentary track-changes support | |||||
2014-06-25 | Docx reader: Make use of track-changes option. | Jesse Rosenthal | 1 | -3/+16 | |
2014-06-25 | Add track changes option to command line. | Jesse Rosenthal | 1 | -0/+17 | |
2014-06-25 | Add TrackChanges to Options export. | Jesse Rosenthal | 1 | -0/+1 | |
2014-06-25 | Add reader option for track changes. | Jesse Rosenthal | 1 | -0/+2 | |
2014-06-25 | Add TrackChanges type to options. | Jesse Rosenthal | 1 | -0/+6 | |
2014-06-25 | Docx reader: Add tests for basic track changes | Jesse Rosenthal | 5 | -0/+12 | |
This is what seems like the sensible default: read in insertions, and ignore deletions. In the future, it would be good if options were available for either taking in deletions or keeping both in some scriptable format. | |||||
2014-06-25 | Docx reader: Remove unnecessary filter in Parse. | Jesse Rosenthal | 1 | -7/+2 | |
mapMaybe does the filtering for us. |