aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2014-06-23Merge pull request #1366 from jkr/reducible3John MacFarlane7-276/+289
Docx rewrite and cleanup (in terms of Reducible typeclass)
2014-06-23Add test for correctly trimming spaces in formatting.Jesse Rosenthal3-0/+5
This used to be fixed in the tree-walking. We need to make sure we're doing it right now.
2014-06-23Add Reducible to cabal file.Jesse Rosenthal1-0/+1
2014-06-23Use Reducible in docx reader.Jesse Rosenthal1-273/+111
This cleans up them implementation, and cuts down on tree-walking. Anecdotally, I've seen about a 3-fold speedup.
2014-06-23Move some of the clean-up logic into List module.Jesse Rosenthal1-3/+22
This will allow us to get rid of more general functions we no longer need in the main reader.
2014-06-23Add new typeclass, ReducibleJesse Rosenthal1-0/+150
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.
2014-06-23LaTeX writer: Use `\textquotesingle` for `'` in inline code.John MacFarlane2-0/+3
Otherwise we get curly quotes in the PDF output. Closes #1364.
2014-06-23Markdown reader: Combine consecutive latex environments.John MacFarlane1-2/+4
This helps when you have two minipages which can't have blank lines between them. See #690, #1196.
2014-06-21Merge pull request #1363 from jkr/newNormalizeJohn MacFarlane6-12/+74
Improve normalization
2014-06-22Docx reader tests: add tests for normalization deep in blocks.Jesse Rosenthal3-0/+10
2014-06-22Docx reader tests: Correct normalize test.Jesse Rosenthal1-1/+1
2014-06-22Docx reader: Fix spacing in formatting.Jesse Rosenthal1-1/+1
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.
2014-06-22Add normalization test.Jesse Rosenthal3-0/+6
Add torture-test for new normalization functions. One problem that this test demonstrates is that word has a tendency to turn off formatting at a space, and then turn it back on after. I'm not sure yet whether this is something we should fix.
2014-06-22Implement new normalization.Jesse Rosenthal1-11/+57
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.
2014-06-21Fixed compiler warnings.John MacFarlane1-2/+0
2014-06-20Filters: don't print misleading error message.John MacFarlane1-4/+1
Previously pandoc would say that a filter was not found, even in a case where the filter had a syntax error.
2014-06-20Merge pull request #1361 from jkr/testNormalizeJohn MacFarlane1-2/+27
Docx reader tests: Introduce NoNormPandoc type.
2014-06-20Docx reader tests: Introduce NoNormPandoc type.Jesse Rosenthal1-2/+27
This is just a wrapper around Pandoc that doesn't normalize with `toString`. We want to make sure that our own normalization process works. If, in the future, we are able to hook into the builder's normalization, this will be removed.
2014-06-20Markdown reader: Support smallcaps through span.John MacFarlane2-1/+14
`<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.
2014-06-20MediaWiki reader: Tightened up template parsing.John MacFarlane1-0/+1
The opening "{{" must be followed by an alphanumeric or ':'. This prevents the exponential slowdown in #1033. Closes #1033.