fontspec (9nov17)

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

4 files changed, 133 insertions, 134 deletions

diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index 6e2c8103c2b..3a9e2cd6ab3 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -4,28 +4,28 @@
 %%
 %% The original source files were:
 %%
-%% fontspec.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-code-load.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-vars.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-msg.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-opening.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-fontload.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-interfaces.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-user.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-api.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-internal.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-opentype.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-graphite.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-keyval.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-feat-opentype.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-scripts.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-lang.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-feat-aat.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-enc.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-math.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-closing.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-xfss.dtx  (with options: `fontspec,LU,luatex')
-%% fontspec-patches.dtx  (with options: `fontspec,LU,luatex')
+%% fontspec.dtx  (with options: `fontspec,LU')
+%% fontspec-code-load.dtx  (with options: `fontspec,LU')
+%% fontspec-vars.dtx  (with options: `fontspec,LU')
+%% fontspec-msg.dtx  (with options: `fontspec,LU')
+%% fontspec-opening.dtx  (with options: `fontspec,LU')
+%% fontspec-fontload.dtx  (with options: `fontspec,LU')
+%% fontspec-interfaces.dtx  (with options: `fontspec,LU')
+%% fontspec-user.dtx  (with options: `fontspec,LU')
+%% fontspec-api.dtx  (with options: `fontspec,LU')
+%% fontspec-internal.dtx  (with options: `fontspec,LU')
+%% fontspec-opentype.dtx  (with options: `fontspec,LU')
+%% fontspec-graphite.dtx  (with options: `fontspec,LU')
+%% fontspec-keyval.dtx  (with options: `fontspec,LU')
+%% fontspec-feat-opentype.dtx  (with options: `fontspec,LU')
+%% fontspec-scripts.dtx  (with options: `fontspec,LU')
+%% fontspec-lang.dtx  (with options: `fontspec,LU')
+%% fontspec-feat-aat.dtx  (with options: `fontspec,LU')
+%% fontspec-enc.dtx  (with options: `fontspec,LU')
+%% fontspec-math.dtx  (with options: `fontspec,LU')
+%% fontspec-closing.dtx  (with options: `fontspec,LU')
+%% fontspec-xfss.dtx  (with options: `fontspec,LU')
+%% fontspec-patches.dtx  (with options: `fontspec,LU')
 %% ------------------------------------------------
 %% The FONTSPEC package  <wspr.io/fontspec>
 %% ------------------------------------------------
@@ -40,7 +40,7 @@
 
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec-luatex}%
-  {2017/11/05}{2.6f}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/11/09}{2.6g}{Font selection for XeLaTeX and LuaLaTeX}
 
 %%^^A%%  fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
 %%^^A%%  fontspec-vars.dtx -- part of FONTSPEC <wspr.io/fontspec>
@@ -116,9 +116,9 @@
 \tl_new:N \l_fontspec_renderer_tl
 \tl_new:N \l_fontspec_fontname_tl
 \tl_new:N \l_fontspec_defined_shapes_tl
-\tl_new:N \UTFencname
-\tl_new:N \cyrillicencoding
-\tl_new:N \latinencoding
+\tl_clear_new:N \UTFencname
+\tl_clear_new:N \cyrillicencoding
+\tl_clear_new:N \latinencoding
 \tl_new:N \g__fontspec_single_feat_tl
 \tl_new:N \l__fontspec_tmp_tl
 \tl_new:N \l__fontspec_size_tl
@@ -142,11 +142,6 @@
 \tl_new:N \g__fontspec_curr_series_tl
 \tl_new:N \l__fontspec_options_tl
 \tl_new:N \l__fontspec_fontname_tl
-\tl_new:N \l__fontspec_rawfeatures_sclist
-\tl_new:N \l__fontspec_pre_feat_sclist
-\tl_new:N \g__fontspec_rmfamily_family
-\tl_new:N \g__fontspec_sffamily_family
-\tl_new:N \g__fontspec_ttfamily_family
 \tl_new:N \g__fontspec_mathrm_tl
 \tl_new:N \g__fontspec_bfmathrm_tl
 \tl_new:N \g__fontspec_mathsf_tl
@@ -175,6 +170,11 @@
 \tl_new:N  \l__fontspec_postadjust_tl
 \tl_new:N  \g__fontspec_postadjust_tl
 \tl_set:Nn \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl }
+\tl_new:N \l__fontspec_rawfeatures_sclist
+\tl_new:N \l__fontspec_pre_feat_sclist
+\tl_new:N \g__fontspec_rmfamily_family
+\tl_new:N \g__fontspec_sffamily_family
+\tl_new:N \g__fontspec_ttfamily_family
 
 %%^^A%%  fontspec-msg.dtx -- part of FONTSPEC <wspr.io/fontspec>
 \cs_new:Npn \__fontspec_error:n     { \msg_error:nn     {fontspec} }
@@ -199,10 +199,6 @@
   \exp_not:N#1can only be used in the second argument
   to \string\DeclareUnicodeEncoding.
  }
-\__fontspec_msg_new:nnn {fontspec} {only-import-tu}
- {
-  The "\string\ImportEncoding" command can only take "TU" as an argument at this stage.
- }
 \__fontspec_msg_new:nnn {fontspec} {no-size-info}
  {
   Size information must be supplied.\\
@@ -642,14 +638,14 @@
 
 %%^^A%%  fontspec-user.dtx -- part of FONTSPEC <wspr.io/fontspec>
 
-\cs_set:Nn \__fontspec_main_fontspec:nn
+\cs_new:Nn \__fontspec_main_fontspec:nn
  {
   \fontspec_set_family:Nnn \f@family {#1} {#2}
   \fontencoding { \l__fontspec_nfss_enc_tl }
   \selectfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setmainfont:nn
+\cs_new:Nn \__fontspec_main_setmainfont:nn
  {
   \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1} {#2}
   \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family
@@ -666,7 +662,7 @@
   \normalfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setsansfont:nn
+\cs_new:Nn \__fontspec_main_setsansfont:nn
  {
   \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1} {#2}
   \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family
@@ -683,7 +679,7 @@
   \normalfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setmonofont:nn
+\cs_new:Nn \__fontspec_main_setmonofont:nn
  {
   \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1} {#2}
   \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family
@@ -700,22 +696,22 @@
   \normalfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setmathrm:nn
+\cs_new:Nn \__fontspec_main_setmathrm:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {Renderer=Basic,#1} {#2}
     \__fontspec_setmathrm_hook:nn {#1} {#2}
   }
-\cs_set:Nn \__fontspec_main_setboldmathrm:nn
+\cs_new:Nn \__fontspec_main_setboldmathrm:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_bfmathrm_tl {Renderer=Basic,#1} {#2}
     \__fontspec_setboldmathrm_hook:nn {#1} {#2}
   }
-\cs_set:Nn \__fontspec_main_setmathsf:nn
+\cs_new:Nn \__fontspec_main_setmathsf:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {Renderer=Basic,#1} {#2}
     \__fontspec_setmathsf_hook:nn {#1} {#2}
   }
-\cs_set:Nn \__fontspec_main_setmathtt:nn
+\cs_new:Nn \__fontspec_main_setmathtt:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {Renderer=Basic,#1} {#2}
     \__fontspec_setmathtt_hook:nn {#1} {#2}
@@ -734,7 +730,7 @@
 \tl_set:Nn \g__fontspec_mathrm_tl {\rmdefault}
 \tl_set:Nn \g__fontspec_mathsf_tl {\sfdefault}
 \tl_set:Nn \g__fontspec_mathtt_tl {\ttdefault}
-\cs_set:Nn \__fontspec_main_newfontfamily:nnn
+\cs_new:Nn \__fontspec_main_newfontfamily:nnn
  {
   \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3}
   \use:x
@@ -747,11 +743,11 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_main_newfontface:nnn
+\cs_new:Nn \__fontspec_main_newfontface:nnn
  {
   \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
  }
-\cs_set:Nn \__fontspec_main_defaultfontfeatures:nnn
+\cs_new:Nn \__fontspec_main_defaultfontfeatures:nnn
   {
     \IfNoValueTF {#2}
      { \__fontspec_set_default_features:nn {#1} {#3} }
@@ -785,7 +781,7 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_main_addfontfeatures:n
+\cs_new:Nn \__fontspec_main_addfontfeatures:n
  {
   \fontspec_if_fontspec_font:TF
    {
@@ -807,7 +803,7 @@
    }
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_newfontfeature:nn
+\cs_new:Nn \__fontspec_main_newfontfeature:nn
  {
   \keys_define:nn { fontspec }
    {
@@ -817,7 +813,7 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_main_newAATfeature:nnnn
+\cs_new:Nn \__fontspec_main_newAATfeature:nnnn
  {
   \keys_if_exist:nnF { fontspec } {#1}
     { \__fontspec_define_aat_feature_group:n {#1} }
@@ -827,7 +823,7 @@
 
   \__fontspec_define_aat_feature:nnnn {#1}{#2}{#3}{#4}
  }
-\cs_set:Nn \__fontspec_main_newopentypefeature:nnn
+\cs_new:Nn \__fontspec_main_newopentypefeature:nnn
  {
   \keys_if_exist:nnF { fontspec / options } {#1}
     { \__fontspec_define_opentype_feature_group:n {#1} }
@@ -843,7 +839,7 @@
   {
     \str_case:nnF {#1} { {+} {#2} {-} {#2} } {#1#2}
   }
-\cs_set:Nn \__fontspec_main_aliasfontfeature:nn
+\cs_new:Nn \__fontspec_main_aliasfontfeature:nn
  {
   \bool_set_false:N \l__fontspec_alias_bool
 
@@ -860,7 +856,7 @@
   \bool_if:NF \l__fontspec_alias_bool
     { \__fontspec_warning:nx {rename-feature-not-exist} {#1} }
  }
-\cs_set:Nn \__fontspec_main_aliasfontfeatureoption:nnn
+\cs_new:Nn \__fontspec_main_aliasfontfeatureoption:nnn
  {
   \bool_set_false:N \l__fontspec_alias_bool
 
@@ -889,13 +885,13 @@
   \bool_if:NF \l__fontspec_alias_bool
     { \__fontspec_warning:nx {rename-feature-not-exist} {#1/#2} }
  }
-\cs_set:Nn \__fontspec_main_DeclareFontsExtensions:n
+\cs_new:Nn \__fontspec_main_DeclareFontsExtensions:n
  {
   \clist_set:Nn \l__fontspec_extensions_clist { #1 }
   \tl_remove_all:Nn \l__fontspec_extensions_clist {~}
  }
 \DeclareFontsExtensions{.otf,.ttf,.OTF,.TTF,.ttc,.TTC,.dfont}
-\cs_set:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn
+\cs_new:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn
   {
     \__fontspec_if_font_feature:nTF {#1} {#2} {#3}
   }
@@ -1256,13 +1252,13 @@
      { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } {} } {\f@size pt}
   \l_fontspec_font % this is necessary for LuaLaTeX to check the scripts properly
  }
-\cs_set:Nn \__fontspec_construct_font_call:nnnnnn
+\cs_new:Nn \__fontspec_construct_font_call:nnnnnn
  {
   " \__fontspec_fontname_wrap:n { #1 #2 } #3
     #4 #5
     \str_if_eq_x:nnF {#6}{} {:#6} "
  }
-\cs_set:Nn \__fontspec_construct_font_call:nn
+\cs_new:Nn \__fontspec_construct_font_call:nn
  {
   \__fontspec_construct_font_call:nnnnnn
     {#1}
@@ -1310,7 +1306,7 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_get_features:Nn
+\cs_new:Nn \__fontspec_get_features:Nn
  {
   \__fontspec_init_fontface:
   \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2}
@@ -1420,7 +1416,7 @@
   \fontspec_complete_fontname:Nn \l__fontspec_curr_fontname_tl {#3}
   \__fontspec_make_font_shapes:Nnnnn \l__fontspec_curr_fontname_tl {#1} {#2} {#4} {#5}
  }
-\cs_set:Nn \fontspec_complete_fontname:Nn
+\cs_new:Nn \fontspec_complete_fontname:Nn
  {
   \tl_set:Nx #1 {#2}
   \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl}
@@ -1632,7 +1628,7 @@
     language = \l_fontspec_lang_tl   ;
    }
  }
-\cs_set:Nn \__fontspec_make_smallcaps:TF
+\cs_new:Nn \__fontspec_make_smallcaps:TF
  {
   \__fontspec_check_ot_feat:NnTF \l_fontspec_font {smcp} {#1} {#2}
  }
@@ -1680,7 +1676,7 @@
     \tl_clear:N \l__fontspec_wordspace_adjust_tl
     \tl_clear:N \l__fontspec_punctspace_adjust_tl
   }
-\cs_set:Nn \__fontspec_iv_str_to_num:Nn
+\cs_new:Nn \__fontspec_iv_str_to_num:Nn
   {
     \__fontspec_strip_leading_sign:Nw #1#2 \q_nil
   }
@@ -3451,7 +3447,7 @@
  {
   \bool_set_false:N \g__fontspec_pkg_euler_loaded_bool
  }
-\cs_set:Nn \fontspec_setup_maths:
+\cs_new:Nn \fontspec_setup_maths:
  {
   \@ifpackageloaded{euler}
    {
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index 39c0e81ba85..5211738902a 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -4,28 +4,28 @@
 %%
 %% The original source files were:
 %%
-%% fontspec.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-code-load.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-vars.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-msg.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-opening.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-fontload.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-interfaces.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-user.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-api.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-internal.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-opentype.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-graphite.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-keyval.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-feat-opentype.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-scripts.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-lang.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-feat-aat.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-enc.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-math.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-closing.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-xfss.dtx  (with options: `fontspec,XE,xetexx')
-%% fontspec-patches.dtx  (with options: `fontspec,XE,xetexx')
+%% fontspec.dtx  (with options: `fontspec,XE')
+%% fontspec-code-load.dtx  (with options: `fontspec,XE')
+%% fontspec-vars.dtx  (with options: `fontspec,XE')
+%% fontspec-msg.dtx  (with options: `fontspec,XE')
+%% fontspec-opening.dtx  (with options: `fontspec,XE')
+%% fontspec-fontload.dtx  (with options: `fontspec,XE')
+%% fontspec-interfaces.dtx  (with options: `fontspec,XE')
+%% fontspec-user.dtx  (with options: `fontspec,XE')
+%% fontspec-api.dtx  (with options: `fontspec,XE')
+%% fontspec-internal.dtx  (with options: `fontspec,XE')
+%% fontspec-opentype.dtx  (with options: `fontspec,XE')
+%% fontspec-graphite.dtx  (with options: `fontspec,XE')
+%% fontspec-keyval.dtx  (with options: `fontspec,XE')
+%% fontspec-feat-opentype.dtx  (with options: `fontspec,XE')
+%% fontspec-scripts.dtx  (with options: `fontspec,XE')
+%% fontspec-lang.dtx  (with options: `fontspec,XE')
+%% fontspec-feat-aat.dtx  (with options: `fontspec,XE')
+%% fontspec-enc.dtx  (with options: `fontspec,XE')
+%% fontspec-math.dtx  (with options: `fontspec,XE')
+%% fontspec-closing.dtx  (with options: `fontspec,XE')
+%% fontspec-xfss.dtx  (with options: `fontspec,XE')
+%% fontspec-patches.dtx  (with options: `fontspec,XE')
 %% ------------------------------------------------
 %% The FONTSPEC package  <wspr.io/fontspec>
 %% ------------------------------------------------
@@ -40,7 +40,7 @@
 
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec-xetex}%
-  {2017/11/05}{2.6f}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/11/09}{2.6g}{Font selection for XeLaTeX and LuaLaTeX}
 
 %%^^A%%  fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
 %%^^A%%  fontspec-vars.dtx -- part of FONTSPEC <wspr.io/fontspec>
@@ -116,9 +116,9 @@
 \tl_new:N \l_fontspec_renderer_tl
 \tl_new:N \l_fontspec_fontname_tl
 \tl_new:N \l_fontspec_defined_shapes_tl
-\tl_new:N \UTFencname
-\tl_new:N \cyrillicencoding
-\tl_new:N \latinencoding
+\tl_clear_new:N \UTFencname
+\tl_clear_new:N \cyrillicencoding
+\tl_clear_new:N \latinencoding
 \tl_new:N \g__fontspec_single_feat_tl
 \tl_new:N \l__fontspec_tmp_tl
 \tl_new:N \l__fontspec_size_tl
@@ -142,11 +142,6 @@
 \tl_new:N \g__fontspec_curr_series_tl
 \tl_new:N \l__fontspec_options_tl
 \tl_new:N \l__fontspec_fontname_tl
-\tl_new:N \l__fontspec_rawfeatures_sclist
-\tl_new:N \l__fontspec_pre_feat_sclist
-\tl_new:N \g__fontspec_rmfamily_family
-\tl_new:N \g__fontspec_sffamily_family
-\tl_new:N \g__fontspec_ttfamily_family
 \tl_new:N \g__fontspec_mathrm_tl
 \tl_new:N \g__fontspec_bfmathrm_tl
 \tl_new:N \g__fontspec_mathsf_tl
@@ -175,6 +170,11 @@
 \tl_new:N  \l__fontspec_postadjust_tl
 \tl_new:N  \g__fontspec_postadjust_tl
 \tl_set:Nn \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl }
+\tl_new:N \l__fontspec_rawfeatures_sclist
+\tl_new:N \l__fontspec_pre_feat_sclist
+\tl_new:N \g__fontspec_rmfamily_family
+\tl_new:N \g__fontspec_sffamily_family
+\tl_new:N \g__fontspec_ttfamily_family
 
 %%^^A%%  fontspec-msg.dtx -- part of FONTSPEC <wspr.io/fontspec>
 \cs_new:Npn \__fontspec_error:n     { \msg_error:nn     {fontspec} }
@@ -199,10 +199,6 @@
   \exp_not:N#1can only be used in the second argument
   to \string\DeclareUnicodeEncoding.
  }
-\__fontspec_msg_new:nnn {fontspec} {only-import-tu}
- {
-  The "\string\ImportEncoding" command can only take "TU" as an argument at this stage.
- }
 \__fontspec_msg_new:nnn {fontspec} {no-size-info}
  {
   Size information must be supplied.\\
@@ -639,14 +635,14 @@
 
 %%^^A%%  fontspec-user.dtx -- part of FONTSPEC <wspr.io/fontspec>
 
-\cs_set:Nn \__fontspec_main_fontspec:nn
+\cs_new:Nn \__fontspec_main_fontspec:nn
  {
   \fontspec_set_family:Nnn \f@family {#1} {#2}
   \fontencoding { \l__fontspec_nfss_enc_tl }
   \selectfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setmainfont:nn
+\cs_new:Nn \__fontspec_main_setmainfont:nn
  {
   \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1} {#2}
   \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family
@@ -663,7 +659,7 @@
   \normalfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setsansfont:nn
+\cs_new:Nn \__fontspec_main_setsansfont:nn
  {
   \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1} {#2}
   \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family
@@ -680,7 +676,7 @@
   \normalfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setmonofont:nn
+\cs_new:Nn \__fontspec_main_setmonofont:nn
  {
   \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1} {#2}
   \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family
@@ -697,22 +693,22 @@
   \normalfont
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_setmathrm:nn
+\cs_new:Nn \__fontspec_main_setmathrm:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {#1} {#2}
     \__fontspec_setmathrm_hook:nn {#1} {#2}
   }
-\cs_set:Nn \__fontspec_main_setboldmathrm:nn
+\cs_new:Nn \__fontspec_main_setboldmathrm:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_bfmathrm_tl {#1} {#2}
     \__fontspec_setboldmathrm_hook:nn {#1} {#2}
   }
-\cs_set:Nn \__fontspec_main_setmathsf:nn
+\cs_new:Nn \__fontspec_main_setmathsf:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {#1} {#2}
     \__fontspec_setmathsf_hook:nn {#1} {#2}
   }
-\cs_set:Nn \__fontspec_main_setmathtt:nn
+\cs_new:Nn \__fontspec_main_setmathtt:nn
   {
     \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {#1} {#2}
     \__fontspec_setmathtt_hook:nn {#1} {#2}
@@ -731,7 +727,7 @@
 \tl_set:Nn \g__fontspec_mathrm_tl {\rmdefault}
 \tl_set:Nn \g__fontspec_mathsf_tl {\sfdefault}
 \tl_set:Nn \g__fontspec_mathtt_tl {\ttdefault}
-\cs_set:Nn \__fontspec_main_newfontfamily:nnn
+\cs_new:Nn \__fontspec_main_newfontfamily:nnn
  {
   \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3}
   \use:x
@@ -744,11 +740,11 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_main_newfontface:nnn
+\cs_new:Nn \__fontspec_main_newfontface:nnn
  {
   \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
  }
-\cs_set:Nn \__fontspec_main_defaultfontfeatures:nnn
+\cs_new:Nn \__fontspec_main_defaultfontfeatures:nnn
   {
     \IfNoValueTF {#2}
      { \__fontspec_set_default_features:nn {#1} {#3} }
@@ -782,7 +778,7 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_main_addfontfeatures:n
+\cs_new:Nn \__fontspec_main_addfontfeatures:n
  {
   \fontspec_if_fontspec_font:TF
    {
@@ -804,7 +800,7 @@
    }
   \ignorespaces
  }
-\cs_set:Nn \__fontspec_main_newfontfeature:nn
+\cs_new:Nn \__fontspec_main_newfontfeature:nn
  {
   \keys_define:nn { fontspec }
    {
@@ -814,7 +810,7 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_main_newAATfeature:nnnn
+\cs_new:Nn \__fontspec_main_newAATfeature:nnnn
  {
   \keys_if_exist:nnF { fontspec } {#1}
     { \__fontspec_define_aat_feature_group:n {#1} }
@@ -824,7 +820,7 @@
 
   \__fontspec_define_aat_feature:nnnn {#1}{#2}{#3}{#4}
  }
-\cs_set:Nn \__fontspec_main_newopentypefeature:nnn
+\cs_new:Nn \__fontspec_main_newopentypefeature:nnn
  {
   \keys_if_exist:nnF { fontspec / options } {#1}
     { \__fontspec_define_opentype_feature_group:n {#1} }
@@ -840,7 +836,7 @@
   {
     \str_case:nnF {#1} { {+} {#2} {-} {#2} } {#1#2}
   }
-\cs_set:Nn \__fontspec_main_aliasfontfeature:nn
+\cs_new:Nn \__fontspec_main_aliasfontfeature:nn
  {
   \bool_set_false:N \l__fontspec_alias_bool
 
@@ -857,7 +853,7 @@
   \bool_if:NF \l__fontspec_alias_bool
     { \__fontspec_warning:nx {rename-feature-not-exist} {#1} }
  }
-\cs_set:Nn \__fontspec_main_aliasfontfeatureoption:nnn
+\cs_new:Nn \__fontspec_main_aliasfontfeatureoption:nnn
  {
   \bool_set_false:N \l__fontspec_alias_bool
 
@@ -886,13 +882,13 @@
   \bool_if:NF \l__fontspec_alias_bool
     { \__fontspec_warning:nx {rename-feature-not-exist} {#1/#2} }
  }
-\cs_set:Nn \__fontspec_main_DeclareFontsExtensions:n
+\cs_new:Nn \__fontspec_main_DeclareFontsExtensions:n
  {
   \clist_set:Nn \l__fontspec_extensions_clist { #1 }
   \tl_remove_all:Nn \l__fontspec_extensions_clist {~}
  }
 \DeclareFontsExtensions{.otf,.ttf,.OTF,.TTF,.ttc,.TTC,.dfont}
-\cs_set:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn
+\cs_new:Nn \__fontspec_main_IfFontFeatureActiveTF:nnn
   {
     \__fontspec_if_font_feature:nTF {#1} {#2} {#3}
   }
@@ -1252,13 +1248,13 @@
      { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } {} } {\f@size pt}
   \l_fontspec_font % this is necessary for LuaLaTeX to check the scripts properly
  }
-\cs_set:Nn \__fontspec_construct_font_call:nnnnnn
+\cs_new:Nn \__fontspec_construct_font_call:nnnnnn
  {
   " \__fontspec_fontname_wrap:n { #1 #2 #3 }
     #4 #5
     \str_if_eq_x:nnF {#6}{} {:#6} "
  }
-\cs_set:Nn \__fontspec_construct_font_call:nn
+\cs_new:Nn \__fontspec_construct_font_call:nn
  {
   \__fontspec_construct_font_call:nnnnnn
     {#1}
@@ -1306,7 +1302,7 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_get_features:Nn
+\cs_new:Nn \__fontspec_get_features:Nn
  {
   \__fontspec_init_fontface:
   \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2}
@@ -1425,7 +1421,7 @@
   \fontspec_complete_fontname:Nn \l__fontspec_curr_fontname_tl {#3}
   \__fontspec_make_font_shapes:Nnnnn \l__fontspec_curr_fontname_tl {#1} {#2} {#4} {#5}
  }
-\cs_set:Nn \fontspec_complete_fontname:Nn
+\cs_new:Nn \fontspec_complete_fontname:Nn
  {
   \tl_set:Nx #1 {#2}
   \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl}
@@ -1657,11 +1653,11 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_make_ot_smallcaps:TF
+\cs_new:Nn \__fontspec_make_ot_smallcaps:TF
  {
   \__fontspec_check_ot_feat:NnTF \l_fontspec_font {smcp} {#1} {#2}
  }
-\cs_set:Nn \__fontspec_make_smallcaps:TF
+\cs_new:Nn \__fontspec_make_smallcaps:TF
  {
   \bool_if:NTF \l__fontspec_ot_bool
    { \__fontspec_make_ot_smallcaps:TF {#1} {#2} }
@@ -1709,7 +1705,7 @@
     \tl_clear:N \l__fontspec_wordspace_adjust_tl
     \tl_clear:N \l__fontspec_punctspace_adjust_tl
   }
-\cs_set:Nn \__fontspec_iv_str_to_num:Nn
+\cs_new:Nn \__fontspec_iv_str_to_num:Nn
   {
     \__fontspec_strip_leading_sign:Nw #1#2 \q_nil
   }
@@ -3717,7 +3713,7 @@
  {
   \bool_set_false:N \g__fontspec_pkg_euler_loaded_bool
  }
-\cs_set:Nn \fontspec_setup_maths:
+\cs_new:Nn \fontspec_setup_maths:
  {
   \@ifpackageloaded{euler}
    {
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index 5b7d7fc5ad3..0ec857e73ae 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -22,12 +22,12 @@ fontspec          = fontspec or {}
 local fontspec    = fontspec
 fontspec.module   = {
     name          = "fontspec",
-    version       = "2.6f",
-    date          = "2017/11/05",
+    version       = "2.6g",
+    date          = "2017/11/09",
     description   = "Font selection for XeLaTeX and LuaLaTeX",
     author        = "Khaled Hosny, Philipp Gesang, Will Robertson",
     copyright     = "Khaled Hosny, Philipp Gesang, Will Robertson",
-    license       = "LPPL"
+    license       = "LPPL v1.3c"
 }
 
 -- ^^A%%  fontspec-lua.dtx -- part of FONTSPEC <wspr.io/fontspec>
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index d9e3a39a20f..fe459cdbf27 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -20,18 +20,25 @@
 
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec}%
-  {2017/11/05}{2.6f}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/11/09}{2.6g}{Font selection for XeLaTeX and LuaLaTeX}
 
 %%^^A%%  fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
 \sys_if_engine_luatex:T
-  { \RequirePackage{luaotfload}
+  {
+    \RequirePackage{luaotfload}
     \directlua{require("fontspec")}
-    \RequirePackageWithOptions{fontspec-luatex} \endinput }
+    \RequirePackageWithOptions{fontspec-luatex}
+    \endinput
+  }
 \sys_if_engine_xetex:T
-  { \RequirePackageWithOptions{fontspec-xetex}  \endinput }
+  {
+    \RequirePackageWithOptions{fontspec-xetex}
+    \endinput
+  }
 \msg_new:nnn {fontspec} {cannot-use-pdftex}
- {
-  The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\
-  You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~ "xelatex"~ or~ "lualatex" instead~ of~ plain~ "latex"~ or~ "pdflatex".
- }
+  {
+    The~ fontspec~ package~ requires~ either~ XeTeX~ or~ LuaTeX.\\\\
+    You~ must~ change~ your~ typesetting~ engine~ to,~ e.g.,~
+    "xelatex"~ or~ "lualatex" instead~ of~ "latex"~ or~ "pdflatex".
+  }
 \msg_fatal:nn {fontspec} {cannot-use-pdftex}