2 files changed, 8 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
index c62437b3a26..3a3e4751e28 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-patches.sty
@@ -14,7 +14,7 @@
 %% 
 %% 
 \ProvidesPackage{fontspec-patches}
-  [2010/09/27 v2.1a Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2010/09/29 v2.1b Advanced font selection for XeLaTeX/LuaLaTeX]
 
 
 \ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index 7a1e55d7530..776a3d449da 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -14,7 +14,7 @@
 %% 
 %% 
 \ProvidesPackage{fontspec}
-  [2010/09/27 v2.1a Advanced font selection for XeLaTeX/LuaLaTeX]
+  [2010/09/29 v2.1b Advanced font selection for XeLaTeX/LuaLaTeX]
 
 
 \RequirePackage{expl3,xparse}
@@ -706,7 +706,8 @@
     \tl_gset:cx {zf@family@fontname\zf@family} {#2}
     \tl_gset:cx {zf@family@options\zf@family} {\g_fontspec_default_fontopts_tl #1}
     \tl_gset:cx {zf@family@fontdef\zf@family} {
-      \fontspec_fullname:n {\l_fontspec_fontname_tl} : \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist
+      \fontspec_fullname:n {\l_fontspec_fontname_tl} :
+        \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist
     }
     \tl_gset:cV {g_fontspec_script_num_(\zf@family)_tl} \l_fontspec_script_int
     \tl_gset:cV {g_fontspec_lang_num_(\zf@family)_tl} \l_fontspec_language_int
@@ -843,7 +844,7 @@
       <-> \l_fontspec_scale_tl
       \fontspec_fontwrap:n {
         \fontspec_fullname:n {\l_fontspec_fontname_tl} :
-          \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist #1
+          \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist #1
       }
     }
   }
@@ -862,7 +863,7 @@
         <\l_fontspec_size_tl> \l_fontspec_scale_tl
         \fontspec_fontwrap:n {
           \fontspec_fullname:n { \l_fontspec_sizedfont_tl }
-          : \l_fontspec_pre_feat_tl \l_fontspec_rawfeatures_sclist #1
+          : \l_fontspec_pre_feat_sclist \l_fontspec_rawfeatures_sclist #1
         }
       }
 
@@ -881,7 +882,7 @@
     }
   }
 }
-\xetex_or_luatex:nnn { \tl_set:Nn \l_fontspec_pre_feat_tl }
+\xetex_or_luatex:nnn { \tl_set:Nn \l_fontspec_pre_feat_sclist }
   {
     \ifzf@icu
       \tl_if_empty:NF \l_fontspec_script_tl
@@ -986,11 +987,7 @@
 \cs_set_eq:NN \sclist_new:N \tl_new:N
 \cs_set_eq:NN \sclist_clear:N \tl_clear:N
 \cs_new:Npn \sclist_gput_right:Nn #1#2 {
-  \tl_if_empty:NTF #1 {
-    \tl_gset:Nn #1 {#2}
-  }{
-    \tl_gput_right:Nn #1 {;#2}
-  }
+  \tl_gput_right:Nn #1 {#2;}
 }
 \cs_generate_variant:Nn \sclist_gput_right:Nn {Nx}
 \cs_new:Nn \fontspec_update_featstr:n {