Commit graph

3380 commits

Author SHA1 Message Date
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
Nikolay Yakimov
c0c9b313e6 Docx Writer: set firstRow information in tables 2015-03-08 04:42:23 +03:00
John MacFarlane
0b42eb5f58 MediaWiki writer: spaces to underscores in wikilink URL.
This mimics MediaWiki itself.  Closes #1982.
2015-03-07 10:58:56 -08:00
John MacFarlane
48eaadc57f Fixed pipe tables -- headerless tables are not allowed.
GFM and PHP Markdown Extra pipe tables require headers.
Previously pandoc allowed pipe tables not to include headers,
and produced headerless pipe tables in Markdown output, but this
was based on a misconception about pipe table syntax. This
commit fixes this.

Note:  If you have been using headerless pipe tables, this may
cause existing tables to break.

Closes #1996.
2015-03-07 10:40:13 -08:00
Sumit Sahrawat
ad9e4cde9d Fix issue #969, #1779 by providing --latex-engine-opt 2015-03-04 15:25:56 +05:30
Nikolay Yakimov
65c80822e7 Code cleanup 2015-03-03 13:08:52 +03:00
Nikolay Yakimov
409111f647 Started moving StyleMap out of writer code 2015-03-01 22:57:35 +03:00
Nikolay Yakimov
13daf3ed6a Update Docx writer for 1cb601d reference.docx 2015-03-01 18:49:44 +03:00
John MacFarlane
4f0c5c3080 HTML writer: include raw latex blocks if --mathjax specified.
Closes #1938.
2015-02-25 21:40:40 -08:00
John MacFarlane
4b43531a70 Markdown writer: don't emit span tags if plain or raw HTML disabled. 2015-02-25 21:15:28 -08:00
John MacFarlane
7af3e23bdf Define isRight since it's only in recent versions of Data.Either. 2015-02-25 14:45:00 -08:00
John MacFarlane
9a5e081073 Markdown writer: Avoid introducing spurious list items through wrapping.
Closes #1946.
2015-02-25 10:16:05 -08:00
John MacFarlane
8e404aaca0 LaTeX writer: recognize book documentclass if set in metadata.
This sets `--chapters` implicitly if the documentclass in metadata
is a book documentclass.  Previously this was done only if a book
documentclass was set in a variable.

Closes #1971.
2015-02-25 08:57:30 -08:00
John MacFarlane
47bfdca049 Markdown reader: check for tex macros after indented code.
Closes #1973.
2015-02-25 08:33:42 -08:00
Hans-Peter Deifel
2ca5101113 Org reader: Allow image links with non-image targets
Org-Mode's own html exporter converts the following org link:

  [[http://example.com][https://www.haskell.org/static/img/logo.png]]

to

  <a href="http://example.com">
  <img src="https://www.haskell.org/static/img/logo.png" alt="logo.png" />
  </a>

but pandoc generates:

  <a href="http://example.com">
  <a href="https://www.haskell.org/static/img/logo.png" class="uri">
   https://www.haskell.org/static/img/logo.png
  </a>
  </a>

which is useless. With this patch, it generates:

  <a href="http://example.com">
  <img src="https://www.haskell.org/static/img/logo.png" alt="" />
  </a>
2015-02-25 16:58:48 +01:00
John MacFarlane
ae3142f919 Docbook writer: don't print empty id attributes.
Thanks to Steve Horne for reporting.
2015-02-25 06:59:43 -08:00
Nikolay Yakimov
ba153585db Comment out unused functions to make CI happy 2015-02-24 02:34:46 +03:00
Nikolay Yakimov
908a47e4b9 Treat some ambiguous styles as custom for now
* Author
* Abstract
* Compact
* ImageCaption
* TableCaption
* DefinitionTerm
* Definition
* FirstParagraph
2015-02-24 02:31:14 +03:00
Nikolay Yakimov
47c70b9131 Do not lookup custom styles 2015-02-23 02:05:32 +03:00
Nikolay Yakimov
7ae7f0c051 Also skip SourceCode style if exists 2015-02-23 01:53:47 +03:00
Nikolay Yakimov
8b3acde9de If --no-highlight is set, remove *Tok styles. 2015-02-22 23:25:12 +03:00
Nikolay Yakimov
80715ecd7a Prototype fix for #1872 2015-02-22 00:19:58 +03:00
Nikolay Yakimov
5cdd11725c Initial stab at more involved fix for #1607
This patch attempts to build a style name -> style id mapping based on styles.xml from reference doc, and changes pStyle and rStyle to accept style name as a parameter instead of styleId. There is a fallback mechanic that removes spaces from style name and returns it as style id, but it likely won't help much.

Style names are matched lower-case, since headings and `footnote text` have lowercase names.
2015-02-21 22:20:18 +03:00
Jesse Rosenthal
a7c67c897e Docx reader: Minor cleanup.
The previous commits had some code repetition. This just makes it a bit
easier to read.
2015-02-21 09:18:53 -05:00
Jesse Rosenthal
55d2ce751a Docx reader: allow sub/superscript verbatims.
Verbatim usually shuts off all other run styles, but we don't want it to
shut off sub/superscript.
2015-02-21 08:41:09 -05:00
Matthew Pickering
274efc4a71 LaTeX Writer: Don't use listings in headers
Fixes #1963
2015-02-20 09:35:36 +00:00
Jesse Rosenthal
a01913b45c Docx reader: Allow numbering in the style file.
This allows inherited styles with numbering (lists). It works like this:

 1. check to see if the style has numbering info.
 2. if the paragraph has explicit numbering info in the doc that takes
 precedence.
 3. if not we use the numbering info in the style, if it's there.
 4. otherwise normal paragraph.

We no longer assume it's not a numbering element if it doesn't have an
explicit level---we just set that level to 1. (In the style files, the
examples I've seen don't have that explicit level.)
2015-02-19 00:17:04 -05:00
Matthew Pickering
ad39bc7009 Move utility error functions to Text.Pandoc.Shared 2015-02-18 21:09:07 +00:00
Matthew Pickering
48f442f477 Update haddocks and copyright notices 2015-02-18 21:09:07 +00:00
Matthew Pickering
be943a561f Update Pandoc.hs 2015-02-18 21:09:07 +00:00
Matthew Pickering
615aa94c3d Make safeRead safe.
Fixes #1801
2015-02-18 21:09:07 +00:00
Matthew Pickering
b02b5b9d5e Change return type of Txt2Tags reader 2015-02-18 21:09:07 +00:00
Matthew Pickering
6de6eae737 Change return type of Textile reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
f61db38290 Change return type of TWiki reader 2015-02-18 21:09:06 +00:00
Matthew Pickering
2b7073860b Change return type of RST reader 2015-02-18 21:09:06 +00:00