Commit graph

3286 commits

Author SHA1 Message Date
John MacFarlane
8d39d03d05 Added "noProof" to docx syntax highlighting SourceCode style. 2015-04-01 15:21:55 -07:00
John MacFarlane
9a79538ac9 Merge pull request #2042 from lierdakil/issue1866
LaTeX Reader: check for block-level newcommand aliases in blockCommand
2015-03-31 09:44:15 -07:00
Nikolay Yakimov
f1eb1ab9cf Latex Reader: Block commands code cleanup 2015-03-31 14:32:42 +03:00
John MacFarlane
2b2f7fe15e Merge pull request #2035 from lierdakil/issue2031
Docx Writer/Reference: Add keepNext to objects w/ captions
2015-03-30 20:30:15 -07:00
John MacFarlane
ccb828894b Added CommonMark writer.
Added `Text.Pandoc.Writers.CommonMark`, exporting
`writeCommonMark`.
2015-03-29 23:42:42 -07:00
Nikolay Yakimov
6a0d500f99 Latex Reader: Guard against para starting with inline macro 2015-03-30 06:42:15 +03:00
Nikolay Yakimov
f3e8274d04 LaTeX Reader: check for block-level newcommand aliases in blockCommand 2015-03-30 05:37:00 +03:00
John MacFarlane
34c6ff1f60 Merge pull request #2038 from lierdakil/docx-hyphen-settings
Docx Writer: Copy hyphenation settings from reference.docx
2015-03-29 09:58:45 -07:00
John MacFarlane
91128aac99 Merge pull request #2037 from lierdakil/issue458
Docx Writer: support for --toc option
2015-03-29 09:47:49 -07:00
Matthew Pickering
f3aa03ee86 Docx Writer: Filter out illegal XML characters
Fixes #1992
2015-03-29 13:38:52 +01:00
Nikolay Yakimov
4d1e85a09e Docx Writer: Place toc after abstract, rather than before 2015-03-29 13:46:34 +03:00
Nikolay Yakimov
6ba37909fe Docx Writer: Copy hyphenation settings from reference.docx 2015-03-29 12:24:17 +03:00
Nikolay Yakimov
5ab839a187 Docx Writer: Initial support for --toc option (issue #458)
Creates a "dirty" TOC at the beginning of document, before abstract
2015-03-29 09:03:33 +03:00
Nikolay Yakimov
69d5085c11 Docx Writer: Add a style to figure images
Figures with empty captions use style "Figure"

Figures with nonempty captions use style "Figure with Caption", which is
based on "Figure", and additionally has keepNext set.
2015-03-29 08:02:18 +03:00
John MacFarlane
2d2e4c9ab2 Merge branch 'master' of https://github.com/rootzlevel/pandoc into rootzlevel-master
Conflicts:
	src/Text/Pandoc/Readers/Org.hs
2015-03-28 21:09:38 -07:00
John MacFarlane
8c6ad05ad3 Updated code example in Text.Pandoc. 2015-03-28 13:37:18 -07:00
John MacFarlane
6a3a04c428 Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype
Conflicts:
	benchmark/benchmark-pandoc.hs
	src/Text/Pandoc/Readers/Markdown.hs
	src/Text/Pandoc/Readers/Org.hs
	src/Text/Pandoc/Readers/RST.hs
	tests/Tests/Readers/LaTeX.hs
2015-03-28 12:12:48 -07:00
Nikolay Yakimov
5f7639a0d6 Markdown Reader: Require nonempty value in mmd title block
`many1Till` will gobble up newline, and then whole following line will
match, so I had to use guard here.
2015-03-28 07:07:03 +03:00
Nikolay Yakimov
7091002966 Markdown Reader: Req. " " after key in mmd title block
Require space after key-value delimiter colon in mmd title block.
Issue #2026
Amend: parsec's `spaces` include newlines, but we don't want that. Had
to make custom `spaceNoNewline` parser here
2015-03-28 07:05:02 +03:00
Nikolay Yakimov
6960b2a4cc Markdown Reader: Disable meta exts for meta values
Disable all metadata block extensions when parsing metadata field
values. Issue #2026
2015-03-28 02:53:33 +03:00
Nikolay Yakimov
d09b7593f6 Docx Writer: Fix StyleMap
I've messed up badly with it, so it didn't work properly most of the
time. At the plus side, fallback mechanic is working wonderfully.
2015-03-24 19:24:29 +03:00
John MacFarlane
75a2a7ba69 Allow pipe tables with header but no body.
Closes #2017.
2015-03-23 20:26:56 -07:00
Matthew Pickering
65d67dcb51 Fix accidently usage of list monad instance 2015-03-23 00:14:02 +00:00
Matthew Pickering
84d6703ea7 Add missing import 2015-03-22 23:31:08 +00:00
Matthew Pickering
4ce6471c12 Factor out "returnState" into Parsing module 2015-03-22 21:47:28 +00:00
Matthew Pickering
9e150dd7cf HLint changes 2015-03-22 21:47:28 +00:00
Matthew Pickering
17b317268b Remove F Monad from Markdown reader 2015-03-22 21:47:28 +00:00
Matthew Pickering
7690e1d17f Generalise signature of addWarning 2015-03-22 20:11:30 +00:00
Matthew Pickering
9ca34cc9a9 Add check to see whether in a footnote to ParserState (to avoid circular footnotes) 2015-03-22 20:11:30 +00:00
Matthew Pickering
de093b4e6e Remove F monad from Parsing 2015-03-22 20:11:30 +00:00
Matthew Pickering
5dc902cbcc Changed parseWithWarnings to the more general returnWarnings parser transformer 2015-03-22 20:11:30 +00:00
Matthew Pickering
f6419a2691 Remove F monad from Org Reader. 2015-03-22 20:11:29 +00:00
Matthew Pickering
8271fb574e Added generalize function which can be used to lift specialised parsers.
Monad m => Parsec s st a -> Parsec T s st m a
2015-03-22 18:57:36 +00:00
John MacFarlane
b983adf0d0 Markdown writer: fixes for GHC 7.10. 2015-03-19 11:48:05 -07:00
Shahbaz Youssefi
e952d6633f Derive from Data and Typeable for libpandoc
This commit derives a few types from Data and Typeable used by
libpandoc.

Requires corresponding pull-request for Highlighting-Kate:

    https://github.com/jgm/highlighting-kate/pull/64

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
2015-03-19 17:07:18 +01:00
John MacFarlane
0a82e7e4b1 Fixed a compiler warning. 2015-03-17 17:06:19 -07:00
John MacFarlane
e0d234e54d Added CommonMark reader using cmark (libcmark bindings).
- Added commonmark as an input format.
- Added `Text.Pandoc.Readers.CommonMark.readCommonMark`.
- For now, we use the markdown writer to generate benchmark
  text for the CommonMark reader.  We can change this when we
  get a writer.
2015-03-17 16:15:57 -07:00
John MacFarlane
619b2e8ca2 Merge pull request #1968 from lierdakil/issue1607
Fixes for multiple docx writer style bugs.
2015-03-16 12:02:40 -07:00
Tom Leese
3dba66bf5d Replace occurrences of 'Github' with 'GitHub'
The website is called 'GitHub' afterall.
2015-03-16 09:28:45 +00:00
John MacFarlane
fcf1cd2f31 AsciiDoc writer: avoid wrapping after list marker.
Closes #1858.
2015-03-15 15:43:05 -07:00
John MacFarlane
451019290b AsciiDoc writer: insert some needed blank lines.
Closes #1860.
2015-03-15 14:48:01 -07:00
John MacFarlane
0deb7c507d Merge pull request #1989 from zudov/shortcut_ref_link_pr
Support shortcut reference links in markdown writer
2015-03-15 11:58:30 -07:00
John MacFarlane
967c13560e Really fix #1394.
This closes #1394, which actually wasn't fixed by the earlier commit.
This ensures that lists in speaker notes don't add "fragment" classes,
which can cause additional keypresses to be needed to advance a slide.
2015-03-14 23:32:35 -07:00
John MacFarlane
3b962a5277 Properly gobble spaces after \\.
Closes #2007.
2015-03-14 23:12:04 -07:00
John MacFarlane
348b383731 LaTeX reader: allow block content in \title{}.
Closes #2001.
2015-03-14 23:11:04 -07:00
Konstantin Zudov
b9f77ed03d Support shortcut reference links in markdown writer
Issue #1977

Most markdown processors support the [shortcut format] for reference links.
Pandoc's markdown reader parsed this shortcuts unoptionally.
Pandoc's markdown writer (with --reference-links option) never shortcutted links.

This commit adds an extension `shortcut_reference_links`. The extension is
enabled by default for those markdown flavors that support reading shortcut
reference links, namely:

    - pandoc
    - strict pandoc
    - github flavoured
    - PHPmarkdown

If extension is enabled, reader parses the shortcuts in the same way as
it preveously did. Otherwise it would parse them as normal text.

If extension is enabled, writer outputs shortcut reference links unless
doing so would cause problems (see test cases in `tests/Tests/Writers/Markdown.hs`).
2015-03-10 20:32:24 +02:00
Craig S. Bosma
513221f822 Org reader: add support for smart punctuation 2015-03-09 07:11:53 -05:00
Mathias Schenner
12bf0ff3e5 LaTeX reader: allow non-empty colsep in tables
The `tabular` environment allows non-empty column separators
with the "@{...}" syntax. Previously, pandoc would fail to
parse tables if a non-empty colsep was present. With this
commit, these separators are still ignored, but the table gets
parsed. A test case is included.
2015-03-08 15:47:39 +01:00
Mathias Schenner
1e3ef0e36f LaTeX reader: allow valign argument in tables
The `tabular` environment takes an optional parameter for
vertical alignment. Previously, pandoc would fail to parse
tables if this parameter was present. With this commit,
the parameter is still ignored, but the table gets
parsed. A test case is included.
2015-03-08 15:39:18 +01:00
John MacFarlane
efdc1691fa LaTeX reader: ignore options in \lstinline.
Rather than raising a parse error.  Closes #1997.
2015-03-07 19:58:49 -08:00