summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-09-25 23:13:30 +0000
committerKarl Berry <karl@freefriends.org>2015-09-25 23:13:30 +0000
commit5a520fc41536ed6b179bfa9237a24a465b3bc4b2 (patch)
tree1917fd5596433ba5194a4f9c8a7a995625509471 /Master/texmf-dist/tex/latex/fontspec/fontspec.sty
parentfeeea4e7a34e9ad92bb1e94c5930fc2b5d50228c (diff)
fontspec (25sep15)
git-svn-id: svn://tug.org/texlive/trunk@38461 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty9
1 files changed, 6 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index 26b78761823..8f7489564a4 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -14,10 +14,10 @@
%%
%%
\ProvidesPackage{fontspec}
- [2015/07/22 v2.4d Font selection for XeLaTeX and LuaLaTeX]
+ [2015/09/24 v2.4e Font selection for XeLaTeX and LuaLaTeX]
-\RequirePackage{expl3}[2011/09/05]
+\RequirePackage{expl3}[2015/06/26]
\RequirePackage{xparse}
\ExplSyntaxOn
\cs_if_exist:NF \lua_now_x:n
@@ -35,7 +35,7 @@
\luatex_if_engine:TF
{
\RequirePackage{luaotfload}[2013/05/20]
- \RequireLuaModule{fontspec}
+ \directlua{require("fontspec")}
}
{
\msg_fatal:nn {fontspec} {cannot-use-pdftex}
@@ -70,6 +70,9 @@
\cs_generate_variant:Nn \int_set:Nn {Nv}
\cs_generate_variant:Nn \keys_set:nn {nx}
\cs_generate_variant:Nn \keys_set_known:nnN {nx}
+\cs_generate_variant:Nn \tl_if_empty:nTF {x}
+\cs_generate_variant:Nn \tl_if_empty:nTF {x}
+\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
\cs_new:Nn \__fontspec_int_mult_truncate:Nn
{
\int_set:Nn #1 { \__dim_eval:w #2 #1 \__dim_eval_end: }