Merge pull request #243 from jGleitz/fix-fontspec-option-clash

Fix fontspec option clash
This commit is contained in:
Matthias Vogelgesang 2016-11-20 05:57:27 -08:00 committed by GitHub
commit 72fddbd72b
1 changed files with 5 additions and 1 deletions

View File

@ -45,7 +45,11 @@
% %
% \begin{macrocode} % \begin{macrocode}
\ifboolexpr{bool {xetex} or bool {luatex}}{ \ifboolexpr{bool {xetex} or bool {luatex}}{
\RequirePackage[no-math]{fontspec} \@ifpackageloaded{fontspec}{
\PassOptionsToPackage{no-math}{fontspec}
}{
\RequirePackage[no-math]{fontspec}
}
% \end{macrocode} % \end{macrocode}
% %
% \begin{macro}{\checkfont} % \begin{macro}{\checkfont}