Merge pull request #60 from yihui/patch-1

upquote must be used after fontenc
This commit is contained in:
John MacFarlane 2014-05-06 09:03:58 -07:00
commit 3719269b45

View file

@ -14,7 +14,6 @@ $endif$
\usepackage{amssymb,amsmath} \usepackage{amssymb,amsmath}
\usepackage{ifxetex,ifluatex} \usepackage{ifxetex,ifluatex}
\usepackage{fixltx2e} % provides \textsubscript \usepackage{fixltx2e} % provides \textsubscript
\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
\usepackage{lmodern} \usepackage{lmodern}
\ifxetex \ifxetex
\usepackage{fontspec,xltxtra,xunicode} \usepackage{fontspec,xltxtra,xunicode}
@ -33,6 +32,7 @@ $endif$
$endif$ $endif$
\fi \fi
\fi \fi
\IfFileExists{upquote.sty}{\usepackage{upquote}}{}
% use microtype if available % use microtype if available
\IfFileExists{microtype.sty}{\usepackage{microtype}}{} \IfFileExists{microtype.sty}{\usepackage{microtype}}{}
$if(natbib)$ $if(natbib)$