Commit Graph
6635 Commits
Author SHA1 Message Date
John MacFarlane b20ecbedc4 AsciiDoc writer: Fixed code blocks.
Closes #1861.
2015-11-23 21:29:21 -08:00
John MacFarlane 4361dc0245 Define a meta-json variable for all writers.
This contains a JSON version of all the metadata, in the
format selected for the writer.

So, for example, to get just the YAML metadata, you can
run pandoc with the following custom template:

    $meta-json$

Closes #2019.  The intent is to make it easier for static
site generators and other tools to get at the metadata.
2015-11-23 20:40:27 -08:00
John MacFarlane 902c63ebea Document limitations of --self-contained.
See #2553.
2015-11-23 18:46:14 -08:00
Jesse Rosenthal 07b8a456b1 Docx Reader: Remove DummyListItem type
Change 5527465c introduced a `DummyListItem` type in Docx/Parse.hs. In
retrospect, this seems like it mixes parsing and iterpretation
excessively. What's *really* going on is that we have a list item
without and associate level or numeric info. We can decide what to do
what that in Docx.hs (treat it like a list paragraph), but the parser
shouldn't make that decision.

This commit makes what is going on a bit more explicit. `LevelInfo` is
now a Maybe value in the `ListItem` type. If it's a Nothing, we treat
it as a ListParagraph. If it's a Just, it's a normal list item.
2015-11-23 11:50:49 -05:00
John MacFarlane a008e57ddf hlint fixes 2015-11-22 07:43:48 -08:00
John MacFarlane f7e37141e5 hlint fixes 2015-11-22 07:42:11 -08:00
John MacFarlane bbb3d8d442 hlint changes 2015-11-22 07:40:26 -08:00
John MacFarlane a7f6241f50 hlint fixes. 2015-11-22 07:38:51 -08:00
John MacFarlane 4b293a6a54 hlint fixes. 2015-11-22 07:37:51 -08:00
John MacFarlane f0670cccbb hlint refactorings. 2015-11-22 07:27:35 -08:00
John MacFarlane 39a92b23a3 Improved Citations section of README.
Added information about `link-citations` and a link
to the pandoc-citeproc man page.

Closes #2551.
2015-11-21 11:14:02 -08:00
John MacFarlane 67b49d786c Travis: only use ghc 7.10.2 for now.
We can go back to the old cabal-based travis once pandoc-types
and texmath have been released.
2015-11-21 11:04:55 -08:00
John MacFarlane 8f0490a66e Travis: Use --system-ghc. 2015-11-21 11:02:22 -08:00
John MacFarlane ad6a3401fb Added sanity check in .travis.yml to diagnose problem. 2015-11-21 10:52:08 -08:00
John MacFarlane dd2d8ff6ff Fixed travis again. 2015-11-21 10:44:09 -08:00
John MacFarlane e456ddbd4f Fixed travis. 2015-11-21 10:33:16 -08:00
John MacFarlane 3f89c95a4a Back to stack-based .travis.yml; use stack 1.8. 2015-11-21 10:20:17 -08:00
John MacFarlane da43c7001f Simpler travis - build pandoc, pandoc-citeproc, texmath together.
No caching.
This is temporary until we release pandoc-types and texmath.
2015-11-21 09:15:34 -08:00
John MacFarlane c5b9ae3060 ImageSize: use safeRead instead of readMaybe.
readMaybe is only provided in base 4.6+.
2015-11-21 08:46:01 -08:00
John MacFarlane 99bc204e8b Travis, make_travis_yml: reverted addition of 'cabal test' in tgz. 2015-11-21 08:45:38 -08:00
John MacFarlane 1494097ffc Further travis tweaks. 2015-11-21 07:45:56 -08:00
John MacFarlane f36f0b275e Fix travis problem. 2015-11-21 07:33:21 -08:00
John MacFarlane ba2bce3abc Fixed .travis.yml syntax. 2015-11-21 07:25:41 -08:00
John MacFarlane 0ea7cce895 travis: install unreleased pandoc-types & texmath. 2015-11-21 07:19:51 -08:00
John MacFarlane bd07432a0c Back to cabal-based .travis.yml.
Modified make_travis_yml so that we do a 'cabal test' with the
unpacked tarball.
2015-11-21 07:15:55 -08:00
John MacFarlane d20b15b0f6 Tweaked travis.yml. 2015-11-20 22:14:57 -08:00
John MacFarlane 3ee2d62187 More travis/stack tweaks. 2015-11-20 20:50:46 -08:00
John MacFarlane 6ae21832c0 Removed ./travis_long from .travis.yml. 2015-11-20 20:34:14 -08:00
John MacFarlane ece6b632c2 New stack-based .travis.yml.
For now, at least, we need to use stack to build in travis,
since we depend on unreleased packages.
2015-11-20 20:31:04 -08:00
John MacFarlane 6a28923b9f Updated tests for context template changes. 2015-11-20 14:50:37 -08:00
John MacFarlane 16be932ddb context template: use simplefonts for font loading.
This is needed for things to work on ConTeXt stable from
TeXLive 2015.

Thanks to Pablo Rodríguez.
2015-11-20 14:46:21 -08:00
John MacFarlane fbb81c4cb0 context template: Revert use of \setuphead in title block.
Thanks to Andrew Dunning and Rik Kabel.
2015-11-20 14:44:24 -08:00
John MacFarlane e5573bca8f latex template changes.
* Removed setting of `subject` in PDF metadata.
  This used to be set to the subtitle, but really the subtitle
  need not give the subject.  Also, `subtitle` can contain formatting,
  so we'd need, at least, a plain text version for this.

* Moved `header-includes` before setting of `\title`, `\author`,
  etc.  This allows these macros to be redefined.

* Use `\subtitle` command for `subtitle`, instead of tacking it
  on to the title as before.  We give a no-op fallback definition if it is
  not defined.  This change should produce much better results
  in classes that support `\subtitle`.  With the default article
  class, which does not define `\subtitle`, subtitles will no
  longer be printed unless the user defines `\subtitle` and
  redefines `\maketitle`.

* Moved redefinitions of `\paragraph` and `\subparagraph` to
  before header-includes.
2015-11-20 14:40:27 -08:00
John MacFarlane 73e2d7976c Renamed link attribute extensions.
* Old `link_attributes` -> `mmd_link_attributes`
* Recently added `common_link_attributes` -> `link_attributes`

Note: this change could break some existing workflows.
2015-11-19 23:17:50 -08:00
John MacFarlane 244cd5644b Merge branch 'new-image-attributes' of https://github.com/mb21/pandoc into mb21-new-image-attributes
* Bumped version to 1.16.
* Added Attr field to Link and Image.
* Added `common_link_attributes` extension.
* Updated readers for link attributes.
* Updated writers for link attributes.
* Updated tests
* Updated stack.yaml to build against unreleased versions of
  pandoc-types and texmath.
* Fixed various compiler warnings.

Closes #261.

TODO:

* Relative (percentage) image widths in docx writer.
* ODT/OpenDocument writer (untested, same issue about percentage widths).
* Update pandoc-citeproc.
2015-11-19 23:14:23 -08:00
John MacFarlane 1ad296dc69 Merge pull request #2532 from michaelbeaumont/fix-2530
Interpret pauses correctly for all headers
2015-11-19 21:06:53 -08:00
John MacFarlane fdc81be7d2 Merge pull request #2506 from adunning/patch-1
Remove redundant `center` variable for reveal.js.
2015-11-19 21:03:31 -08:00
John MacFarlane 3f095ad40b Merge pull request #2509 from adunning/patch-2
Update LaTeX/ConTeXt link colour usage in README.
2015-11-19 21:01:18 -08:00
John MacFarlane ed1173ace6 Rationalized behavior of --no-tex-ligatures and --smart.
This change makes `--no-tex-ligatures` affect the LaTeX reader
as well as the LaTeX and ConTeXt writers.  If it is used,
the LaTeX reader will parse characters `` ` ``, `'`, and `-`
literally, rather than parsing ligatures for quotation marks
and dashes.  And the LaTeX writer will print unicode quotation
mark and dash characters literally, rather than converting
them to the standard ASCII ligatures.

Note that `--smart` has no affect on the LaTeX reader.

`--smart` is still the default for all input formats when
LaTeX or ConTeXt is the output format, *unless* `--no-tex-ligatures`
is used.

Some examples to illustrate the logic:

```
% echo "'hi'" | pandoc -t latex
`hi'
% echo "'hi'" | pandoc -t latex --no-tex-ligatures
'hi'
% echo "'hi'" | pandoc -t latex --no-tex-ligatures --smart
‘hi’
% echo "'hi'" | pandoc -f latex --no-tex-ligatures
<p>'hi'</p>
% echo "'hi'" | pandoc -f latex
<p>’hi’</p>
```

Closes #2541.
2015-11-19 20:30:41 -08:00
Jesse Rosenthal da4103bc42 Docx reader: Clean up commented-out function
A residue of a recent change was left around in the form of a
commented-out function. Let's clean that up.
2015-11-18 14:06:13 -05:00
Jesse Rosenthal 186a955bd0 Docx reader: Add test cases for dummy list items. 2015-11-18 14:03:10 -05:00
Jesse Rosenthal 5527465c77 Docx reader: Handle dummy list items.
These come up when people create a list item and then delete the
bullet. It doesn't refer to any real list item, and we used to ignore
it.

We handle it with a DummyListItem type, which, in Docx.hs, is turned
into a normal paragraph with a "ListParagraph" class. If it follow
another list item, it is folded as another paragraph into that item. If
it doesn't, it's just its own (usually indented, and therefore
block-quoted) paragraph.
2015-11-18 13:02:57 -05:00
John MacFarlane 1f2c37392c Added 'navigation' variable to beamer template.
Valid values are `empty` (the default), `horizontal`, `vertical`,
and `frame`.  Note that this changes the default behavior from
`horizontal` to `empty`.  Closes #2543.
2015-11-17 10:55:55 -08:00
John MacFarlane 995f28ff07 Haddock writer: omit formatting inside links.
It isn't supported by Haddock.

Closes #2515.
2015-11-16 20:53:01 -08:00
John MacFarlane 469338a272 Textile reader: skip over attribute in image source.
We don't have a place yet for styles or sizes on images, but
we can skip the attributes rather than incorrectly taking them
to be part of the filename.

Closes #2515.
2015-11-16 20:43:07 -08:00
John MacFarlane f096f032f0 ICML writer: better handling of math.
Instead of just printing the raw tex, we now try to fake
it with unicode characters.
2015-11-16 20:24:34 -08:00
John MacFarlane 46ff0e988a Merge pull request #2540 from adunning/patch-3
Allow .adoc file extension for AsciiDoc.
2015-11-16 11:56:08 -08:00
Andrew Dunning ec0a22746b Allow .adoc file extension for AsciiDoc.
`.adoc` is the extension recommended at <http://asciidoctor.org/docs/asciidoc-writers-guide/>.
2015-11-16 13:37:13 -05:00
John MacFarlane 74cf52728e HTML writer: Include example class for example lists.
Closes #2524.
2015-11-16 09:57:28 -08:00
John MacFarlane e44149931e Improved implicit pandoc-citeproc inclusion.
The filter pandoc-citeproc is automatically used when
`--bibliography` is specified on the command line, unless
`--natbib` or `--biblatex` is used.

However, previously this only worked if `--bibliography`
was spelled out in full, and not if `--biblio` was used.
This patch fixes that problem.
2015-11-16 09:46:11 -08:00