diff options
| author | Andrew Dunning <adunning@users.noreply.github.com> | 2019-03-23 00:35:55 -0400 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-03-22 22:35:55 -0600 |
| commit | e91af0a8a32d68af4c533fdf4b7caaafade577ef (patch) | |
| tree | 2ae2213d4c05b873699f101ae2036ff430a58ca1 /data/templates | |
| parent | 1e6077622635b6536ec10c8c67651ef0f4901cff (diff) | |
| download | pandoc-e91af0a8a32d68af4c533fdf4b7caaafade577ef.tar.gz | |
LaTeX template: Group graphics-related code (#5389)
* LaTeX template: Group graphics-related code
The default figure placement was added in <https://github.com/jgm/pandoc/commit/f3ab4bc2b99e9f7f3917708a9110d6500aa051a0>; there does not appear to have been a reason for placing it at the end of the preamble.
* Update tests
Diffstat (limited to 'data/templates')
| -rw-r--r-- | data/templates/default.latex | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/data/templates/default.latex b/data/templates/default.latex index 8cd64b866..11726c0e3 100644 --- a/data/templates/default.latex +++ b/data/templates/default.latex @@ -1,5 +1,5 @@ % Options for packages loaded elsewhere -\PassOptionsToPackage{unicode=true$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref} +\PassOptionsToPackage{unicode$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref} \PassOptionsToPackage{hyphens}{url} $if(colorlinks)$ \PassOptionsToPackage{dvipsnames,svgnames*,x11names*}{xcolor} @@ -100,7 +100,7 @@ $endif$ \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provides euro and other symbols -\else % if luatex or xelatex +\else % if luatex or xetex $if(mathspec)$ \ifxetex \usepackage{mathspec} @@ -267,6 +267,10 @@ $if(graphics)$ % margins by default, and it is still possible to overwrite the defaults % using explicit options in \includegraphics[width, height, ...]{} \setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio} +% Set default figure placement to htbp +\makeatletter +\def\fps@figure{htbp} +\makeatother $endif$ $if(links-as-notes)$ % Make links footnotes instead of hotlinks: @@ -304,11 +308,6 @@ $if(pagestyle)$ \pagestyle{$pagestyle$} $endif$ -% Set default figure placement to htbp -\makeatletter -\def\fps@figure{htbp} -\makeatother - $for(header-includes)$ $header-includes$ $endfor$ |