diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-06 23:12:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-06 23:12:26 +0000 |
commit | d9a4092da5a0568ae5fa57b80e8f3e2243547a22 (patch) | |
tree | 2da08b9f459e3dadccac8fc3ad70ef2ea65b96e7 /Master/texmf-dist/tex/latex/fontspec/fontspec.sty | |
parent | ec4155a8b435806195767c2047ab6b3f9f2a1052 (diff) |
fontspec 2.2b (6may12)
git-svn-id: svn://tug.org/texlive/trunk@26230 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.sty | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty index 6b4caf9d773..8d9eae77f22 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty @@ -8,13 +8,13 @@ %% %% _________________________________________ %% The fontspec package for XeLaTeX/LuaLaTeX -%% (C) 2004--2011 Will Robertson and Khaled Hosny +%% (C) 2004--2012 Will Robertson and Khaled Hosny %% %% License information appended. %% %% \ProvidesPackage{fontspec} - [2011/09/18 v2.2a Advanced font selection for XeLaTeX/LuaLaTeX] + [2012/05/06 v2.2b Advanced font selection for XeLaTeX/LuaLaTeX] \RequirePackage{expl3}[2011/09/05] @@ -65,6 +65,11 @@ \cs_generate_variant:Nn \int_set:Nn {Nv} \cs_generate_variant:Nn \tl_gset:Nn {cV} \cs_generate_variant:Nn \keys_set:nn {nx} +\cs_generate_variant:Nn \keys_set_known:nnN {nx} +\cs_new:Nn \_int_mult_truncate:Nn + { + \int_set:Nn #1 { \dim_eval:w #2 #1 \dim_eval_end: } + } \cs_new:Npn \fontspec_error:n { \msg_error:nn {fontspec} } \cs_new:Npn \fontspec_error:nx { \msg_error:nnx {fontspec} } \cs_new:Npn \fontspec_warning:n { \msg_warning:nn {fontspec} } @@ -196,6 +201,11 @@ { The~ "cm-default"~ package~ option~ is~ obsolete. } +\msg_new:nnn {fontspec} {fakebold-only-xetex} +{ + The~ "FakeBold"~ and~ "AutoFakeBold"~ options~ are~ only~ available~ with~ XeLaTeX.\\ + Option~ ignored. +} \msg_new:nnn {fontspec} {defining-font} { Font~ family~'\l_fontspec_family_tl'~ created~ for~ font~ '#2'~ @@ -256,11 +266,11 @@ \ExecuteOptions{config,math} \ProcessOptions* \RequirePackage{fontspec-patches} -\luatex_if_engine:T { \usepackage{fontspec-luatex} \endinput } -\xetex_if_engine:T { \usepackage{fontspec-xetex} \endinput } +\luatex_if_engine:T { \RequirePackage{fontspec-luatex} \endinput } +\xetex_if_engine:T { \RequirePackage{fontspec-xetex} \endinput } %% -%% Copyright 2004--2011 Will Robertson <wspr81@gmail.com> -%% Copyright 2009--2010 Khaled Hosny <khaledhosny@eglug.org> +%% Copyright 2004--2012 Will Robertson <wspr81@gmail.com> +%% Copyright 2009--2012 Khaled Hosny <khaledhosny@eglug.org> %% %% Distributable under the LaTeX Project Public License, %% version 1.3c or higher (your choice). The latest version of |