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)
This commit is contained in:
John MacFarlane 2015-12-03 10:44:33 -08:00
parent 7b66f84b80
commit e5c72caf29
5 changed files with 1 additions and 9 deletions

@ -1 +1 @@
Subproject commit 4407397a7a9e067246500049f70f70a5c144a1c8 Subproject commit 293e847b76eada99c53ca7699ce5b35ded79b9e0

View file

@ -13,7 +13,6 @@
\usepackage{fontspec} \usepackage{fontspec}
\fi \fi
\defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
\newcommand{\euro}{€}
\fi \fi
% use upquote if available, for straight quotes in verbatim environments % use upquote if available, for straight quotes in verbatim environments
\IfFileExists{upquote.sty}{\usepackage{upquote}}{} \IfFileExists{upquote.sty}{\usepackage{upquote}}{}
@ -23,7 +22,6 @@
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{} }{}
\usepackage{hyperref} \usepackage{hyperref}
\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
\hypersetup{unicode=true, \hypersetup{unicode=true,
pdfborder={0 0 0}, pdfborder={0 0 0},
breaklinks=true} breaklinks=true}

View file

@ -13,7 +13,6 @@
\usepackage{fontspec} \usepackage{fontspec}
\fi \fi
\defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
\newcommand{\euro}{€}
\fi \fi
% use upquote if available, for straight quotes in verbatim environments % use upquote if available, for straight quotes in verbatim environments
\IfFileExists{upquote.sty}{\usepackage{upquote}}{} \IfFileExists{upquote.sty}{\usepackage{upquote}}{}
@ -23,7 +22,6 @@
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{} }{}
\usepackage{hyperref} \usepackage{hyperref}
\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
\hypersetup{unicode=true, \hypersetup{unicode=true,
pdfborder={0 0 0}, pdfborder={0 0 0},
breaklinks=true} breaklinks=true}

View file

@ -13,7 +13,6 @@
\usepackage{fontspec} \usepackage{fontspec}
\fi \fi
\defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
\newcommand{\euro}{€}
\fi \fi
% use upquote if available, for straight quotes in verbatim environments % use upquote if available, for straight quotes in verbatim environments
\IfFileExists{upquote.sty}{\usepackage{upquote}}{} \IfFileExists{upquote.sty}{\usepackage{upquote}}{}
@ -23,7 +22,6 @@
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{} }{}
\usepackage{hyperref} \usepackage{hyperref}
\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
\hypersetup{unicode=true, \hypersetup{unicode=true,
pdftitle={Pandoc Test Suite}, pdftitle={Pandoc Test Suite},
pdfauthor={John MacFarlane; Anonymous}, pdfauthor={John MacFarlane; Anonymous},

View file

@ -13,7 +13,6 @@
\usepackage{fontspec} \usepackage{fontspec}
\fi \fi
\defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase} \defaultfontfeatures{Ligatures=TeX,Scale=MatchLowercase}
\newcommand{\euro}{€}
\fi \fi
% use upquote if available, for straight quotes in verbatim environments % use upquote if available, for straight quotes in verbatim environments
\IfFileExists{upquote.sty}{\usepackage{upquote}}{} \IfFileExists{upquote.sty}{\usepackage{upquote}}{}
@ -23,7 +22,6 @@
\UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts
}{} }{}
\usepackage{hyperref} \usepackage{hyperref}
\PassOptionsToPackage{usenames,dvipsnames}{color} % color is loaded by hyperref
\hypersetup{unicode=true, \hypersetup{unicode=true,
pdfborder={0 0 0}, pdfborder={0 0 0},
breaklinks=true} breaklinks=true}