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 /test | |
| 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 'test')
| -rw-r--r-- | test/lhs-test.latex | 9 | ||||
| -rw-r--r-- | test/lhs-test.latex+lhs | 9 | ||||
| -rw-r--r-- | test/writer.latex | 13 | ||||
| -rw-r--r-- | test/writers-lang-and-dir.latex | 9 |
4 files changed, 12 insertions, 28 deletions
diff --git a/test/lhs-test.latex b/test/lhs-test.latex index 9b5d2790a..fe3020054 100644 --- a/test/lhs-test.latex +++ b/test/lhs-test.latex @@ -1,5 +1,5 @@ % Options for packages loaded elsewhere -\PassOptionsToPackage{unicode=true}{hyperref} +\PassOptionsToPackage{unicode}{hyperref} \PassOptionsToPackage{hyphens}{url} % \documentclass[ @@ -11,7 +11,7 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provides euro and other symbols -\else % if luatex or xelatex +\else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase} \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} @@ -91,11 +91,6 @@ \renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} \fi -% Set default figure placement to htbp -\makeatletter -\def\fps@figure{htbp} -\makeatother - \date{} diff --git a/test/lhs-test.latex+lhs b/test/lhs-test.latex+lhs index 0b9f3d1b5..7f0eaf32c 100644 --- a/test/lhs-test.latex+lhs +++ b/test/lhs-test.latex+lhs @@ -1,5 +1,5 @@ % Options for packages loaded elsewhere -\PassOptionsToPackage{unicode=true}{hyperref} +\PassOptionsToPackage{unicode}{hyperref} \PassOptionsToPackage{hyphens}{url} % \documentclass[ @@ -11,7 +11,7 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provides euro and other symbols -\else % if luatex or xelatex +\else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase} \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} @@ -58,11 +58,6 @@ \renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} \fi -% Set default figure placement to htbp -\makeatletter -\def\fps@figure{htbp} -\makeatother - \date{} diff --git a/test/writer.latex b/test/writer.latex index e96c663f8..6db1aa90e 100644 --- a/test/writer.latex +++ b/test/writer.latex @@ -1,5 +1,5 @@ % Options for packages loaded elsewhere -\PassOptionsToPackage{unicode=true}{hyperref} +\PassOptionsToPackage{unicode}{hyperref} \PassOptionsToPackage{hyphens}{url} % \documentclass[ @@ -11,7 +11,7 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provides euro and other symbols -\else % if luatex or xelatex +\else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase} \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} @@ -52,6 +52,10 @@ % 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 \usepackage[normalem]{ulem} % Avoid problems with \sout in headers with hyperref \pdfstringdefDisableCommands{\renewcommand{\sout}{}} @@ -69,11 +73,6 @@ \renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} \fi -% Set default figure placement to htbp -\makeatletter -\def\fps@figure{htbp} -\makeatother - \title{Pandoc Test Suite} \author{John MacFarlane \and Anonymous} diff --git a/test/writers-lang-and-dir.latex b/test/writers-lang-and-dir.latex index d98b79cea..c765f358a 100644 --- a/test/writers-lang-and-dir.latex +++ b/test/writers-lang-and-dir.latex @@ -1,5 +1,5 @@ % Options for packages loaded elsewhere -\PassOptionsToPackage{unicode=true}{hyperref} +\PassOptionsToPackage{unicode}{hyperref} \PassOptionsToPackage{hyphens}{url} % \documentclass[ @@ -12,7 +12,7 @@ \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{textcomp} % provides euro and other symbols -\else % if luatex or xelatex +\else % if luatex or xetex \usepackage{unicode-math} \defaultfontfeatures{Scale=MatchLowercase} \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} @@ -54,11 +54,6 @@ \renewcommand{\subparagraph}[1]{\oldsubparagraph{#1}\mbox{}} \fi -% Set default figure placement to htbp -\makeatletter -\def\fps@figure{htbp} -\makeatother - \ifxetex % Load polyglossia as late as possible: uses bidi with RTL langages (e.g. Hebrew, Arabic) \usepackage{polyglossia} |