Commit graph

252 commits

Author SHA1 Message Date
John MacFarlane
85e8afe942 LaTeX template: use correct separator for pdfkeywords.
Needs a comma not a semicolon.

Thanks to Wandmalfarbe.
2016-12-04 21:09:58 +01:00
hubertp-lshift
015dead0bb [odt] Infer table's caption from the paragraph (#3224)
ODT's reader always put empty captions for the parsed
tables. This commit
1) checks paragraphs that follow the table definition
2) treats specially a paragraph with a style named 'Table'
3) does some postprocessing of the paragraphs that combines
 tables followed immediately by captions

The ODT writer used 'TableCaption' style name for the caption
paragraph. This commit follows the open office approach which
allows for appending captions to table but uses a built-in style
named 'Table' instead of 'TableCaption'. Any users of odt format
(both writer and reader) are therefore required to change the
style's name to 'Table', if necessary.
2016-11-26 21:45:56 +01:00
John MacFarlane
78f2c994e1 Use pre-wrap for code in dzslides template (Nicolas Porcel).
Otherwise overly long code will appear on every slide.
2016-11-25 11:19:40 +01:00
Hubert Plociniczak
13bc573e7f Inline code when text has a special style
When a piece of text has a text 'Source_Text' then
we assume that this is a piece of the document
that represents a code that needs to be inlined.
Addapted an odt writer to also reflect that change;
previously it was just writing a 'preformatted' text using
a non-distinguishable font style.

Code blocks are still not recognized by the ODT reader.
That's a separate issue.
2016-11-08 09:29:46 -05:00
John MacFarlane
7359ce60e5 Add hypersetup options to beamer templates (Jake Zimmerman). 2016-10-25 16:01:48 +02:00
John MacFarlane
422b861edc Handle line blocks in sample.lua custom lua writer. 2016-10-23 20:00:07 +02:00
John MacFarlane
ae32d71da4 LaTeX template: use footnote package to fix notes in tables.
Thanks to Václav Haisman.
2016-09-28 11:35:13 +02:00
John MacFarlane
0ab833ecd7 revealjs template: Added notes-server option (Yoan Blanc).
jgm/pandoc-templates#212
2016-09-28 11:31:23 +02:00
John MacFarlane
a244aff244 LaTeX template: set default figure placement.
Thanks to Václav Haisman.  This accompanies #3093.

This change allows users to set the default figure placement
for figures, instead of enforcing one choice.

Users with custom templates will need to add this.
2016-09-28 11:19:12 +02:00
John MacFarlane
820ab51401 Use p tags for subtitle, author, date in epub, revealjs, slidy templates.
See #3119.
2016-09-25 21:44:16 +02:00
John MacFarlane
b43ebd2af2 HTML template: use p instead of h1 for subtitle, author, date.
Closes #3119.
2016-09-25 21:36:54 +02:00
John MacFarlane
e70d8488eb Beamer template: added support for fontfamilies.
As already in LaTeX.
Closes #216.
2016-09-23 18:11:54 +02:00
John MacFarlane
81311a7deb Added themeoptions variable to beamer template (Carsten Gips). 2016-08-11 21:14:26 +02:00
John MacFarlane
cde1f00813 Added beamerarticle variable.
This causes the `beamerarticle` package to be loaded
in beamer, to produce an article from beamer slides.
(Carsten Gips)
2016-08-06 22:43:51 +02:00
John MacFarlane
5f758970a5 Textile reader: support bc.. extended code blocks.
Also, remove trailing newline in code blocks (consistently
with Markdown reader).
2016-07-22 15:32:50 -07:00
John MacFarlane
5611de1473 Restored whitespace between paragraphs in beamer template.
See jgm/pandoc-templates#207.
2016-07-20 10:45:51 -07:00
John MacFarlane
d9880fe340 LaTeX template: Added dummy definition for \institute.
This isn't a standard command, and we want to avoid
a crash when `institute` is used with the default
template.
2016-07-18 22:32:47 -07:00
John MacFarlane
da38bebbdc beamer, latex templates: pass biblatexoptions directly in package load.
This allows runtime optinos to be used.  Fixes jgm/pandoc-citeproc#201
2016-07-01 15:13:46 -07:00
Alex Ivkin
a73c95f61d Added Zim Wiki writer, template and tests. 2016-06-30 23:59:43 -07:00
John MacFarlane
0f9c6c4db0 Added secnumdepth variable to LaTeX template.
Closes #2920.
2016-06-25 13:13:09 -07:00
John MacFarlane
175cc2d44d Implement RawInline and RawBlock in sample lua custom writer.
Closes #2985.
2016-06-20 11:55:43 -07:00
John MacFarlane
4136ec0f4a latex template: fix for obscure hyperref/xelatex issue.
Here's a minimal case:

    \documentclass[]{article}
    \usepackage{hyperref}
    \begin{document}
    \section{\%á}
    \end{document}

Without this change, this fails on the second invocation of xelatex.
See https://tex.stackexchange.com/questions/313266/and-non-ascii-characters-in-headings

This affects inputs this like

    # %á

with pdf output via xelatex.
2016-06-07 10:11:48 -07:00
John MacFarlane
8cce668713 LaTeX template: support for custom font families.
Needed for correct polyglossia operation with Cyrillic fonts and perhaps
can find some other usages.  Example usage in YAML metadata:

```
fontfamilies:
- name: \cyrillicfont
  font: Liberation Serif
- name: \cyrillicfonttt
  options: Scale=MatchLowercase
  font: Liberation
```

(vladipus)
2016-05-19 11:11:00 -07:00
John MacFarlane
bc56988ead Added docbook5 template. 2016-05-01 22:45:27 -07:00
John MacFarlane
3aa7bd1b7c Added institute variable in LaTeX and Beamer templates. 2016-03-19 13:48:06 -07:00
John MacFarlane
a692bd2872 Custom writer: Pass attributes parameter to CaptionedImage.
Closes #2697.
2016-02-05 16:49:27 -08:00
John MacFarlane
cbc2434ca3 Added default.tei TEI template 2016-01-21 15:29:05 -08:00
John MacFarlane
54f4faa76c HTML slide templates: add toc. (Andrew Dunning) 2016-01-01 20:33:43 -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
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
536b6bf538 Implemented SoftBreak and new --wrap option.
Added threefold wrapping option.

* Command line option: deprecated `--no-wrap`, added
  `--wrap=[auto|none|preserve]`
* Added WrapOption, exported from Text.Pandoc.Options
* Changed type of writerWrapText in WriterOptions from
  Bool to WrapOption.
* Modified Text.Pandoc.Shared functions for SoftBreak.
* Supported SoftBreak in writers.
* Updated tests.
* Updated README.

Closes #1701.
2015-12-11 23:55:08 -08:00
John MacFarlane
fde548f751 Beamer template: make \euro conditional on presence of character.
for xelatex and lualatex, as it is for pdflatex.

Andrew Dunning.
2015-12-04 08:02:27 -08:00
John MacFarlane
e5c72caf29 LaTeX template changes:
- only pass options to color package if colorlinks is set
- make definition of `\euro` conditional in xelatex/lualatex,
  as it is already for pdflatex

(Andrew Dunning)
2015-12-03 10:45:11 -08:00
John MacFarlane
7b66f84b80 Fixed man template so disabling hyphenation actually works.
The command needs to come after .TH.
2015-12-03 10:38:48 -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
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
a081df1c41 reveal.js template: Fixed parallaxBackground options.
`parallaxBackgroundHorizontal` and `parallaxBackgroundVertical` need
integer values, not strings.  (Vaughn Iverson)
2015-11-16 07:48:09 -08:00
John MacFarlane
420c86b69a Allow more customization of opendocument styles.
Automatic styles can now be inserted in the template,
since the template, not the writer, now provides the
enclosing `<office:automatic-styles>` tags.

Closes #2520.
2015-11-14 17:19:25 -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
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
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
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
273853d5b8 LaTeX template: simplify hyperref usage.
Andrew Dunning.  #139.
2015-10-20 14:59:54 -07:00
John MacFarlane
eae24903ba ConTeXt template: link color to black, define all sections.
Andrew Dunning.
2015-10-20 13:39:01 -07:00
John MacFarlane
48aaf1bced Updated latex, beamer templates to support language divs/spans.
Mainly this adds a template variable that can be filled
by commands that make babel understand the polyglossia-style
language directives.

Thanks to mb21.
2015-10-19 23:03:26 -07:00
John MacFarlane
b2bf8608db HTML-based templates: Use en dash between title prefix & title.
Instead of a hyphen.
(Andrew Dunning.)
2015-10-18 21:51:49 -07:00
John MacFarlane
3b8793304e Man template: make "generated by" comment conditional.
This allows it to be disabled for automated tests, so
they needn't be updated every version bump.
2015-10-18 11:51:30 -07:00