aboutsummaryrefslogtreecommitdiff
path: root/src/Text
AgeCommit message (Collapse)AuthorFilesLines
2014-07-13Markdown writer: Use span with style for SmallCaps. (#1360)John MacFarlane1-1/+8
2014-07-13Markdown writer: use Span instead of (hackish) SmallCaps in plainify.John MacFarlane1-9/+10
2014-07-13EPUB writer: Use stringify instead of custom plainify.John MacFarlane1-16/+10
As far as I can tell, it does about the same thing.
2014-07-13Better comment on removeFormatting.John MacFarlane1-1/+1
2014-07-13Shared: Generalized type of removeFormatting.John MacFarlane1-1/+1
2014-07-13Merge branch 'claremacrae-dokuwiki'.John MacFarlane1-2/+4
Use removeFormatting from Shared instead of the custom unfancy function.
2014-07-13Shared: Added removeFormatting.John MacFarlane1-0/+14
API change (addition of exported function).
2014-07-13Use renderTags' for all tag rendering.John MacFarlane3-5/+5
This properly handles tags that should be self-closing. Previously `<hr/>` would appear in EPUB output as `<hr></hr>`. Closes #1420.
2014-07-12Fixed typo in module header for Asciify.John MacFarlane1-1/+1
Thanks to @dubiousjim. Closes #1419.
2014-07-12Parsing: Simplified dash and ellipsis.John MacFarlane1-40/+13
This originated with @dubiousjim's observation in #1419 that there was a typo in the definition of enDash. It returned an em dash character instead of an en dash. I thought about why this had not been noticed before, and realized that en dashes were just being parsed as regular symbols. That made me realize that, now that we no longer have dedicate EnDash, EmDash, and Ellipses inline elements, as we used to in pandoc, we no longer need to parse the unicode characters specially. This allowed a considerable simplification of the code. Partially resolves #1419.
2014-07-12Removed space at ends of lines in source.John MacFarlane12-96/+96
2014-07-12Merge pull request #1414 from mpickering/generalJohn MacFarlane6-156/+191
Improvements to Parsing.hs
2014-07-12Merge pull request #1415 from jkr/nicertypeJohn MacFarlane3-751/+739
Nicer Docx type
2014-07-12Docx Reader: Add a compatibility layer for Except.Jesse Rosenthal2-3/+30
mtl switched from ErrorT to ExceptT, but we're not sure which mtl we'll be dealing with. This should make errors work with both. The main difference (beside the name of the module and the monad transformer) is that Except doesn't require an instance of an Error Typeclass. So we define that for compatability. When we switch to a later mtl, using Control.Monad.Exception, we can just erase the instance declaration, and all should work fine.
2014-07-12Docx Reader: A nicer Docx type.Jesse Rosenthal2-751/+712
This modifies the Docx type in the parser to avoid all the extra files (Notes, numbering, etc). A reader monad keeps track of these, and applies them at the end. The reader monad is stacked with ErrorT to enable better error-handling than the old Maybes. (Note that the better error handling isn't really there yet, but it is now possible.) One long-term goal of these changes is to make it easier to write the Docx type. This should make it easier to develop a standalone docx package in the future.
2014-07-11Markdown writer: don't use braced attributes for fenced code.John MacFarlane2-3/+2
Removed `Ext_fenced_code_attributes` from `markdown_github` extensions. If this extension is not set, the first class attribute will be printed after the opening fence as a bare word. Closes #1416.
2014-07-11Removed inline fmap from Parsing.hsMatthew Pickering1-8/+8
Replaced all inline occurences of fmap with the more idiomatic (<$>).
2014-07-11Removed (>>~) functionMatthew Pickering6-22/+17
This function is equivalent to the more general (<*) which is defined in Control.Applicative. This change makes pandoc code easier to understand for those not familar with the codebase.
2014-07-11Generalised all functions in Parsing.hsMatthew Pickering1-128/+168
Before it wasn't possible to use these general combinators with the ParsecT transformer but with the more general types this is now possible.
2014-07-10HTML writer: Deactivate "incremental" inside slide speaker notes.John MacFarlane1-3/+5
Closes #1394.
2014-07-10Fixed an issue caused by e4263d306e6988dd322c895242eb818d22b9e012.John MacFarlane1-0/+5
This sets `stateInHtmlBlock` to `Just "div"` when we're parsing an HTML div. Without this fix, a closing `</div>` tag could be parsed as part of a list item rather than after the list.
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