summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-01 23:06:16 +0000
committerKarl Berry <karl@freefriends.org>2016-02-01 23:06:16 +0000
commit61ebb8b69624b4931744ae78792435da9cfdf4c9 (patch)
tree1ac78806e589a4e2e2c0e326b2b5a642b1f1d0f0 /Master/texmf-dist/source/latex/fontspec/fontspec.dtx
parent56ded4aa6c33b2ea2dedafe929e2069ed9f6d008 (diff)
fontspec (2feb16)
git-svn-id: svn://tug.org/texlive/trunk@39541 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fontspec/fontspec.dtx')
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec.dtx25
1 files changed, 12 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index 45c1019930c..8f2e1d796eb 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -78,7 +78,7 @@ And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
%<fontspec&xetexx>\ProvidesExplPackage{fontspec-xetex}%
%<fontspec&luatex>\ProvidesExplPackage{fontspec-luatex}%
%<*fontspec>
- {2016/01/30}{2.5}{Font selection for XeLaTeX and LuaLaTeX}
+ {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
%</fontspec>
%
%<*driver>
@@ -115,22 +115,21 @@ And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
% For Lua\TeX, load \pkg{luaotfload}.
% \begin{macrocode}
%<*load>
+\sys_if_engine_luatex:T
+ { \RequirePackage{luaotfload}
+ \directlua{require("fontspec")}
+ \RequirePackageWithOptions{fontspec-luatex} \endinput }
+\sys_if_engine_xetex:T
+ { \RequirePackageWithOptions{fontspec-xetex} \endinput }
+% \end{macrocode}
+% If not one of the above, error:
+% \begin{macrocode}
\msg_new:nnn {fontspec} {cannot-use-pdftex}
{
- The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX~ to~ function.\\\\
+ The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\
You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~ "xelatex"~ or~ "lualatex" instead~ of~ plain~ "latex"~ or~ "pdflatex".
}
-\sys_if_engine_xetex:F
- {
- \sys_if_engine_luatex:F { \msg_fatal:nn {fontspec} {cannot-use-pdftex} }
- }
-\sys_if_engine_luatex:T
- {
- \RequirePackage{luaotfload}[2013/05/20]
- \directlua{require("fontspec")}
- }
-\sys_if_engine_luatex:T { \RequirePackageWithOptions{fontspec-luatex} }
-\sys_if_engine_xetex:T { \RequirePackageWithOptions{fontspec-xetex} }
+\msg_fatal:nn {fontspec} {cannot-use-pdftex}
\endinput
%</load>
% \end{macrocode}