Commit graph

6947 commits

Author SHA1 Message Date
John MacFarlane
a81b0932e5 Go back to testing with ghc 7.10.2.
Avoids the dreaded "the version of cabal being used has
changed" error.

https://www.reddit.com/r/haskell/comments/3f4bgr/the_version_of_cabal_being_used_has_changed/
2016-01-05 13:57:35 -08:00
John MacFarlane
e792920d4a Regenerated .travis.yml to include 7.10.3. 2016-01-05 11:28:42 -08:00
John MacFarlane
51a415edab Added 7.10.3 to make_travis_yml.hs known versions. 2016-01-05 11:28:18 -08:00
John MacFarlane
694eb87b48 Updated .travis.yml, added ghc 7.10.3 to tested-with. 2016-01-05 10:51:16 -08:00
John MacFarlane
4990350fc7 Fixed v1.16 reversion with --latex-engine.
In 1.16 --latex-engine raises an error if a full path is
given. This commit fixes this reversion. Closes #2618.
2016-01-04 22:44:50 -08:00
John MacFarlane
a6d20b32c7 windows/stack.yaml - use local pandoc-citeproc.
I'm not sure why this is needed, but it is. Otherwise
the build fails.
2016-01-04 07:59:07 -08:00
John MacFarlane
1cee48158e Updated binary package stack.yamls to ensure pandoc-citeproc...
is built with embed_data_files. This fixes a problem with
the original 1.16 binary packages.
2016-01-03 20:52:59 -08:00
John MacFarlane
97c9691696 Textile reader: don't allow block HTML tags in inline contexts.
The reader previously did allow this, following redcloth,
which happily parses

    Html blocks can be <div>inlined</div> as well.

as

    <p>Html blocks can be <div>inlined</div> as well.</p>

This is invalid HTML, and this kind of thing can lead
to parsing problems (stack overflows) as well.  So this
commit undoes this behavior.  The above sample now produces;

    <p>Html blocks can be</p>
    <div>
    <p>inlined</p>
    </div>
    <p>as well.</p>
2016-01-02 22:34:06 -08:00
John MacFarlane
90a2df3f7c Fixed debpkg target. 2016-01-02 16:54:45 -08:00
John MacFarlane
13f04ce1cc Fixed windows stack.yaml. 2016-01-02 15:54:23 -08:00
John MacFarlane
1c0ebe600c Updated man page. 2016-01-02 15:52:49 -08:00
John MacFarlane
b5d9798618 Updated filter for man pages. 2016-01-02 15:52:33 -08:00
John MacFarlane
4edd1a7873 Updated stack.yaml files.
Use latest resolver.
Use latest pandoc-citeproc and pandoc-types release.
2016-01-02 12:37:23 -08:00
John MacFarlane
44c762e305 Updated changelog. 2016-01-02 12:28:49 -08:00
John MacFarlane
75695b1817 MediaWiki reader: interpret markup inside <tt>, <code>.
Closes #2607.
2016-01-02 12:26:16 -08:00
John MacFarlane
a68e072bac MediaWiki writer: fix spacing issues.
+ Start cell on new line unless it's a single Para or Plain.
+ For single Para or Plain, insert a space after the `|` to
  avoid problems when the text begins with a character like
  `-`.

Closes #2604, closes #2606.
2016-01-02 12:14:12 -08:00
John MacFarlane
6ed41cbdcc Tweaks to changelog. 2016-01-01 20:59:12 -08:00
John MacFarlane
f81c09848c Updated changelog. 2016-01-01 20:52:52 -08:00
John MacFarlane
8908205fab Allow process 1.4 2016-01-01 20:36:58 -08:00
John MacFarlane
cfa6f9f3ab Allow binary 0.8 2016-01-01 20:35:38 -08:00
John MacFarlane
54f4faa76c HTML slide templates: add toc. (Andrew Dunning) 2016-01-01 20:33:43 -08:00
John MacFarlane
5f814b6376 Relax version bound on HTTP. 2016-01-01 20:23:42 -08:00
John MacFarlane
a2fa46065d stack.yaml - use simpler extra-deps field. 2015-12-30 13:27:17 -08:00
John MacFarlane
b27783e2ec Use cmark 0.5.
Closes #2605.
2015-12-29 19:52:06 -08:00
John MacFarlane
59d6f02a9a Added 'paper' after $papersize$ variable in latex template.
Thus you can say `papersize: a4` and the latex will contain
`a4paper`.

This change may break some existing workflows; if you currently
specify `a4paper`, you'll get `a4paperpaper` which is meaningless.

However, the change seems worth it, as it will make the
`papersize` variable work uniformly across ConTeXt, LaTeX,
and html->pdf via wkhtmltopdf.

See
https://github.com/jgm/pandoc/commit/3861df510c45ecfc0ac9581dc6f16b07eac4a
62d#commitcomment-15135193
2015-12-23 13:33:30 -08:00
John MacFarlane
3861df510c Updated README with margin and papersize variables. 2015-12-22 13:43:35 -08:00
John MacFarlane
297345098d ConTeXt writer: set default layout based on margin-left, etc.
This sets up `\setuplayout` based on the variables `margin-left`,
`margin-right`, `margin-bottom`, and `margin-top`, if no layout
is given.
2015-12-22 13:28:11 -08:00
John MacFarlane
f9202f5d39 LaTeX writer: create defaults for geometry using margin-left etc.
If `geometry` has no value, but `margin-left`, `margin-right`,
`margin-top`, and/or `-margin-bottom` are given, a default value
for `geometry` is created from these.

Note that these variables already affect PDF production via HTML5
with wkhtmltopdf.
2015-12-22 13:10:46 -08:00
John MacFarlane
35e0544977 LaTeX reader: allow blank space between braced arguments of commands.
For example

    \foo
    {bar}
    {baz}

Closes #2592.
2015-12-22 11:06:06 -08:00
John MacFarlane
46e38d0a0a Improved treatment of margins in wkhtmltopdf. 2015-12-21 23:47:03 -08:00
John MacFarlane
8b8bdca56a Allow setting margins from metadata variables for wkhtmltopdf.
Variables margin-top, margin-bottom, margin-left, margin-right.
Setting them with css inside @page doesn't seem to work, at least
with the released wkhtmltopdf.
2015-12-21 22:59:01 -08:00
John MacFarlane
0596b65a74 pdf via wkhtmltopdf: take title and page-size from metadata.
Adjusted default `page-size` to `letter`, to match current LaTeX
template.
2015-12-21 22:13:44 -08:00
John MacFarlane
0a768f1cc5 Added preliminary support for PDF creation via wkhtmltopdf.
To use this:

    pandoc -t html5 -o result.pdf

(and add `--mathjax` if you have math.)
2015-12-21 17:22:12 -08:00
John MacFarlane
32d27896cd Merge pull request #2598 from twsh/biblatexoptions
Removed hyphen
2015-12-19 20:48:27 -08:00
John MacFarlane
5c4e2476ba Updated changelog 2015-12-19 20:47:13 -08:00
Thomas Hodgson
cab20a9e0c Removed hyphen 2015-12-20 04:03:48 +00:00
John MacFarlane
6924937fbd Beamer: Moved header-includes before setting of title etc.
This matches a change already made in the LaTeX template
(Thomas Hodgson). Closes jgm/pandoc-templates#168
2015-12-19 19:01:05 -08:00
John MacFarlane
28b2d86b21 LaTeX/Beamer template changes (Thomas Hodgson):
* Added `thanks` variable
* Use `parskip.sty` when `indent` isn't set (fall
  back to using `setlength` as before if `parskip.sty`
  isn't available).
* Use `biblio-style` with biblatex.
* Added `biblatexoptions` variable.
* Added `section-titles` variable (defaults to true)
  to enable/suppress section title pages in beamer
  slide shows.
* Moved beamer themes after fonts, so that themes can
  change fonts.  (Previously the fonts set were being
  clobbered by lmodern.sty.)
2015-12-19 18:50:45 -08:00
John MacFarlane
9333814254 Added needed import of FromJSON.
Fixes build failure.
2015-12-19 17:54:20 -08:00
John MacFarlane
770641f741 Fix language code for Czech (cs not cz)
Closes #2597.
2015-12-19 17:54:02 -08:00
John MacFarlane
2998618e39 Merge branch 'AndreasLoow-master' 2015-12-19 00:08:34 -08:00
John MacFarlane
4c103f67f9 Merge branch 'master' of https://github.com/AndreasLoow/pandoc into AndreasLoow-master 2015-12-19 00:07:28 -08:00
John MacFarlane
ce21b2ca07 README: reflowed to avoid overly long lines. 2015-12-19 00:05:22 -08:00
John MacFarlane
e20f433f38 Markdown reader: fixed parsing bug with macros.
Previously macro definitions in indented code blocks
were being parsed as macro definitions, not code.
2015-12-19 00:00:04 -08:00
John MacFarlane
ad3ef55031 Explain how to get subtitle to work with latex article etc.
Thanks to Andrew Dunning.
2015-12-19 00:00:04 -08:00
John MacFarlane
efb34a125e Merge pull request #2593 from mb21/icml-linebreaks
ICML writer: intersperse line breaks
2015-12-18 23:53:51 -08:00
John MacFarlane
e670435234 Merge pull request #2594 from adunning/patch-1
Document change to subtitle in LaTeX.
2015-12-18 23:44:54 -08:00
Andrew Dunning
eb8a758a77 Document change to subtitle in LaTeX.
One could also tell users to add this to header-includes if `subtitle` is desired for `article` and so forth, but I will leave it out for now for the sake of simplicity:

```tex
\providecommand{\subtitle}[1]{%
  \usepackage{titling}
  \posttitle{%
    \par\large#1\end{center}}
}
```
2015-12-17 16:47:00 -05:00
mb21
1ead1f39ad ICML writer: intersperse line breaks
instead of appending them to every ParagraphStyleRange
closes #2501
2015-12-17 10:26:59 +01:00
John MacFarlane
d925cd6573 Updated changelog. 2015-12-16 15:06:17 -08:00