aboutsummaryrefslogtreecommitdiff
path: root/src/Text
AgeCommit message (Collapse)AuthorFilesLines
2014-07-01Merge branch 'master' of git://github.com/jgm/pandoc into dokuwikiClare Macrae4-101/+207
2014-07-01Remove stray <div> and </div> from DokuWiki output (#386)Clare Macrae1-5/+2
2014-07-01Improved HTML Blocks in DokuWiki output (#386)Clare Macrae1-1/+1
For example, this fixes the display of a broken table, and it also fixes the various HTML horizontal rules.
2014-06-30Disable warnings about unused parameters.Clare Macrae1-2/+2
2014-06-30Docx reader: clean up parStyle processing.Jesse Rosenthal1-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-29Rewrote normalize for efficiency. (Closes #1385.)John MacFarlane1-60/+131
* 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-29Merge pull request #1386 from jkr/hanging_indentJohn MacFarlane2-15/+51
Fix hanging indent behavior
2014-06-29Docx reader: Make use of new ParIndentation info.Jesse Rosenthal1-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-29Docx reader: Add ParIndentation type to parser.Jesse Rosenthal1-5/+26
This lets us keep more information about the indentation, and act accordingly in the reader.
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 Macrae1-6/+22
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 remote-tracking branch 'jgm/master' into dokuwikiClare Macrae62-2639/+8245
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-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-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-26Require haddock-library >= 1.1 and simplify haddock reader code.John MacFarlane1-39/+1
See #1346.
2014-06-25Merge pull request #1374 from jkr/track-changes-optionsJohn MacFarlane2-3/+25
Track changes with options
2014-06-25Docx reader: Code cleanup in parse.Jesse Rosenthal1-38/+12
Remove some redundant ways of dealing with Maybe.
2014-06-25Docx reader: Make use of track-changes option.Jesse Rosenthal1-3/+16
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: 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-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-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: pass code tests.Jesse Rosenthal1-33/+47
2014-06-23Add copyright block to T.P.R.Docx.Reducible.Jesse Rosenthal1-0/+31
2014-06-23Merge pull request #1366 from jkr/reducible3John MacFarlane3-276/+283
Docx rewrite and cleanup (in terms of Reducible typeclass)
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 MacFarlane1-0/+1
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-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-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-20Markdown reader: Support smallcaps through span.John MacFarlane1-1/+6
`<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.
2014-06-20MediaWiki reader: Support --trace.John MacFarlane1-1/+10