aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2014-07-10Markdown reader: Fixed regression with intraword underscores.John MacFarlane1-10/+16
Closes #1121.
2014-07-10Markdown reader: Slight rewrite of enclosure/emphOrStrong code.John MacFarlane1-6/+8
Semantics should be the same.
2014-07-10LaTeX writer: Put table captions above tables.John MacFarlane1-3/+2
The standard seems to be captions above tables. (See http://tex.stackexchange.com/questions/3243/why-should-a-table-caption-be-placed-above-the-table)
2014-07-08DokuWiki writer: Remove broken formatting from headings (#1398)Clare Macrae1-1/+11
2014-07-08Put myself as maintainer (#1398)Clare Macrae1-1/+1
2014-07-07Merge branch 'dokuwiki' of https://github.com/claremacrae/pandoc into ↵John MacFarlane2-0/+438
claremacrae-dokuwiki
2014-07-07Revamped raw HTML block parsing in markdown.John MacFarlane1-42/+47
- We no longer include trailing spaces and newlines in the raw blocks. - We look for closing tags for elements (but without backtracking). - Each block-level tag is its own RawBlock; we no longer try to consolidate them (though `--normalize` will do so). Closes #1330.
2014-07-07EPUB writer: better handle HTML media tags.John MacFarlane1-1/+6
2014-07-07`Parsing`: Added `stateInHtmlBlock` to `ParserState`.John MacFarlane1-0/+2
This is used to keep track of the ending tag we're waiting for when we're parsing inside HTML block tags.
2014-07-07normalize: consolidate adjacent RawBlocks when possible.John MacFarlane1-0/+5
2014-07-07HTML reader: adjust `blockTags` and `eitherBlockOrInline`.John MacFarlane1-9/+13
- Added `audio` and `source` in `eitherBlockOrInline`. - Moved `video`, `svg`, `progress`, `script`, `noscript`, `svg` from `blockTags` to `eitherBlockOrInline`. - `map` and `object` were mistakenly in both lists; they have been removed from `blockTags`.
2014-07-07Merge pull request #1397 from jkr/equationsJohn MacFarlane3-12/+4894
Docx Reader: Parse Docx OMML math/equations
2014-07-04MediaWiki writer: Minor renaming of 'st' prefixed names.John MacFarlane1-31/+31
2014-07-04Little restructuralization.Matej Kollar1-9/+6
2014-07-04Move more things to Reader.Matej Kollar1-36/+29
2014-07-04HLint suggestions.Matej Kollar1-35/+34
2014-07-02DokuWiki writer: Span no longer swallows textClare Macrae1-6/+2
2014-07-02Docx Reader: Write LaTeX based on equations in word.Jesse Rosenthal1-4/+172
This is a first stab at writing out equations in LaTeX based on omml equations in Word. There are some glitches: unicode chars not known to LaTeX are silently skipped, and functions (such as `\oiiint`) not in the standard LaTeX packages are inserted, which can lead to pdf compilation errors (depending, of course, on your preamble). Adding, for example, `\usepackage[charter]{mathdesign}` to the preamble will allow you to use most of the more esoteric functions.
2014-07-02Docx Reader: Add new file, TexChar.Jesse Rosenthal1-0/+4386
This will allow us to deal with unicode characters from word equations. This part of the process will need to continue to be improved.
2014-07-02Docx Reader: Parse omml equations.Jesse Rosenthal1-8/+336
2014-07-02DokuWiki writer: Remove todos that I have already done.Clare Macrae1-2/+0
2014-07-02DokuWiki writer: Retain unknown RawBlock and RawInline textClare Macrae1-2/+2
This added \cite and \begin latex to the testuite output.
2014-07-02DokuWiki output: Implement blockquotes properly Clare Macrae1-2/+2
TODO Also implement nested blockquotes.
2014-07-02DokuWiki writer: remove unused codeClare Macrae1-25/+0
2014-07-02Use Reader.Matej Kollar1-96/+95
To avoid to pass opts explicitly around (as we do not use it very much at the moment anyway)
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