Commit graph

6733 commits

Author SHA1 Message Date
John MacFarlane
cc31d7d14f Updated RELEASE_CHECKLIST with new deb procedure. 2015-11-12 19:45:13 -08:00
John MacFarlane
c17238314c Updated changelog. 2015-11-12 19:43:37 -08:00
John MacFarlane
03743a3596 Added Arata Mizuki to contributor list. 2015-11-12 18:52:21 -08:00
John MacFarlane
193f00bc33 Bump version to 1.15.2. 2015-11-12 18:52:12 -08:00
John MacFarlane
51195b30dc Debian: added configurable VAGRANTBOX env variable.
This should make it easy to build in different virtual
machines, e.g. 32-bit.
2015-11-12 17:26:46 -08:00
John MacFarlane
0fd138167c Updated tests for template changes. 2015-11-12 16:09:41 -08:00
John MacFarlane
fe56af9cd3 ConTeXt and LaTeX templates: more cleanup (Andrew Dunning).
- Formatting of some conditionals is adjusted to provide cleaner spacing and
  punctuation in generated preamble.

- `$for$` is always provided where the user might want to use multiple options
  (does not change existing functionality).

- `hyperref` link rendering revised per discussion in
  a84f822c30:

    - the `hidelinks` option is now effectively the default (and has
      been removed as a separate option), rather than setting all links to
      black;
    - link colours can be enabled more easily (using a slightly darker version
      of the old Pandoc defaults) using a new `colorlinks` variable;
    - `pdfborder={0 0 0}` is automatically enabled in `hyperref` when
      `colorlinks` is enabled, and is now only applied.

- ConTeXt only:
    - microtype applied to both regular text and small caps;
    - `indenting` variable added;
    - renamed `style` to `linkstyle` for consistency (had not yet made it
      into the README through my oversight, which I will correct);
    - separated `linkcontrastcolor` from `linkcolor`;
    - matching LaTeX `hyperref` usage, only disable link styling rather
      than providing a specific setting.
2015-11-12 16:01:19 -08:00
John MacFarlane
a4759d8fef Updated date on README. 2015-11-12 15:56:42 -08:00
John MacFarlane
562d051075 README: consistent capitalization for pandoc and Markdown. 2015-11-12 13:37:59 -08:00
John MacFarlane
c80c0df1fe EPUB writer: don't download linked media when data-external attribute set.
By default pandoc downloads all linked media and includes it in the
EPUB container.  This can be disabled by setting `data-external`
on the tags linking to media that should not be downloaded.

Example:

    <audio controls="1">
     <source src="http://www.sixbarsjail.it/tmp/bach_toccata.mp3"
     type="audio/mpeg"></source>
    </audio>

Closes #2473.
2015-11-12 13:27:41 -08:00
John MacFarlane
83b1aa042d LaTeX writer: set colorlinks...
if `linkcolor`, `urlcolor`, `citecolor`, or `toccolor` is set.

Closes #2508.
2015-11-12 12:37:20 -08:00
John MacFarlane
64b32e1e81 Fixed shadowing error. 2015-11-09 11:25:05 -08:00
John MacFarlane
38197c0357 make_travis_yml.hs: don't suppress -Werror on ghc 7.10. 2015-11-09 11:20:34 -08:00
John MacFarlane
c1e474f005 Restored Text.Pandoc.Compat.Monoid.
Don't use custom prelude for latest ghc.

This is a better approach to making 'stack ghci' and 'cabal repl'
work.  Instead of using NoImplicitPrelude, we only use the custom
prelude for older ghc versions.  The custom prelude presents a
uniform API that matches the current base version's prelude.
So, when developing (presumably with latest ghc), we don't
use a custom prelude at all and hence have no trouble with ghci.

The custom prelude no longer exports (<>):  we now want to
match the base 4.8 prelude behavior.
2015-11-09 11:19:25 -08:00
John MacFarlane
23b693c029 Revert "Use -XNoImplicitPrelude and 'import Prelude' explicitly."
This reverts commit c423dbb5a3.
2015-11-09 10:08:22 -08:00
John MacFarlane
777d717d22 Revert "Use Default-extensions rather than ghc-options for NoImplicitPrelude."
This reverts commit 67cabb2a0d.
2015-11-09 10:08:14 -08:00
John MacFarlane
384d03dcfe Revert "Give up support for ghc 7.4."
This reverts commit e0c83f74f3.
2015-11-09 10:07:52 -08:00
Andrew Dunning
6c27e5f2c1 Remove redundant center variable for reveal.js.
This is no longer needed with the updates to the template in da139313d2
2015-11-09 09:38:12 -05:00
John MacFarlane
e0c83f74f3 Give up support for ghc 7.4. 2015-11-08 21:43:31 -08:00
John MacFarlane
67cabb2a0d Use Default-extensions rather than ghc-options for NoImplicitPrelude.
To satisfy 'cabal check'.
2015-11-08 21:10:31 -08:00
John MacFarlane
5a9ca26172 Merge pull request #2502 from minoki/latex-comment-environment
LaTeX reader: Handle `comment` environment.
2015-11-08 17:57:52 -08:00
John MacFarlane
237c10992e Merge pull request #2505 from tarleb/org-header-markup-fix
Org reader: fix markup parsing in headers
2015-11-08 17:17:19 -08:00
John MacFarlane
c423dbb5a3 Use -XNoImplicitPrelude and 'import Prelude' explicitly.
This is needed for ghci to work with pandoc, given that we
now use a custom prelude.

Closes #2503.
2015-11-08 16:56:59 -08:00
Albert Krewinkel
e3b4844bd7 Org reader: fix markup parsing in headers
Markup as the very first item in a header wasn't recognized.  This was
caused by an incorrect parser state: positions at which inline markup
can start need to be marked explicitly by changing the parser state.
This wasn't done for headers.  The proper function to update the state
is now called at the beginning of the header parser, fixing this issue.

This fixes #2504.
2015-11-08 22:32:00 +01:00
ARATA Mizuki
94500f7469 LaTeX reader: Handle comment environment.
The `comment` environment is handled in a similar way to the `verbatim` environment, except that its content is discarded.
2015-11-08 02:24:25 +09:00
John MacFarlane
da05619118 Merge pull request #2472 from adunning/patch-1
Update LaTeX/ConTeXt variable usage in README.
2015-11-04 15:58:46 -08:00
John MacFarlane
411a25306c LaTeX writer: properly handle footnotes in captions.
Closes #1506.
2015-11-01 15:30:05 -08:00
John MacFarlane
c4ea64203a LaTeX writer: avoid footnotes in list of figures.
Footnotes aren't allowed in the list of figures.  This
patch causes footnotes to be stripped from captions when
entered into the list of figures.

Footnotes still don't actually WORK in captions in latex/pdf,
but at least an error is no longer raised.

See #1506.
2015-11-01 13:42:36 -08:00
John MacFarlane
eb8aee477d Pipe tables with long lines now get relative cell widths.
If a pipe table contains a line longer than the column
width (as set by `--columns` or 80 by default), relative
widths are computed based on the widths of the separator lines
relative to the column width.

This should solve persistent problems with long pipe tables in
LaTeX/PDF output, and give more flexibility for determining
relative column widths in other formats, too.

For narrower pipe tables, column widths of 0 are used,
telling pandoc not to specify widths explicitly in output
formats that permit this.

Closes #2471.
2015-10-30 12:37:08 -07:00
John MacFarlane
7843b5759a HTML writer: use width on whole table if col widths sum to < 100%.
Otherwise some browsers display the table with the columns
separated far apart.
2015-10-30 12:36:36 -07:00
John MacFarlane
893ba9863c Beamer template: added code to prevent slide breaks inside paragraphs.
This will matter, in practice, only when `allowframebreaks` is used.

It is especially helpful for bibliography slides.

Closes #2442. Thanks to Nick Bart for the solution.
2015-10-30 11:07:44 -07:00
John MacFarlane
532ae22c29 Textile reader: don't do smart punctuation unless explicitly asked.
Closes #2480.

Note that although smart punctuation is part of the textile
spec, it's not always wanted when converting from textile
to, say, Markdown.  So it seems better to make this an option.
2015-10-30 10:54:07 -07:00
John MacFarlane
d1ba023d9e Beamer template: fix incompatibility of section slides with natbib.
Natbib (and presumably biblatex) bibliography commands create
their own section.  Since these are in frame environments,
we have an incompatibility with the `\AtBeginSection` macro
which creates a special frame when a new section occurs.
(We can't have a frame inside another frame.)

This change disables `\AtBeginSection` inside bibliography
slides.

Thinks to Yihui Xie for bringing the problem to my attention.
This supersedes #145.  See discussion there.
2015-10-29 10:21:56 -07:00
John MacFarlane
95201a0885 Revert "New approach to stack build on appveyor."
This reverts commit cdd6389e91.
2015-10-28 12:41:06 -07:00
John MacFarlane
cdd6389e91 New approach to stack build on appveyor.
This uses system lua library.
See https://github.com/osa1/hslua/issues/22#issuecomment-151281274
2015-10-28 11:01:38 -07:00
John MacFarlane
fb1843ecde Fixed omitted url(...) in CSS data-uri with --self-contained.
Fixes #2489.
2015-10-28 10:06:40 -07:00
John MacFarlane
1d53d452c3 LaTeX writer: add \protect to \hyperlink.
Thanks to Hadrien Mary for the problem and solution.

Closes #2490.
2015-10-28 09:37:05 -07:00
John MacFarlane
3b4d5d26a5 Change default for old-locale flag to False. 2015-10-27 23:26:02 -07:00
John MacFarlane
d5efa9b35c LaTeX writer: Use \hypertarget and \hyperlink for links.
This works correctly to link to Div or Span elements.
We now don't bother defining `\label` for Div or Span
elements.

Closes jgm/pandoc-citeproc#174.
2015-10-27 14:08:35 -07:00
John MacFarlane
3ea444666a Markdown reader: improved parser for mmd_title_block.
We now allow blank metadata fields.  These were explicitly
disallowed before.

For background see #2026.  The issue in #2026 has since
been fixed in another way, so there is no need to forbid
blank metadata fields.
2015-10-26 22:06:34 -07:00
John MacFarlane
2c08913c78 Merge pull request #2484 from nickbart1980/patch-4
Added de-CH-1901, fixed el-polyton
2015-10-26 06:48:36 -07:00
nickbart1980
143093eabd Added de-CH-1901, fixed el-polyton
el-polyton, not el-poly, see http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
2015-10-26 10:34:32 +00:00
John MacFarlane
89d399b6b1 Merge pull request #2481 from mb21/textarabic
LaTeX writer: \textarabic fix
2015-10-25 12:42:41 -07:00
John MacFarlane
7d4f174047 Template improvements (Andrew Dunning).
- Added `keywords` to HTML templates and fixed alignment.
- Updated dzslides template from source.
- Added `lang`, `dir`, `quotes` to HTML templates;
  always make author and date display conditional.
- Fixed `author` and `date` in asciidoc; added `keywords`, `abstract`.
- Updated tests.
2015-10-25 12:28:28 -07:00
John MacFarlane
45df87cf15 Merge pull request #2477 from tarleb/org-toggling-header-args
Org reader: allow toggling header args
2015-10-25 12:10:07 -07:00
mb21
f3f6483510 LaTeX writer: \textarabic fix 2015-10-25 18:31:35 +01:00
Albert Krewinkel
27a8603278 Org reader: allow toggling header args
Org-mode allows to skip the argument of a code block header argument if
it's toggling a value.  Argument-less headers are now recognized,
avoiding weird parsing errors.

The fixes are not exactly pretty, but neither is the code that was
fixed.  So I guess it's about par for the course.  However, a rewrite of
the header parsing code wouldn't hurt in the long run.

Thanks to @jo-tham for filing the bug report.

This fixes #2269.
2015-10-25 08:54:00 +01:00
John MacFarlane
f3e559c43c deb/Makefile: added 'clean'. 2015-10-24 22:58:59 -07:00
John MacFarlane
c9693ae1f4 deb/Vagrantfile: share .., so we can put the deb there. 2015-10-24 22:57:16 -07:00
John MacFarlane
31e46c1cc1 Added Vagrantfile for building deb in vm.
This should help in automating binary package creation.

'make package' will make the package.
'make package COMMIT=blah' will make the package from commit blah.
2015-10-24 22:52:41 -07:00