aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-01Merge pull request #1207 from mpickering/htmlinlinesJohn MacFarlane10-391/+446
Fix #1162, #1175 and rewrite textile and HTML backend to use the builder
2014-04-01Tests updated to reflect changes to readers.Matthew Pickering5-124/+132
Previously normalisation was handled by the `normalizeSpaces` function. The behavoir of the builder monoid is slightly different and melds together more items such as consecutive strings and spaces adjacent to line breaks. The tests have been changed to reflect this. All relevant tests passed when the string melding line of the builder monoid was commented out.
2014-04-01Changed the smart punctuation parser to return Inlines rather than an Inline ↵Matthew Pickering4-27/+24
element and updated files accordingly
2014-04-01Converted HTML reader to use builder. Fixes #1162.Matthew Pickering1-109/+126
2014-04-01Bugfix for #1175 and convert textile reader to use builder.Matthew Pickering1-134/+167
The reader did not correctly parse inline markup. The behavoir is now as follows. (a) The markup must start at the start of a line, be inside previous inline markup or be preceeded by whitespace. (b) The markup can not span across paragraphs (delimited by \n\n) (c) The markup can not be followed by a alphanumeric character. (d) Square brackets can be placed around the markup to avoid having to have white space before it. In order to make these changes it was either necessary to convert the parser to return a list of inlines or to convert the whole reader to use the builder. The latter approach whilst more work makes a bit more sense as it becomes easy to arbitarily append and prepend elements without changing the type. Tests are accordingly updated in a later commit to reflect the different normalisation behavoir specified by the builder monoid.
2014-03-31Make --toc-depth work well with books in latex/pdf output.John MacFarlane1-2/+2
Closes #1210.
2014-03-30Markdown writer: Use longer backtick fences if needed.John MacFarlane1-1/+5
If the content contains a backtick fence and there are attributes, make sure longer fences are used to delimit the code. Note: This works well in pandoc, but github markdown is more limited, and will interpret the first string of three or more backticks as ending the code block. Closes #1206.
2014-03-25LaTeX reader: Better handling of figure and table with caption.John MacFarlane1-11/+34
We now look for a \caption inside the environment; if one is found, it is attached to the graphic or tabular found there. Closes #1204.
2014-03-25Parsing: Added stateCaption.John MacFarlane1-1/+2
This is primarily for use in the LaTeX reader, so far.
2014-03-25Revert "LaTeX reader: Added LPState."John MacFarlane1-18/+0
This reverts commit 82ddec698e782fef83dcd1b1fba79cd3b698c717.
2014-03-25LaTeX reader: Added LPState.John MacFarlane1-0/+18
Plan is to use this instead of ParserState in LP.
2014-03-25Parsing: Added HasMacros, simplified other typeclasses.John MacFarlane2-30/+24
Removed updateHeaderMap, setHeaderMap, getHeaderMap, updateIdentifierList, setIdentifierList, getIdentifierList.
2014-03-25Whitespace change, and note:John MacFarlane1-0/+1
Contrary to the previous commit message, there was no API change, since Text.Pandoc.Parsing is not an exposed module.
2014-03-25API changes to HasReaderOptions, HasHeaderMap, HasIdentifierList.John MacFarlane2-39/+47
Previously these were typeclasses of monads. They've been changed to be typeclasses of states. This ismplifies the instance definitions and provides more flexibility. This is an API change! However, it should be backwards compatible unless you're defining instances of HasReaderOptions, HasHeaderMap, or HasIdentifierList. The old getOption function should work as before (albeit with a more general type). The function askReaderOption has been removed. extractReaderOptions has been added. getOption has been given a default definition. In HasHeaderMap, extractHeaderMap and updateHeaderMap have been added. Default definitions have been given for getHeaderMap, putHeaderMap, and modifyHeaderMap. In HasIdentifierList, extractIdentifierList and updateIdentifierList have been added. Default definitions have been given for getIdentifierList, putIdentifierList, and modifyIdentifierList. The ultimate goal here is to allow different parsers to use their own, tailored parser states (instead of ParserState) while still using shared functions.
2014-03-25LaTeX reader: Better handling of "table" environment.John MacFarlane1-0/+1
Positioning options no longer rendered verbatim. Partially addresses #1204.
2014-03-24RTF writer: Fixed tables cells containing paragraphs.John MacFarlane2-93/+93
This moves \intbl after \pard.
2014-03-24Merge pull request #1068 from jaimeMF/mw-images-langsJohn MacFarlane3-1/+8
MediaWiki reader: Accept image links in more languages
2014-03-24Parsing: Make F an instance of Applicative. Closes #1138.John MacFarlane1-2/+2
2014-03-24Fixed typo in READMEJohn MacFarlane1-1/+1
2014-03-24Markdown reader: Fixed regression on line breaks in strict mode.John MacFarlane1-1/+1
Closes #1203.
2014-03-19beamer template: changes for better unicode handling.John MacFarlane1-7/+7
Ported from LaTeX template. Thanks to KarolS for the patch.
2014-03-19PDF: Changes to error reporting, to handle non-UTF8 error output.John MacFarlane2-4/+6
2014-03-18Remove Makefile.John MacFarlane1-51/+0
2014-03-14EPUB writer: Handle files linked in raw img tags.John MacFarlane1-1/+1
See #1170.
2014-03-14EPUB writer: Handle media in audio source tags.John MacFarlane1-27/+28
This should resolve the rest of #1170, but it needs extensive testing. Note that we now use a 'media' directory rather than 'images'.
2014-03-14EPUB writer: Incorporate files linked in <video> tags.John MacFarlane2-10/+47
src and poster will both be incorporated into content.opf and the epub container. This partially address #1170. Still need to do something similar for <audio>.
2014-03-14RST writer: Avoid stack overflow with certain tables.John MacFarlane1-2/+6
Closes #1197. Note that there are still problems with the formatting of the tables inside tables with output produced from the input file in the original bug report. But this fixes the stack overflow problem.
2014-03-12Man writer: Ensure that terms in definition lists aren't line wrapped.John MacFarlane1-1/+1
Closes #1195.
2014-03-10Merge pull request #1190 from eVITAERC/patch/1151-windows-texliveJohn MacFarlane1-12/+15
PDF: Use / as path separators in latex input only
2014-03-10PDF: Use / as path separators in latex input onlyTim Lin1-12/+15
Fixes compile error on Windows for 5040f3e Reverted back to canonical file separators </> in all places except for arguments to the LaTeX builder and in TEXINPUTS See #1151. Note: Temporary directories still fail to be removed in Windows due to call of ByteString.Lazy.readFile creating process ownership of the compiled pdf file.
2014-03-10PDF: Use / as path separators in tempdir on Windows.John MacFarlane1-3/+11
This is needed for texlive. Note that the / is used only in the body of withTempDir, so when the directory is deleted, the original separators will be used. See #1151.
2014-03-09PDF: Use / as path separators even on Windows.John MacFarlane1-2/+3
This seems to be necessary for texlive. Closes #1151 (again!).
2014-03-05HTML writer: Add colgroup around col tags.John MacFarlane2-5/+16
Also affects EPUB writer. Closes #877.
2014-03-05SelfContained: Handle "poster" attribute in "video" tags.John MacFarlane1-8/+10
Closes #1188.
2014-03-05Templates: YAML objects resolve to "true" in conditionals.John MacFarlane1-0/+1
Closes #1133. Note: If address is a YAML object and you just have $address$ in your template, the word "true" will appear, which may be unexpected. (Previously nothing would appear.)
2014-03-04Added default.icml to templates.John MacFarlane1-6/+7
2014-03-04Updated README and pandoc.cabal with icml writer.John MacFarlane2-19/+20
2014-03-04Merge branch 'master' of https://github.com/mb21/pandoc into mb21-masterJohn MacFarlane6-1/+4301
2014-03-04Added org-mode to list of readers in cabal description.John MacFarlane1-2/+2
2014-03-04Merge pull request #1179 from tarleb/orgJohn MacFarlane7-16/+1110
Add a simple Emacs Org-mode reader
2014-03-04Update README to include info on Org-mode readerAlbert Krewinkel1-16/+17
2014-03-04Add a simple Emacs Org-mode readerAlbert Krewinkel6-0/+1093
The basic structure of org-mode documents is recognized; however, org-mode features like todo markers, tags etc. are not supported yet.
2014-02-28InDesign ICML Writermb216-1/+4301
2014-02-26Markdown reader: Improved parsing of nested divs.John MacFarlane1-0/+2
Formerly a closing div tag would be missed if it came right after other block-level tags.
2014-02-26Markdown parser: avoid backtracking when closing `</div>` not found.John MacFarlane1-6/+13
2014-02-26Markdown reader: small efficiency improvement.John MacFarlane1-1/+1
Switched `notFollewdBy' rawHtmlBlocks` -> `notFollowedBy' (htmlTag isBlockTag)`, which is more efficient.
2014-02-25Added readerTrace to ReaderOptions, --trace command line opt.John MacFarlane3-1/+22
This is to debug backtracking-related parsing bugs. So far it is only implemented for markdown, but it would be good to extend it to latex and html readers.
2014-02-23PDF: Use ; for TEXINPUTS separator on Windows.John MacFarlane2-1/+8
Closes #1151, I hope. Testing needed.
2014-02-21Fixed bug in reference link parsing in markdown_mmd.John MacFarlane1-1/+1
The bug was triggered by: Link to [Google][]. Link to [twitter][]. [Google]: http://google.com [twitter]: http://twitter.com
2014-02-20Revised tests for new latex template.John MacFarlane3-3/+3