Commit graph

356 commits

Author SHA1 Message Date
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
John MacFarlane
3f9dd65572 reveal.js template changes (Andrew Dunning).
- Add width, height variables to reveal.js.

- Update reveal.js template from 3.1 source.
  All configuration options are now available as variables,
  but are only be included if set (reveal.js uses defaults
  otherwise).
2015-10-14 20:47:18 -07:00
John MacFarlane
de77bc730a LaTeX template: Add fontenc, indent, subparagraph variables.
Thanks to Andrew Dunning.
2015-10-14 10:06:41 -07:00
John MacFarlane
309ff7a6da Template changes:
- Move HTML5 shiv after CSS (Andrew Dunning).
- Fix HTML5 shiv URL (Andrew Dunning).
- Add dir attribute in html5 (Andrew Dunning).
- Realign beamer and LaTeX templates (Andrew Dunning).
2015-10-13 20:35:18 -07:00
John MacFarlane
e3a5abc64f Removed xltxtra, xunicode from LaTeX template.
Thanks Andrew Dunning.

Updated tests and changelog.
2015-10-10 16:12:50 -07:00
John MacFarlane
3cce552ff3 reveal.js template: add controls, progress variables.
Thanks to Grégoire Pineau.
2015-10-10 14:06:30 -07:00
John MacFarlane
e92fc4455b Adjusted latex template for changes to polyglossia-lang variable. 2015-10-10 13:53:42 -07:00
John MacFarlane
ce07f1bd68 Man template improvements:
- Added comment stating that the page is autogenerated by
  pandoc, giving version.
- Added `adjusting` and `hyphenate` variables.
- Documented new variables.
2015-10-10 13:15:58 -07:00
John MacFarlane
1eda820c04 Beamer template: Added space after colon in figure caption. 2015-10-07 09:48:39 -07:00
John MacFarlane
15a5993f2e Updated latex template to work better with tufte...
and other packages that include hyperref or color.

Thanks to Xavier Olive.
2015-10-04 21:44:07 -07:00
John MacFarlane
6d0e586b2d Template updates.
Beamer:  added `innertheme`, `outertheme` variables.

LaTeX:  added `mainfontoptions`, `sansfontoptions`,
`monofontoptions`, `mathfontoptions`, `fontfamilyoptions`.
2015-10-03 17:01:01 -07:00
John MacFarlane
4443af4d8d Beamer template: allow setting outer/inner theme. 2015-09-29 10:00:57 -07:00
John MacFarlane
0a2773bd1b Changes to templates to support handling of bidirectional text.
(LaTeX, ConTeXt, HTML)
2015-09-26 17:07:48 -07:00
John MacFarlane
8a43530380 LaTeX, ConTeXt templates: more specific language variables.
Instead of directly using `lang`, we now use `babel-lang` and
`polyglossia-lang` and `context-lang`.  These variables are set by
the writers to the necessary values, based on the `lang` variable
(which now always takes a value in BCP47 format).
2015-09-25 10:37:12 -07:00
John MacFarlane
ef18b83c58 LaTeX template: reverted change in abstract position. 2015-08-11 11:47:11 -07:00
John MacFarlane
788cea9133 Revert "LaTeX template: move abstract to before \maketitle."
This reverts commit aa08b4cd67.
2015-08-11 11:44:21 -07:00
John MacFarlane
aa08b4cd67 LaTeX template: move abstract to before \maketitle.
See
http://tex.stackexchange.com/questions/139469/to-have-abstract-in-the-docu
ment-class-revtex
2015-08-09 09:45:32 -07:00
John MacFarlane
a72a026d04 ConTeXt template: activate hanging indent for definition lists.
(mb21)
2015-07-06 16:56:46 -07:00
John MacFarlane
6f527e1f1a Updated LaTeX template: CJKoptions variable, allow dvipsnames for colors.
Thanks to Xavier Olive.

The addition of the `CJKoptions` variable allows one to set (e.g.)
a bigger font size for Asian fonts than latin ones.

Including dvipsnames allows specifying colors like MidnightBlue
for link colors.  This brings in a dependency on the color package,
but it is a standard package and required anyway by graphics.
2015-06-27 18:07:49 -07:00
John MacFarlane
602130259d Added CJKmainfont to latex template (Xavier Olive). 2015-06-13 09:35:33 -07:00
John MacFarlane
e69bf25ede epub templates: use 'author.role', not 'author.type'. 2015-06-13 09:33:32 -07:00
John MacFarlane
6f79cf1983 Added default commonmark template. 2015-06-02 13:22:27 +02:00
John MacFarlane
68b460db92 LaTeX template: Move hyperref before polyglossia.
This avoids an error "Please load package hyperref before bidi package,
and then try to run xelatex on your document again".  See
jgm/pandoc-templates #96.
2015-05-27 12:30:10 -07:00
John MacFarlane
4a9aaf6fd6 LaTeX/beamer: added setotherlanguages in polyglossia.
This uses an `otherlang` variable that takes a list of languages.

As requseted in #2174.
2015-05-27 12:15:50 -07:00
John MacFarlane
734b0bc2fb Revealjs: allow 'center' to be set to false. 2015-05-27 11:04:38 -07:00
John MacFarlane
a3d1f365bc Template changes.
* Use polyglossia with xelatex in beamer (#85).
* Provide `\tightlist` in beamer template (Anders Persson).
* Add toccolor variable to control link color in toc (Kaixhin).
2015-05-27 10:39:55 -07:00
John MacFarlane
f0817e1952 LaTeX, Beamer templates: use bibliography instead of biblio-files.
Also use `\addbibresource` instead of `\bibliography` for biblatex.

See #1661.
2015-05-11 21:15:22 -07:00
John MacFarlane
c59e3e53e5 Fixed accidental reversion to earlier templates version.
From last commit.
2015-05-10 08:36:12 -07:00
John MacFarlane
60bf4a8bfb Improved warnings when image size can't be determined.
Closes #1834.
2015-05-09 23:56:53 -07:00
John MacFarlane
15d16e8456 LaTeX template: degrade gracefully if \paragraph not defined. 2015-05-03 22:04:24 -07:00
John MacFarlane
f420325273 latex template: use providecommand for tightlist.
This avoids a conflict when memoir class is used.
Thanks to Joseph Harriott.
2015-05-02 09:09:11 -07:00
John MacFarlane
764f677530 Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into jlduran-latex-tightlist
Conflicts:
	data/templates
2015-04-17 19:23:13 -07:00
John MacFarlane
9ad336f586 LaTeX template: redefine \paragraph, \subparagraph...
to behave more like section headers.  Closes #1658.
2015-04-17 18:51:36 -07:00
John MacFarlane
c5acaec3b5 LaTeX template: include grffile together with graphicx.
This properly handles filenames containing spaces and dots.
Closes #2074.
2015-04-13 09:00:55 -07:00
John MacFarlane
6a83773f03 OpenDocument template: use text:p instead of text:h for title.
Using `text:h` causes problems with numbering.  Closes #2059.
Thansk to @nkalvi for diagnosing this.
2015-04-12 21:29:53 -07:00
John MacFarlane
28497d484e RST writer: better handling of raw latex inline.
We use `` :raw-latex:`...` `` and add a definition for this
role to the template.

Closes #1961.
2015-04-07 22:07:38 -07:00
John MacFarlane
ca6a8d62f2 epub, epub3: added header-includes, include-before, include-after.
Closes #1987.
2015-04-07 21:11:43 -07:00
John MacFarlane
394cf3365f reveal.js template: move custom css after theme.
This allows custom css to modify themes, instead of being replaced
by themes.
2015-04-07 20:31:43 -07:00
John MacFarlane
cde1f3b6b4 reveal.js template: add new configurable options.
(Dmitry Smirnov, jgm/pandoc-templates#89)

  * Made option "center" configurable.
  * Added new options "maxScale" and "slideNumber".
  * Added comments to existing options.
2015-03-31 15:49:10 -07:00
John MacFarlane
e8cd53d1c9 Fixed revealjs template so style css is correctly included.
Closes #1949.
2015-02-16 19:57:37 -08:00
John MacFarlane
24573b6a5a revealjs template - link to non-minified css, js.
The minified versions no longer ship with the library.
2015-01-20 17:20:01 -08:00