Commit Graph
10211 Commits
Author SHA1 Message Date
John MacFarlane 08d1404b31 API changes to HasReaderOptions, HasHeaderMap, HasIdentifierList.
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-25 13:43:34 -07:00
John MacFarlane 5e69f845d5 LaTeX reader: Better handling of "table" environment.
Positioning options no longer rendered verbatim.
Partially addresses #1204.
2014-03-25 12:04:25 -07:00
John MacFarlane d7fbc40dff RTF writer: Fixed tables cells containing paragraphs.
This moves \intbl after \pard.
2014-03-24 15:12:32 -07:00
John MacFarlane b9cc29e15a Merge pull request #1068 from jaimeMF/mw-images-langs
MediaWiki reader: Accept image links in more languages
2014-03-24 10:39:49 -07:00
John MacFarlane 3fa38db80b Parsing: Make F an instance of Applicative. Closes #1138. 2014-03-24 10:29:24 -07:00
John MacFarlane e3097172b1 Fixed typo in README 2014-03-24 10:16:06 -07:00
John MacFarlane dd058b38b0 Markdown reader: Fixed regression on line breaks in strict mode.
Closes #1203.
2014-03-24 09:56:16 -07:00
John MacFarlane 818894b7b5 beamer template: changes for better unicode handling.
Ported from LaTeX template.  Thanks to KarolS for the patch.
2014-03-19 11:11:41 -07:00
John MacFarlane 0ab594bc47 Merge pull request #54 from KarolS/master
Improving Unicode support in the Beamer template
2014-03-19 11:11:23 -07:00
John MacFarlane 3df75bc160 PDF: Changes to error reporting, to handle non-UTF8 error output. 2014-03-19 11:09:36 -07:00
John MacFarlane 575cc7eddc Remove Makefile. 2014-03-18 09:51:42 -07:00
John MacFarlane 44f58e7e38 EPUB writer: Handle files linked in raw img tags.
See #1170.
2014-03-14 15:41:28 -07:00
John MacFarlane 91696c62c4 EPUB writer: Handle media in audio source tags.
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-14 15:30:11 -07:00
John MacFarlane f6141aa241 EPUB writer: Incorporate files linked in <video> tags.
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-14 15:18:43 -07:00
John MacFarlane 814af2002e RST writer: Avoid stack overflow with certain tables.
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-14 14:03:15 -07:00
John MacFarlane 76ef65f0b3 Man writer: Ensure that terms in definition lists aren't line wrapped.
Closes #1195.
2014-03-12 10:23:45 -07:00
John MacFarlane c3a2fc643c Merge pull request #1190 from eVITAERC/patch/1151-windows-texlive
PDF: Use / as path separators in latex input only
2014-03-10 17:38:41 -07:00
Tim Lin 1aed9208f8 PDF: Use / as path separators in latex input only
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-10 16:23:57 -07:00
John MacFarlane 5040f3ede0 PDF: Use / as path separators in tempdir on Windows.
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-10 11:16:50 -07:00
John MacFarlane c026c16fa6 PDF: Use / as path separators even on Windows.
This seems to be necessary for texlive.
Closes #1151 (again!).
2014-03-09 21:26:25 -07:00
John MacFarlane f3c9d37885 HTML writer: Add colgroup around col tags.
Also affects EPUB writer.
Closes #877.
2014-03-05 13:01:23 -08:00
John MacFarlane 6fda361977 SelfContained: Handle "poster" attribute in "video" tags.
Closes #1188.
2014-03-05 09:10:09 -08:00
John MacFarlane 3126b00f11 Templates: YAML objects resolve to "true" in conditionals.
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-05 08:47:20 -08:00
John MacFarlane 49a80e1652 Added default.icml to templates. 2014-03-04 10:29:19 -08:00
John MacFarlane 64a571775d Updated README and pandoc.cabal with icml writer. 2014-03-04 10:29:13 -08:00
John MacFarlane c6eedc3727 Merge pull request #46 from mb21/master
InDesign ICML template
2014-03-04 10:27:08 -08:00
John MacFarlane ae86e24ff6 Merge branch 'master' of https://github.com/mb21/pandoc into mb21-master 2014-03-04 10:15:43 -08:00
John MacFarlane 1046339755 Added org-mode to list of readers in cabal description. 2014-03-04 10:15:04 -08:00
John MacFarlane b1e6ea80fd Merge pull request #1179 from tarleb/org
Add a simple Emacs Org-mode reader
2014-03-04 10:12:16 -08:00
Albert Krewinkel 8909229671 Update README to include info on Org-mode reader 2014-03-04 10:40:52 +01:00
Albert Krewinkel 24b2ac43b0 Add a simple Emacs Org-mode reader
The basic structure of org-mode documents is recognized; however,
org-mode features like todo markers, tags etc. are not supported yet.
2014-03-04 10:40:40 +01:00
mb21 80511f1b34 InDesign ICML Writer 2014-02-28 13:35:35 +01:00
mb21 7e808534ad InDesign ICML template 2014-02-28 13:09:41 +01:00
John MacFarlane 4d0bf3c5d6 Markdown reader: Improved parsing of nested divs.
Formerly a closing div tag would be missed if it came right
after other block-level tags.
2014-02-26 22:53:12 -08:00
John MacFarlane a208a972c3 Markdown parser: avoid backtracking when closing </div> not found. 2014-02-26 22:46:38 -08:00
John MacFarlane 581075a0ca Markdown reader: small efficiency improvement.
Switched `notFollewdBy' rawHtmlBlocks` ->
`notFollowedBy' (htmlTag isBlockTag)`, which is more
efficient.
2014-02-26 22:24:50 -08:00
KarolS 088fccaeda Backported changes from default.latex to default.beamer in order to improve Unicode support 2014-02-26 21:51:29 +01:00
John MacFarlane 69f7b1dbf3 Added readerTrace to ReaderOptions, --trace command line opt.
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-25 22:43:58 -08:00
John MacFarlane 19b127b898 PDF: Use ; for TEXINPUTS separator on Windows.
Closes #1151, I hope.  Testing needed.
2014-02-23 20:36:21 -08:00
John MacFarlane a826d3936d Fixed bug in reference link parsing in markdown_mmd.
The bug was triggered by:

Link to [Google][]. Link to [twitter][].

[Google]: http://google.com
[twitter]: http://twitter.com
2014-02-21 17:32:02 -08:00
John MacFarlane b677ce0663 Revised tests for new latex template. 2014-02-20 09:43:02 -08:00
John MacFarlane dc390258cb default.latex template: use fontenc package only for pdflatex.
See #1164.
2014-02-20 09:37:02 -08:00
John MacFarlane 3a0ed995ca default.latex: include fontenc only if pdflatex engine is used.
See pandoc #1164.
2014-02-20 09:36:20 -08:00
John MacFarlane f3a062d5f9 Make rst figures true figures. Closes #1168.
Thanks to CasperVector.
2014-02-19 09:11:15 -08:00
John MacFarlane 5a8a247c3a Move include-after to end in revealjs template. (certainlyakey) 2014-02-18 15:36:56 -08:00
John MacFarlane c5dc801498 Merge pull request #1145 from wilx/en-dash-ligature-avoidance
Use \/ to avoid en-dash ligature instead of -{}-.
2014-02-17 16:03:27 -08:00
John MacFarlane f6a020a906 HTML writer: Fixed bug with unnumbered section headings.
Unnumbered section headings (with class 'unnumbered') were getting
numbers.  This commit fixes the bug.
2014-02-17 15:18:52 -08:00
John MacFarlane 56320f479e Merge pull request #1163 from merijn/master
Extended the rST parser's handling of roles.
2014-02-15 22:20:26 -08:00
Merijn Verstraaten 66fd9bf759 Clarified field values in RstCustomRoles. 2014-02-15 17:57:08 +01:00
Merijn Verstraaten fe246ce01c Enhanced Pandoc's support for rST roles.
rST parser now supports:
    - All built-in rST roles
    - New role definition
    - Role inheritance

Issues/TODO:
    - Silently ignores illegal fields on roles
    - Silently drops class annotations for roles
    - Only supports :format: fields with a single format for :raw: roles,
      requires a change to Text.Pandoc.Definition.Format to support multiple
      formats.
    - Allows direct use of :raw: role, rST only allows indirect (i.e.,
      inherited use of :raw:).
2014-02-15 17:51:33 +01:00