fontspec (22jul15)

git-svn-id: svn://tug.org/texlive/trunk@37926 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 11 deletions

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 <wspr81@gmail.com>
+Copyright 2004--2015 Will Robertson <wspr81@gmail.com>
 Copyright 2009--2013   Khaled Hosny <khaledhosny@eglug.org>
 
 Distributable under the LaTeX Project Public License,
@@ -93,7 +93,7 @@ This work consists of this file fontspec.dtx
 %<fontspec&luatex>\ProvidesPackage{fontspec-luatex}
 %<patches>\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]
 %</fontspec|patches>
 %
 %<*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}
     {