aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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.
2014-06-28Docx Reader: Simplify makeHeaderAnchorsJesse Rosenthal1-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-28Docx Reader: Clean up guardsJesse Rosenthal1-9/+9
Use PatternGuards to get rid of need for `isJust`, `fromJust` altogether.
2014-06-28Docx rdr: Avoid mapping makeHeaderAnchors globallyJesse Rosenthal1-4/+4
It only applies to headers, so we can just apply it when we make a header.
2014-06-28Move Docx reader to DocxContext monadJesse Rosenthal1-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-27Fixed `--filter` so it doesn't search PATH for a filter with a path.John MacFarlane1-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-26Require haddock-library >= 1.1 and simplify haddock reader code.John MacFarlane2-40/+2
See #1346.
2014-06-25Merge pull request #1374 from jkr/track-changes-optionsJohn MacFarlane11-7/+85
Track changes with options
2014-06-25Merge pull request #1375 from jkr/cleanupJohn MacFarlane1-38/+12
Docx reader: Code cleanup in parse.
2014-06-25Docx reader: Code cleanup in parse.Jesse Rosenthal1-38/+12
Remove some redundant ways of dealing with Maybe.
2014-06-25Fix typo in README.Jesse Rosenthal1-2/+2
2014-06-25Track changes tests.Jesse Rosenthal7-4/+32
2014-06-25Updated README to include "--track-changes" option.Jesse Rosenthal1-0/+11
2014-06-25Merge pull request #1372 from jkr/track-changesJohn MacFarlane7-9/+39
Rudimentary track-changes support
2014-06-25Docx reader: Make use of track-changes option.Jesse Rosenthal1-3/+16
2014-06-25Add track changes option to command line.Jesse Rosenthal1-0/+17
2014-06-25Add TrackChanges to Options export.Jesse Rosenthal1-0/+1
2014-06-25Add reader option for track changes.Jesse Rosenthal1-0/+2
2014-06-25Add TrackChanges type to options.Jesse Rosenthal1-0/+6
2014-06-25Docx reader: Add tests for basic track changesJesse Rosenthal5-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-25Docx reader: Remove unnecessary filter in Parse.Jesse Rosenthal1-7/+2
mapMaybe does the filtering for us.
2014-06-25Docx reader: Add rudimentary track changes support.Jesse Rosenthal1-0/+3
This will only read the insertions, and ignore the deletions.
2014-06-25Docx reader: Parse Insertions and Deletions.Jesse Rosenthal1-1/+17
This is just for the Parse module, reading it into the Docx format. It still has to be translated into pandoc.
2014-06-25Docx Reader: Add change typesJesse Rosenthal1-1/+5
Insertion and deletion. Dates are just strings for now.
2014-06-24Merge pull request #1370 from jkr/fix-zero-indentJohn MacFarlane1-5/+8
Docx reader: Ignore zero (or negative) indent
2014-06-24Docx reader: Ignore zero (or negative) indentJesse Rosenthal1-5/+8
If a block has an indentation less than or equal to zero, it should not be treated as a block quote.
2014-06-24Merge pull request #1368 from jkr/docxCodeJohn MacFarlane8-39/+81
Docx verbatim code formatting
2014-06-24Docx reader: remove T.P.Generic import.Jesse Rosenthal1-1/+0
This marks the removal of the final tree-walk in the code. (Though there is still one in the Lists module.)
2014-06-24Docx reader: pass definition test.Jesse Rosenthal1-8/+13
This commit also fixes a problem with the previous code pushes, which wouldn't allow code blocks to share a div.
2014-06-24Docx Reader: add failing defintion list tests.Jesse Rosenthal3-0/+11
2014-06-24Docx reader: pass code tests.Jesse Rosenthal1-33/+47
2014-06-24Docx reader: add failing tests for inline code and code blocks.Jesse Rosenthal5-0/+13
2014-06-23Merge pull request #1367 from jkr/reducible-copyrightJohn MacFarlane1-0/+31
Add copyright block to T.P.R.Docx.Reducible.
2014-06-23Add copyright block to T.P.R.Docx.Reducible.Jesse Rosenthal1-0/+31
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 08:31:28 +0000