lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-08-28 19:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
388 Commits 87 Branches 294 Tags
fea830fcd27b4df2a337ac774daa7d4bbca00866
Commit Graph
388 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
John MacFarlane fea830fcd2 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.
 2015-12-23 13:28:59 -08:00
John MacFarlane 133a7e0407 Merge pull request #169 from twsh/beamer-includes 
Moved header-includes to before setting of title etc.
 2015-12-19 18:56:36 -08:00
John MacFarlane 7e91df709a Merge pull request #175 from twsh/thanks 
Added option for thanks to default.latex
 2015-12-19 18:28:09 -08:00
John MacFarlane ddf17ce3df Merge pull request #172 from twsh/parskip 
Use parskip.sty when the 'indent' option isn't set
 2015-12-19 18:25:50 -08:00
John MacFarlane 1ad9e62c63 Merge pull request #167 from twsh/themes 
Moved themes after fonts
 2015-12-19 18:24:19 -08:00
John MacFarlane ce7287cfd9 Merge pull request #152 from twsh/biblatex-options 
Biblatex options
 2015-12-19 18:22:20 -08:00
John MacFarlane b303fdbc7a Merge pull request #174 from twsh/section-titles 
Section titles
 2015-12-19 18:10:08 -08:00
Thomas Hodgson 01a0cadf98 Make loading parskip.sty conditional on its availability 2015-12-16 00:01:37 +00:00
Thomas Hodgson f4742780dc Use biblio-style when setting biblatex options 2015-12-15 14:18:51 +00:00
Thomas Hodgson 8d86ed2b52 Added biblatex options 2015-12-15 14:18:51 +00:00
Thomas Hodgson c695876718 Added biblatex options 2015-12-15 14:18:51 +00:00
Thomas Hodgson 528cb518ef Added option for thanks 2015-12-15 14:16:37 +00:00
Thomas Hodgson 355b58ff99 Add an option to set title pages for sections 2015-12-15 14:00:46 +00:00
Thomas Hodgson ac0f48c73f Use parskip.sty when the 'indent' option isn't set 2015-12-10 13:54:13 +00:00
Thomas Hodgson fb3c22dad8 Moved header-includes to before setting of title etc. 
This matches default.latex
 2015-12-10 13:38:37 +00:00
Thomas Hodgson db0cda8f2e Moved themes after fonts 
If themes are loaded after fonts then they can override fonts. Otherwise, what the themes set will be overridden by the fallback loading of lmodern.sty.
 2015-12-08 18:16:44 +00:00
John MacFarlane 617e2af70c Merge pull request #164 from adunning/patch-2 
Make \euro conditional in Beamer for XeTeX/LuaTeX.
 2015-12-03 22:15:32 -08:00
Andrew Dunning 809f2f09c6 Make \euro conditional in Beamer for XeTeX/LuaTeX. 
Implements the change made for LaTeX in <https://github.com/jgm/pandoc-templates/commit/e45a3fac77e5bd876b20a6b8a0dcbf54f5aa12ab>.
 2015-12-03 22:38:55 -05:00
John MacFarlane 293e847b76 Merge pull request #162 from adunning/patch-3 
Make \euro conditional for XeTeX/LuaTeX.
 2015-12-03 10:35:15 -08:00
John MacFarlane b766694c0b Merge pull request #161 from adunning/patch-2 
Make color option change dependent on colorlinks.
 2015-12-03 10:34:09 -08:00
John MacFarlane 4407397a7a Merge pull request #163 from vlm/patch-1 
Make sure disabling hyphenation actually works.
 2015-12-03 10:26:36 -08:00
Lev Walkin 23d4d65803 Make sure disabling hyphenation actually works. 
For some reason, `.nh` does not work if specified _prior to_ `.TH`. If `.nh` is below `.TH`, hyphenation is properly disabled.
 2015-12-01 22:33:46 -08:00
Andrew Dunning e45a3fac77 Make \euro conditional for XeTeX/LuaTeX. 
Mirrors behaviour for pdfTeX.
 2015-11-30 22:53:19 -05:00
Andrew Dunning 1811fb32eb Make color option change dependent on colorlinks. 
The color options are only used for setting the link colour; it is otherwise redundant (someone wanting to add colour to other parts of the document will likely have more complex needs).
 2015-11-30 22:46:50 -05:00
John MacFarlane 5e9fad4caf Merge pull request #157 from ousia/patch-1 
font loading with simplefonts
 2015-11-20 14:46:04 -08:00
John MacFarlane 2f9ba8e766 Merge pull request #156 from adunning/patch-1 
Revert use of \setuphead for ConTeXt title block.
 2015-11-20 14:44:03 -08:00
John MacFarlane db3aec1a82 latex: Moved definitions of subparagraph, header-includes. 
`header-includes` now occurs before setting of title,
author, etc.  This allows you to include a definition of
`\subtitle`, for example, before `\subtitle` is called.

Redefining of `\paragraph` and `\subparagraph` now occurs
before `header-includes` rather than after.
 2015-11-20 14:30:24 -08:00
John MacFarlane 4ac59af242 latex: Use \subtitle command for subtitle, and give fallback defn. 
The fallback definition is a no-op.  In a class that does not
define `\subtitle`, the `subtitle` will not appear.

This changes earlier behavior, which was to add the subtitle
to the title.  This had bad results with page headers etc.
 2015-11-20 14:26:12 -08:00
John MacFarlane 769581dfe2 latex template: Removed setting of 'subject' from subtitle. 
Subtitle isn't always subject. Also, subtitle can contain
formatting, so we'd need a plain text version as with title.
Easier to remove.
 2015-11-20 14:20:28 -08:00
John MacFarlane e94ed582b4 Revert "Merge pull request #158 from xoolive/pr-title" 
This reverts commit edf101400a, reversing
changes made to ff9ebaa31a.
 2015-11-20 11:38:01 -08:00
John MacFarlane edf101400a Merge pull request #158 from xoolive/pr-title 
Issue for title.meta when subtitle is set
 2015-11-20 10:57:34 -08:00
Xavier Olive 04f49ca4a1 Issue for title.meta when subtitle is set 2015-11-20 10:31:58 +01:00
Pablo Rodríguez 56bb94b61f font loading with simplefonts 
simplefonts is required, since ConTeXt stable from TeX Live 2015 seems to have problem with some typefaces when not used.
 2015-11-19 22:15:49 +01:00
Andrew Dunning 959c20399b Revert use of \setuphead for ConTeXt title block. 
Thanks to Rik Kabel on pandoc-discuss.
 2015-11-17 20:22:23 -05:00
John MacFarlane ff9ebaa31a beamer template: added 'navigation' variable. 
Valid values are empty (default), frame, vertical, horizontal.
 2015-11-17 10:48:14 -08:00
John MacFarlane 16e9428d8a Merge pull request #151 from vsivsi/master 
reveal.js - Fix broken parallaxBackgroundHorizontal and parallaxBackgroundVertical support.
 2015-11-15 22:01:09 -08:00
Vaughn Iverson 37cfc617ed Removed quotes from around values inserted for parallaxBackgroundHorizontal and parallaxBackgroundVertical. These values should be integers, not strings 2015-11-15 18:29:30 -08:00
John MacFarlane c31874467b opendocument template: Add "automatic-styles" tag. 
This allows more customization.
See jgm/pandoc#2520.
 2015-11-14 17:18:33 -08:00
John MacFarlane ef963c3060 Merge pull request #141 from adunning/keywords 
ConTeXt/LaTeX/Beamer clean-up
 2015-11-12 16:00:56 -08:00
Andrew Dunning e0bd757310 Provide separate linkcontrastcolor in ConTeXt. 2015-11-09 11:37:43 -05:00
Andrew Dunning 2823096cb4 Rename ConTeXt style to linkstyle. 
Not necessary to write `normal` to prevent links from rendering as bold.
 2015-11-09 11:35:47 -05:00
Andrew Dunning 3ed48ae68f Make LaTeX/ConTeXt link colour optional. 
Prevents a conflict when base text is not black. This makes the
`hidelinks` option redundant.
 2015-11-09 11:10:47 -05:00
John MacFarlane 12a0110a0a Beamer template: added code to prevent slide breaks inside paragraphs. 
This will matter, in pracitce, 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:04:48 -07:00
John MacFarlane a3c8439ad6 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.

This supersedes #145.  See discussion tehre.
 2015-10-29 10:10:42 -07:00
John MacFarlane de2e524e7d Merge pull request #144 from adunning/html-keywords 
Add keywords to HTML templates; realign.
 2015-10-25 12:18:14 -07:00
John MacFarlane 2d4df824cd Merge pull request #143 from adunning/patch-1 
Update dzslides template from source.
 2015-10-25 12:17:19 -07:00
John MacFarlane 219dea4059 Merge pull request #142 from adunning/asciidoc 
Fix author, date in AsciiDoc; add keywords, abstract.
 2015-10-25 12:16:32 -07:00
Andrew Dunning e7f2258c89 Always use $for$ to allow multiple options in LaTeX/ConTeXt/Beamer. 
Also makes minor improvements to spacing. Adds indenting option to ConTeXt and multiple header/footer texts.
 2015-10-23 08:55:45 -04:00
Andrew Dunning 400dadd444 Realign HTML templates. 
Add lang, dir, quotes where not included previously; always make
display of author and date conditional.
 2015-10-22 18:05:18 -04:00
Andrew Dunning f92d725b05 Add keywords to HTML templates. 2015-10-22 18:01:27 -04:00