From eccd10e4fe7f75163ac2a0104e8172e3fa056a60 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 22 Jul 2015 23:00:57 +0000 Subject: fontspec (22jul15) git-svn-id: svn://tug.org/texlive/trunk@37926 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/fontspec/README | 4 ++++ Master/texmf-dist/doc/latex/fontspec/fontspec.pdf | Bin 1004512 -> 1004365 bytes .../texmf-dist/source/latex/fontspec/fontspec.dtx | 19 ++++++++----------- .../tex/latex/fontspec/fontspec-luatex.sty | 18 ++++++++---------- .../tex/latex/fontspec/fontspec-patches.sty | 6 +++--- .../tex/latex/fontspec/fontspec-xetex.sty | 18 ++++++++---------- Master/texmf-dist/tex/latex/fontspec/fontspec.lua | 4 ++-- Master/texmf-dist/tex/latex/fontspec/fontspec.sty | 7 +++---- 8 files changed, 36 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/fontspec/README b/Master/texmf-dist/doc/latex/fontspec/README index f934a6ea66b..b78f15fc935 100644 --- a/Master/texmf-dist/doc/latex/fontspec/README +++ b/Master/texmf-dist/doc/latex/fontspec/README @@ -67,6 +67,10 @@ Features may be added to the font currently in use with Change history -------------- +- v2.4d (2015/07/22) + + * Rename an internal expl3 function or two. + - v2.4c (2015/03/14) * v2.4b was never released, sorry! diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf index f1ecf195f91..d974f949ed5 100644 Binary files a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf and b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf differ diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx index 3683519f769..172fdc6e71c 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx @@ -23,7 +23,7 @@ _________________________________________ The fontspec package for XeLaTeX/LuaLaTeX - (C) 2004--2014 Will Robertson and Khaled Hosny + (C) 2004--2015 Will Robertson and Khaled Hosny License information appended. @@ -31,7 +31,7 @@ \endpreamble \postamble -Copyright 2004--2014 Will Robertson +Copyright 2004--2015 Will Robertson Copyright 2009--2013 Khaled Hosny Distributable under the LaTeX Project Public License, @@ -93,7 +93,7 @@ This work consists of this file fontspec.dtx %\ProvidesPackage{fontspec-luatex} %\ProvidesPackage{fontspec-patches} %<*fontspec|patches> - [2015/03/14 v2.4c Font selection for XeLaTeX and LuaLaTeX] + [2015/07/22 v2.4d Font selection for XeLaTeX and LuaLaTeX] % % %<*driver> @@ -2834,7 +2834,6 @@ This work consists of this file fontspec.dtx % \begin{macrocode} \cs_generate_variant:Nn \str_if_eq:nnTF {nv} \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} % \end{macrocode} @@ -4278,8 +4277,6 @@ This work consists of this file fontspec.dtx % \begin{macro}{\@@_save_fontinfo:nn} % Saves the relevant font information for future processing. % \begin{macrocode} -\cs_generate_variant:Nn \prop_gput:Nnn {cnV} -\cs_generate_variant:Nn \prop_gput:Nnn {cnx} \cs_new:Nn \@@_save_fontinfo: { \prop_new:c {g_@@_ \l_fontspec_family_tl _prop} @@ -4634,7 +4631,7 @@ This work consists of this file fontspec.dtx \tl_gput_right:Nx \l_fontspec_defined_shapes_tl { \exp_not:n { \\ \\ } - *~ '\exp_not:N \str_case:nnn {#1/#2} + *~ '\exp_not:N \str_case:nnF {#1/#2} { {\mddefault/\updefault} {normal} {\bfdefault/\updefault} {bold} @@ -4644,7 +4641,7 @@ This work consists of this file fontspec.dtx with~ NFSS~ spec.: \exp_not:N \\ \l_@@_nfss_tl \exp_not:n { \\ \\ } - *~ '\exp_not:N \str_case:nnn {#1/\scdefault} + *~ '\exp_not:N \str_case:nnF {#1/\scdefault} { {\mddefault/\scdefault} {small~ caps} {\bfdefault/\scdefault} {bold~ small~ caps} @@ -4783,7 +4780,7 @@ This work consists of this file fontspec.dtx % This is for detecting font families when assigning default features. % Replace defaults for the standard families because they're not set in the usual way: - \exp_args:NV \str_case:nnn {\l_@@_family_label_tl} + \exp_args:NV \str_case:nnF {\l_@@_family_label_tl} { {\rmdefault} { \tl_set:Nn \l_@@_family_label_tl {\g_@@_rmfamily_family} } {\sfdefault} { \tl_set:Nn \l_@@_family_label_tl {\g_@@_sffamily_family} } @@ -5561,7 +5558,7 @@ This work consists of this file fontspec.dtx % \begin{macrocode} \@@_keys_define_code:nnn {fontspec} {Scale} { - \str_case:nnn {#1} + \str_case:nnF {#1} { {MatchLowercase} { \@@_calc_scale:n {5} } {MatchUppercase} { \@@_calc_scale:n {8} } @@ -5671,7 +5668,7 @@ This work consists of this file fontspec.dtx % \begin{macrocode} \@@_keys_define_code:nnn {fontspec} {PunctuationSpace} { - \str_case_x:nnn {#1} + \str_case_x:nnF {#1} { {WordSpace} { diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index d36538320c8..4d0d4aee3a3 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty @@ -8,13 +8,13 @@ %% %% _________________________________________ %% The fontspec package for XeLaTeX/LuaLaTeX -%% (C) 2004--2014 Will Robertson and Khaled Hosny +%% (C) 2004--2015 Will Robertson and Khaled Hosny %% %% License information appended. %% %% \ProvidesPackage{fontspec-luatex} - [2015/03/14 v2.4c Font selection for XeLaTeX and LuaLaTeX] + [2015/07/22 v2.4d Font selection for XeLaTeX and LuaLaTeX] \ExplSyntaxOn @@ -705,8 +705,6 @@ \cs_if_exist:cTF {g__fontspec_ \l_fontspec_family_tl _prop} \prg_return_false: \prg_return_true: } -\cs_generate_variant:Nn \prop_gput:Nnn {cnV} -\cs_generate_variant:Nn \prop_gput:Nnn {cnx} \cs_new:Nn \__fontspec_save_fontinfo: { \prop_new:c {g__fontspec_ \l_fontspec_family_tl _prop} @@ -911,7 +909,7 @@ \tl_gput_right:Nx \l_fontspec_defined_shapes_tl { \exp_not:n { \\ \\ } - *~ '\exp_not:N \str_case:nnn {#1/#2} + *~ '\exp_not:N \str_case:nnF {#1/#2} { {\mddefault/\updefault} {normal} {\bfdefault/\updefault} {bold} @@ -921,7 +919,7 @@ with~ NFSS~ spec.: \exp_not:N \\ \l__fontspec_nfss_tl \exp_not:n { \\ \\ } - *~ '\exp_not:N \str_case:nnn {#1/\scdefault} + *~ '\exp_not:N \str_case:nnF {#1/\scdefault} { {\mddefault/\scdefault} {small~ caps} {\bfdefault/\scdefault} {bold~ small~ caps} @@ -1005,7 +1003,7 @@ % This is for detecting font families when assigning default features. % Replace defaults for the standard families because they're not set in the usual way: - \exp_args:NV \str_case:nnn {\l__fontspec_family_label_tl} + \exp_args:NV \str_case:nnF {\l__fontspec_family_label_tl} { {\rmdefault} { \tl_set:Nn \l__fontspec_family_label_tl {\g__fontspec_rmfamily_family} } {\sfdefault} { \tl_set:Nn \l__fontspec_family_label_tl {\g__fontspec_sffamily_family} } @@ -1409,7 +1407,7 @@ \cs_generate_variant:Nn \tl_if_empty:nTF {x} \__fontspec_keys_define_code:nnn {fontspec} {Scale} { - \str_case:nnn {#1} + \str_case:nnF {#1} { {MatchLowercase} { \__fontspec_calc_scale:n {5} } {MatchUppercase} { \__fontspec_calc_scale:n {8} } @@ -1474,7 +1472,7 @@ } \__fontspec_keys_define_code:nnn {fontspec} {PunctuationSpace} { - \str_case_x:nnn {#1} + \str_case_x:nnF {#1} { {WordSpace} { @@ -2323,7 +2321,7 @@ } \ExplSyntaxOff %% -%% Copyright 2004--2014 Will Robertson +%% Copyright 2004--2015 Will Robertson %% Copyright 2009--2013 Khaled Hosny %% %% Distributable under the LaTeX Project Public License, diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty index 259777fa392..a7acbf1edf7 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty @@ -8,13 +8,13 @@ %% %% _________________________________________ %% The fontspec package for XeLaTeX/LuaLaTeX -%% (C) 2004--2014 Will Robertson and Khaled Hosny +%% (C) 2004--2015 Will Robertson and Khaled Hosny %% %% License information appended. %% %% \ProvidesPackage{fontspec-patches} - [2015/03/14 v2.4c Font selection for XeLaTeX and LuaLaTeX] + [2015/07/22 v2.4d Font selection for XeLaTeX and LuaLaTeX] \ExplSyntaxOn @@ -158,7 +158,7 @@ { \addfontfeature{Numbers=Lining} #1 } } %% -%% Copyright 2004--2014 Will Robertson +%% Copyright 2004--2015 Will Robertson %% Copyright 2009--2013 Khaled Hosny %% %% Distributable under the LaTeX Project Public License, diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index 74500f06cf3..623441ec477 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty @@ -8,13 +8,13 @@ %% %% _________________________________________ %% The fontspec package for XeLaTeX/LuaLaTeX -%% (C) 2004--2014 Will Robertson and Khaled Hosny +%% (C) 2004--2015 Will Robertson and Khaled Hosny %% %% License information appended. %% %% \ProvidesPackage{fontspec-xetex} - [2015/03/14 v2.4c Font selection for XeLaTeX and LuaLaTeX] + [2015/07/22 v2.4d Font selection for XeLaTeX and LuaLaTeX] \ExplSyntaxOn @@ -701,8 +701,6 @@ \cs_if_exist:cTF {g__fontspec_ \l_fontspec_family_tl _prop} \prg_return_false: \prg_return_true: } -\cs_generate_variant:Nn \prop_gput:Nnn {cnV} -\cs_generate_variant:Nn \prop_gput:Nnn {cnx} \cs_new:Nn \__fontspec_save_fontinfo: { \prop_new:c {g__fontspec_ \l_fontspec_family_tl _prop} @@ -930,7 +928,7 @@ \tl_gput_right:Nx \l_fontspec_defined_shapes_tl { \exp_not:n { \\ \\ } - *~ '\exp_not:N \str_case:nnn {#1/#2} + *~ '\exp_not:N \str_case:nnF {#1/#2} { {\mddefault/\updefault} {normal} {\bfdefault/\updefault} {bold} @@ -940,7 +938,7 @@ with~ NFSS~ spec.: \exp_not:N \\ \l__fontspec_nfss_tl \exp_not:n { \\ \\ } - *~ '\exp_not:N \str_case:nnn {#1/\scdefault} + *~ '\exp_not:N \str_case:nnF {#1/\scdefault} { {\mddefault/\scdefault} {small~ caps} {\bfdefault/\scdefault} {bold~ small~ caps} @@ -1026,7 +1024,7 @@ % This is for detecting font families when assigning default features. % Replace defaults for the standard families because they're not set in the usual way: - \exp_args:NV \str_case:nnn {\l__fontspec_family_label_tl} + \exp_args:NV \str_case:nnF {\l__fontspec_family_label_tl} { {\rmdefault} { \tl_set:Nn \l__fontspec_family_label_tl {\g__fontspec_rmfamily_family} } {\sfdefault} { \tl_set:Nn \l__fontspec_family_label_tl {\g__fontspec_sffamily_family} } @@ -1476,7 +1474,7 @@ \cs_generate_variant:Nn \tl_if_empty:nTF {x} \__fontspec_keys_define_code:nnn {fontspec} {Scale} { - \str_case:nnn {#1} + \str_case:nnF {#1} { {MatchLowercase} { \__fontspec_calc_scale:n {5} } {MatchUppercase} { \__fontspec_calc_scale:n {8} } @@ -1541,7 +1539,7 @@ } \__fontspec_keys_define_code:nnn {fontspec} {PunctuationSpace} { - \str_case_x:nnn {#1} + \str_case_x:nnF {#1} { {WordSpace} { @@ -2399,7 +2397,7 @@ } \ExplSyntaxOff %% -%% Copyright 2004--2014 Will Robertson +%% Copyright 2004--2015 Will Robertson %% Copyright 2009--2013 Khaled Hosny %% %% Distributable under the LaTeX Project Public License, diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua index f21529620ca..ea7802ee184 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua @@ -8,7 +8,7 @@ -- -- _________________________________________ -- The fontspec package for XeLaTeX/LuaLaTeX --- (C) 2004--2014 Will Robertson and Khaled Hosny +-- (C) 2004--2015 Will Robertson and Khaled Hosny -- -- License information appended. -- @@ -79,7 +79,7 @@ function fontspec.mathfontdimen(fnt, str) end end -- --- Copyright 2004--2014 Will Robertson +-- Copyright 2004--2015 Will Robertson -- Copyright 2009--2013 Khaled Hosny -- -- Distributable under the LaTeX Project Public License, diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty index 920e4ef5f70..26b78761823 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--2014 Will Robertson and Khaled Hosny +%% (C) 2004--2015 Will Robertson and Khaled Hosny %% %% License information appended. %% %% \ProvidesPackage{fontspec} - [2015/03/14 v2.4c Font selection for XeLaTeX and LuaLaTeX] + [2015/07/22 v2.4d Font selection for XeLaTeX and LuaLaTeX] \RequirePackage{expl3}[2011/09/05] @@ -68,7 +68,6 @@ \cs_set:Npn \use_iv:nnnnn #1#2#3#4#5 {#4} \cs_generate_variant:Nn \str_if_eq:nnTF {nv} \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 \__fontspec_int_mult_truncate:Nn @@ -275,7 +274,7 @@ \luatex_if_engine:T { \RequirePackage{fontspec-luatex} \endinput } \xetex_if_engine:T { \RequirePackage{fontspec-xetex} \endinput } %% -%% Copyright 2004--2014 Will Robertson +%% Copyright 2004--2015 Will Robertson %% Copyright 2009--2013 Khaled Hosny %% %% Distributable under the LaTeX Project Public License, -- cgit v1.2.3