summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #1386 from jkr/hanging_indentJohn MacFarlane2014-06-29
|\ | | | | Fix hanging indent behavior
| * Docx reader: Add tests for hanging indent handline.Jesse Rosenthal2014-06-29
| | | | | | | | | | | | | | | | 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.
| * 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.
* | Merge pull request #1381 from jkr/updateDStateJohn MacFarlane2014-06-29
|\ \ | |/ |/| Docx Reader: Update state properly
| * 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.
* Merge pull request #1379 from jkr/more_auto_idJohn MacFarlane2014-06-28
|\ | | | | Docx Reader: Extend auto id behavior to all headers
| * Update docx tests to reflect new expected behaviorJesse Rosenthal2014-06-28
| | | | | | | | Now doing auto ids for all headers, so tests should reflect that.
| * 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.
* Merge pull request #1377 from jkr/monadJohn MacFarlane2014-06-28
|\ | | | | New DocxContext Monad, and rewriting anchor ids
| * Change test result to match new behavior.Jesse Rosenthal2014-06-28
| |
| * 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).
* Fixed `--filter` so it doesn't search PATH for a filter with a path.John MacFarlane2014-06-27
| | | | | 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.
* 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
| * Fix typo in README.Jesse Rosenthal2014-06-25
| |
| * Track changes tests.Jesse Rosenthal2014-06-25
| |
| * Updated README to include "--track-changes" option.Jesse Rosenthal2014-06-25
| |
| * Docx reader: Make use of track-changes option.Jesse Rosenthal2014-06-25
| |
| * Add track changes option to command line.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
| |
* | Merge pull request #1375 from jkr/cleanupJohn MacFarlane2014-06-25
|\ \ | | | | | | Docx reader: Code cleanup in parse.
| * | Docx reader: Code cleanup in parse.Jesse Rosenthal2014-06-25
|/ / | | | | | | Remove some redundant ways of dealing with Maybe.
* | Merge pull request #1372 from jkr/track-changesJohn MacFarlane2014-06-25
|\| | | | | Rudimentary track-changes support
| * Docx reader: Add tests for basic track changesJesse Rosenthal2014-06-25
| | | | | | | | | | | | | | 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.
| * 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.
* Merge pull request #1370 from jkr/fix-zero-indentJohn MacFarlane2014-06-24
|\ | | | | Docx reader: Ignore zero (or negative) indent
| * 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.
* | Merge pull request #1368 from jkr/docxCodeJohn MacFarlane2014-06-24
|\| | | | | Docx verbatim code formatting
| * 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: add failing defintion list tests.Jesse Rosenthal2014-06-24
| |
| * Docx reader: pass code tests.Jesse Rosenthal2014-06-24
| |
| * Docx reader: add failing tests for inline code and code blocks.Jesse Rosenthal2014-06-24
|/
* Merge pull request #1367 from jkr/reducible-copyrightJohn MacFarlane2014-06-23
|\ | | | | Add copyright block to T.P.R.Docx.Reducible.
| * 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)