From eccd10e4fe7f75163ac2a0104e8172e3fa056a60 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
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
---
 .../texmf-dist/tex/latex/fontspec/fontspec-xetex.sty   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty')

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 <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,
-- 
cgit v1.2.3

