Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
6855 commits 2 branches 0 tags 65 MiB
Commit graph

6855 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jesse Rosenthal
a7a0b452a5 Docx Reader: Get rid of Modifiable typeclass. 
The docx reader used to use a Modifiable typeclass to combine both
Blocks and Inlines. But all the work was in the inlines. So most of the
generality was wasted, at the expense of making the code harder to
understand. This gets rid of the generality, and adds functions for
Blocks and Inlines. It should be a bit easier to work with going forward.
 2016-02-26 08:57:53 -05:00
John MacFarlane
38bd4162fe Allow zip-archive 0.3. 2016-02-24 20:42:28 -08:00
John MacFarlane
f2bd6fd37c Make protocol-relative URIs work again. 
Closes #2737.
 2016-02-23 21:58:10 -08:00
John MacFarlane
0180807a6c Raise tagsoup lower bound to 0.13.7. 
This fixes entity-related problems.

Closes #2734.
 2016-02-22 09:59:11 -08:00
John MacFarlane
04d1e40f37 Markdown reader: use htmlInBalanced for rawVerbatimBlock. 
This should give better performance.

See #2730.
 2016-02-21 07:56:41 -08:00
Jesse Rosenthal
f1c59b271f Update README to reflect 4112b32. 
We don't infer `--chapters` if `article` document option is set. For
example: `\documentclass[article]{memoir}`.
 2016-02-21 06:34:38 -05:00
John MacFarlane
9693de7f59 Fixed some linter warnings. 2016-02-20 22:16:39 -08:00
John MacFarlane
29706ee02d Merge pull request #2646 from tarleb/org-figure-with-no-name 
Prefix even empty figure names with "fig:"
 2016-02-20 21:44:39 -08:00
John MacFarlane
649cfb61b8 Merge pull request #2668 from monofon/fix/yaml-metadata-block-bottom-line 
Markdown writer: Use hyphens for yaml metadata block bottom line
 2016-02-20 21:43:15 -08:00
John MacFarlane
e369e60fb4 Merge pull request #2691 from tarleb/org-image-file-links 
Org reader: Refactor link-target processing
 2016-02-20 21:42:12 -08:00
John MacFarlane
1534052dd9 HTML reader: rewrote htmlInBalanced. 
This version avoids an exponential performance problem with `<script>` tags,
and it should be faster in general.

Closes #2730.
 2016-02-20 15:00:31 -08:00
John MacFarlane
d45fcf9f6d Merge pull request #2732 from pra85/patch-2 
Fix typos in Readme
 2016-02-20 12:48:22 -08:00
Prayag Verma
8a114e9417 Fix typos in Readme 
Remove extra `be`
`overriden` → `overridden`
 2016-02-21 01:03:48 +05:30
Jesse Rosenthal
4438ff17fb LaTeX writer: clean up options parser. 
Make sure that we require the closing bracket.
 2016-02-18 23:35:38 -05:00
Jesse Rosenthal
4112b321cd LaTeX writer: treat memoir template with article opt as article 
We currently treat all memoir templates as books. This means that pandoc
will infer the `--chapters` argument, even if the `article` iption is
set for memoir.

This commit makes pandoc treats the document as an article if there is
an article option (i.e., `\documentclass[12pt,article]{memoir}`).

Note that this refactors out the parsec parsers for document class and
options, to make it a little clearer what's going on.
 2016-02-18 22:32:38 -05:00
John MacFarlane
5848416852 Merge pull request #2725 from adunning/patch-1 
Remove stray line from stack.full.yaml
 2016-02-18 16:33:44 -08:00
Andrew Dunning
4dfe3733e5 Remove stray line from stack.full.yaml 
The line causes an error with stack 1.0.2:

```
Could not parse '/pandoc-build/pandoc/stack.full.yaml':
AesonException "Error in $.extra-deps: failed to parse field 'extra-deps': failed to parse field extra-deps: expected [a], encountered Null"
See http://docs.haskellstack.org/en/stable/yaml_configuration.html.
```
 2016-02-18 15:08:06 +00:00
John MacFarlane
44bcc88d57 Don't build with lts-2 or lts-3. 2016-02-17 11:42:04 -08:00
John MacFarlane
9e3f739f11 Travis: don't build with lts-3. 
It doesn't have recent enough dependencies.
 2016-02-17 11:39:43 -08:00
John MacFarlane
dda7c27378 Travis fixes. 
cabal sdist has problems on cabal 1.16, because of our
Text.Pandoc.Data module.  So we don't test it.
 2016-02-17 11:13:34 -08:00
John MacFarlane
134a5e52a1 Fixed stack.yaml. 2016-02-17 11:10:12 -08:00
John MacFarlane
1a87794762 Try new travis stack+cabal script. 2016-02-17 10:13:29 -08:00
John MacFarlane
b8dadc608a HTML reader: properly handle an empty cell in a simple table. 
Closes #2718.
 2016-02-16 11:05:51 -08:00
John MacFarlane
09bc31a7cc stack.yaml: Added commented-out commands to compile against aeson 0.11. 
This has been tested.
 2016-02-10 10:29:35 -08:00
John MacFarlane
bbc67dee36 Removed tex_math_single_backslash from markdown_github options. 
Closes #2707.
 2016-02-09 22:30:52 -08:00
John MacFarlane
52794d8d52 Removed aeson extra-dep from stack.yaml. 2016-02-09 17:28:37 -08:00
John MacFarlane
1aaf4b8c83 Changed aeson version in stack.yaml to 0.11.0.0. 2016-02-09 14:08:51 -08:00
John MacFarlane
522f8f3b47 Updated to lts-5.2 resolver, aeson 0.11 in stack.yaml. 2016-02-09 09:34:51 -08:00
John MacFarlane
e552a14bf9 Allow aeson 0.11. 2016-02-09 09:30:36 -08:00
John MacFarlane
7034366398 Merge pull request #2703 from rski/stack_link_fix 
Fix stack link in INSTALL
 2016-02-08 14:40:42 -08:00
rski
c428231db0 Fix stack link in INSTALL 
Stack installation instructions have moved to docs.haskellstack.org
 2016-02-08 15:18:05 +02:00
John MacFarlane
c0515e09d4 Added info on Stack to CONTRIBUTING.md. 2016-02-05 16:58:29 -08:00
John MacFarlane
7358b473fd Merge pull request #2699 from MathieuDuponchelle/patch-1 
CONTRIBUTING.md : update test enabling documentation
 2016-02-05 16:55:27 -08:00
John MacFarlane
a692bd2872 Custom writer: Pass attributes parameter to CaptionedImage. 
Closes #2697.
 2016-02-05 16:49:27 -08:00
Mathieu Duponchelle
a3266001d1 CONTRIBUTING.md : update test enabling documentation 
On my end, in a clean sandbox, I had to run this before I could run the tests, I'm a cabal / haskell noob so that might not be the best way to do so but :)
 2016-02-05 21:28:41 +01:00
John MacFarlane
6cb4991f6b Markdown reader: Fixed bug with smart quotes around tex math. 
Previously smart quotes were incorrect in the following:

    '$\neg(x \in x)$'.

(because of the following period).  This commit fixes the problem,
which was introduced by commit 4229cf2d92.
 2016-02-04 12:09:26 -08:00
John MacFarlane
93a05dffd3 HTML writer: don't include alignment attribute for default table columns. 
Previously these were given "left" alignment.  Better to leave off
alignment attributes altogether.

Closes #2694.
 2016-02-03 13:31:21 -08:00
Jesse Rosenthal
7a10507dc8 Docx reader: Add tests for adjacent hyperlinks. 2016-02-02 14:53:01 -05:00
Jesse Rosenthal
2ee7752d14 Docx reader: Add a "Link" modifier to Reducible 
We want to make sure that links have their spaces removed, and are
appropriately smushed together.

This closes #2689
 2016-02-02 14:40:09 -05:00
Albert Krewinkel
92e6ae47f6 Org reader: Refactor link-target processing 
Cleanup of the code for link target handling.  Most notably, the
canonicalization of a link is handled by a separate function.

This fixes #2684.
 2016-01-31 23:23:09 +01:00
John MacFarlane
18745585c1 LaTeX reader: inlineCommand now gobbles an empty {} after any command. 
This gives better results when people write e.g. `\TeX{}` in Markdown.

    \TeX{} and \LaTeX{}

now works as expected with `pandoc -f markdown -t latex`.

Closes #2687.
 2016-01-31 10:52:46 -08:00
John MacFarlane
a02c26d9f4 HTML reader: handle multiple meta tags with same name. 
Put them in a list in the metadata so they are all
preserved, rather than (as before) throwing out all
but one..
 2016-01-29 11:51:01 -08:00
John MacFarlane
76983c31f2 Properly handle LaTeX "math" environment as inline math. 
See #2171.
 2016-01-29 10:11:45 -08:00
John MacFarlane
373aaa8db3 Merge pull request #2681 from pra85/patch-1 
Update license year range to 2016
 2016-01-26 09:54:59 -08:00
Prayag Verma
fdc9f0e373 Update license year range to 2016 2016-01-26 14:07:07 +05:30
John MacFarlane
a1021bdda6 Textile reader: Support >, <, =, <> text alignment attributes. 
Closes #2674.
 2016-01-25 09:34:49 -08:00
John MacFarlane
11c5831a1f Make language extensions trigger highlighting. 
For example, `py` will now work as well as `python`.
Closes jgm/highlighting-kate#83.
 2016-01-24 14:15:06 -08:00
John MacFarlane
d0152847d7 stack.yaml - use cmark 0.5.1. 2016-01-22 21:18:19 -08:00
John MacFarlane
f35fa88e21 Bump version to 1.17. 
API change in type of Text.Pandoc.Shared.uniqueIdent.
 2016-01-22 10:20:58 -08:00
John MacFarlane
20170c328f Changed type of Shared.uniqueIdent argument from [String] to Set String. 
This avoids performance problems in documents with many identically
named headers.

Closes #2671.
 2016-01-22 10:16:47 -08:00