fontspec (12feb19)

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

16 files changed, 283 insertions, 145 deletions

diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-api.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-api.dtx
index 7164cb47a88..09340f273fb 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-api.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-api.dtx
@@ -97,8 +97,8 @@
             \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {lang-num} \l_@@_tmp_tl
             \int_set:Nn \l_@@_language_int {\l_@@_tmp_tl}
 
-            \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
-            \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {lang-tag}    \l_fontspec_lang_tl
+            \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-tag}  \l_@@_script_tl
+            \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {lang-tag}    \l_@@_lang_tl
 
             \@@_check_ot_feat:NnTF \font {#1} {\prg_return_true:} {\prg_return_false:}
           }
@@ -173,7 +173,7 @@
           {
             \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-num} \l_@@_tmp_tl
             \int_set:Nn \l_@@_script_int {\l_@@_tmp_tl}
-            \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
+            \prop_get:cnN {g_@@_fontinfo_ \f@family _prop} {script-tag}  \l_@@_script_tl
 
             \@@_check_lang:NnTF \font {#1} \prg_return_true: \prg_return_false:
           }
@@ -265,15 +265,18 @@
 % variable because the actual \LaTeX\ family name is automatically generated
 % by fontspec and it's easier to keep it that way.
 %    \begin{macrocode}
-\cs_new:Nn \fontspec_set_family:Nnn
+\cs_new:Nn \@@_tl_new_if_free:N { \tl_if_exist:NF #1 { \tl_new:N #1 } }
+\cs_new:Nn \@@_set_family:NnnN
   {
     \tl_set:Nn \l_@@_fontface_cs_tl {\l_fontspec_font} % reset
     \tl_set:Nn \l_@@_family_label_tl {#1}
     \@@_select_font_family:nn {#2} {#3}
-    \tl_if_exist:NF #1 { \tl_new:N #1 }
-    \tl_set_eq:NN #1 \l_fontspec_family_tl
+    \@@_tl_new_if_free:N #1
+    #4 #1 \l_fontspec_family_tl
     \tl_set:Nn \l_@@_fontface_cs_tl {\l_fontspec_font} % reset
   }
+\cs_new:Nn \fontspec_gset_family:Nnn { \@@_set_family:NnnN #1 {#2} {#3} \tl_gset_eq:NN }
+\cs_new:Nn \fontspec_set_family:Nnn  { \@@_set_family:NnnN #1 {#2} {#3} \tl_set_eq:NN  }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -289,14 +292,16 @@
 %    \begin{macrocode}
 \tl_new:N \l_@@_fontface_cs_tl
 \tl_set:Nn \l_@@_fontface_cs_tl {\l_fontspec_font}
-\cs_new:Nn \fontspec_set_fontface:NNnn
+\cs_new:Nn \@@_set_fontface:NNnnN
   {
     \tl_set:Nn \l_@@_fontface_cs_tl {#1}
     \tl_set:Nn \l_@@_family_label_tl {#2}
     \@@_select_font_family:nn {#3} {#4}
-    \tl_set_eq:NN #2 \l_fontspec_family_tl
+    #5 #2 \l_fontspec_family_tl
     \tl_set:Nn \l_@@_fontface_cs_tl {\l_fontspec_font} % reset
   }
+\cs_new:Nn \fontspec_gset_fontface:NNnn { \@@_set_fontface:NNnnN #1 #2 {#3} {#4} \tl_gset_eq:NN }
+\cs_new:Nn \fontspec_set_fontface:NNnn  { \@@_set_fontface:NNnnN #1 #2 {#3} {#4} \tl_set_eq:NN  }
 %    \end{macrocode}
 % \end{macro}
 %
@@ -326,6 +331,8 @@
 %    \begin{macrocode}
 \prg_new_conditional:Nnn \fontspec_if_current_feature:n {TF,T,F}
   {
+%<debug>\typeout{::~fontspec_if_current_feature:n~{#1}}
+%<debug>\typeout{::::~primitive_font_current_name:~=~\@@_primitive_font_current_name:}
     \exp_args:Nxx \tl_if_in:nnTF
       { \@@_primitive_font_current_name: } { \tl_to_str:n {#1} }
       { \prg_return_true: } { \prg_return_false: }
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx
index e210ee1a9f1..aaba25c293d 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx
@@ -449,7 +449,7 @@
               {
 %<debug>\typeout{Script~tag~found:~####1}
                 \tl_set:Nn \l_@@_script_name_tl {#1}
-                \tl_set:Nn \l_fontspec_script_tl {####1}
+                \tl_set:Nn \l_@@_script_tl {####1}
                 \int_set:Nn \l_@@_script_int {\l_@@_strnum_int}
                 \bool_set_true:N \l_@@_scriptlang_exist_bool
                 \tl_gset:Nx \g_@@_single_feat_tl { script=####1 }
@@ -497,11 +497,11 @@
         \bool_set_false:N \l_@@_scriptlang_exist_bool
         \clist_map_inline:nn {#2}
           {
-            \exp_args:No \@@_check_lang:NnTF \l_@@_fontface_cs_tl {#2}
+            \exp_args:No \@@_check_lang:NnTF \l_@@_fontface_cs_tl {####1}
               {
-                \tl_set:Nn \l_fontspec_lang_tl {#2}
+                \tl_set:Nn \l_@@_lang_tl {####1}
                 \int_set:Nn \l_@@_language_int {\l_@@_strnum_int}
-                \tl_gset:Nx \g_@@_single_feat_tl { language=#2 }
+                \tl_gset:Nx \g_@@_single_feat_tl { language=####1 }
                 \bool_set_true:N \l_@@_scriptlang_exist_bool
                 \clist_map_break:
               }
@@ -524,7 +524,7 @@
 %    \begin{macrocode}
 \@@_keys_define_code:nnn {fontspec-opentype} { Language / Default }
   {
-    \tl_set:Nn \l_fontspec_lang_tl {DFLT}
+    \tl_set:Nn \l_@@_lang_tl {DFLT}
     \int_zero:N \l_@@_language_int
     \tl_gset:Nn \g_@@_single_feat_tl { language=DFLT }
   }
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-interfaces.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-interfaces.dtx
index 57bae3bb4d7..2962d2e49d8 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-interfaces.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-interfaces.dtx
@@ -87,28 +87,56 @@
 %    \begin{macrocode}
 \NewDocumentCommand \newfontfamily { m O{} m O{} }
   {
-    \@@_main_newfontfamily:nnnN {#1} {#2,#4} {#3} \NewDocumentCommand
+    \@@_main_newfontfamily:NnnN #1 {#2,#4} {#3} \NewDocumentCommand
   }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
 \NewDocumentCommand \renewfontfamily { m O{} m O{} }
   {
-    \@@_main_newfontfamily:nnnN {#1} {#2,#4} {#3} \RenewDocumentCommand
+    \@@_main_newfontfamily:NnnN #1 {#2,#4} {#3} \RenewDocumentCommand
   }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
 \NewDocumentCommand \setfontfamily { m O{} m O{} }
   {
-    \@@_main_newfontfamily:nnnN {#1} {#2,#4} {#3} \DeclareDocumentCommand
+    \@@_main_newfontfamily:NnnN #1 {#2,#4} {#3} \DeclareDocumentCommand
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewDocumentCommand \providefontfamily { m O{} m O{} }
+  {
+    \@@_main_newfontfamily:NnnN #1 {#2,#4} {#3} \ProvideDocumentCommand
   }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
 \NewDocumentCommand \newfontface { m O{} m O{} }
   {
-    \@@_main_newfontface:nnn {#1} {#2,#4} {#3}
+    \@@_main_newfontface:NnnN #1 {#2,#4} {#3} \NewDocumentCommand
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewDocumentCommand \renewfontface { m O{} m O{} }
+  {
+    \@@_main_newfontface:NnnN #1 {#2,#4} {#3} \RenewDocumentCommand
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewDocumentCommand \setfontface { m O{} m O{} }
+  {
+    \@@_main_newfontface:NnnN #1 {#2,#4} {#3} \DeclareDocumentCommand
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\NewDocumentCommand \providefontface { m O{} m O{} }
+  {
+    \@@_main_newfontface:NnnN #1 {#2,#4} {#3} \ProvideDocumentCommand
   }
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
index 9dcea4f8e0e..a195afa3b16 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
@@ -275,7 +275,7 @@
       {#1}
       \l_@@_extension_tl
       \l_@@_ttc_index_tl
-      \l_fontspec_renderer_tl
+      \l_@@_renderer_tl
       \l_@@_optical_size_tl
       {#2}
   }
@@ -449,8 +449,8 @@
       }
     \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {script-num} \l_@@_script_int
     \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {lang-num}   \l_@@_language_int
-    \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {script-tag} \l_fontspec_script_tl
-    \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {lang-tag}   \l_fontspec_lang_tl
+    \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {script-tag} \l_@@_script_tl
+    \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {lang-tag}   \l_@@_lang_tl
   }
 %    \end{macrocode}
 % \end{macro}
@@ -580,7 +580,7 @@
 		\or
 %<debug>  \typeout{:::: AAT}
 			\bool_set_true:N \l_@@_atsui_bool
-			\tl_if_empty:NT \l_fontspec_renderer_tl { \tl_set:Nn \l_fontspec_renderer_tl {/AAT} }
+			\tl_if_empty:NT \l_@@_renderer_tl { \tl_set:Nn \l_@@_renderer_tl {/AAT} }
 			\ifnum\XeTeXcountvariations #1 > 0\relax
 %<debug>  \typeout{:::: MM}
 				\bool_set_true:N \l_@@_mm_bool
@@ -588,15 +588,15 @@
 		\or
 %<debug>  \typeout{:::: OpenType}
 			\bool_set_true:N \l_@@_ot_bool
-			\tl_if_empty:NT \l_fontspec_renderer_tl { \tl_set:Nn \l_fontspec_renderer_tl {/OT} }
+			\tl_if_empty:NT \l_@@_renderer_tl { \tl_set:Nn \l_@@_renderer_tl {/OT} }
 		\or
 %<debug>  \typeout{:::: Graphite}
 			\bool_set_true:N \l_@@_graphite_bool
-			\tl_if_empty:NT \l_fontspec_renderer_tl { \tl_set:Nn \l_fontspec_renderer_tl {/GR} }
+			\tl_if_empty:NT \l_@@_renderer_tl { \tl_set:Nn \l_@@_renderer_tl {/GR} }
 		\fi
 %</XE>
 %    \end{macrocode}
-% If automatic, the \cmd{\l_fontspec_renderer_tl} token list will still be
+% If automatic, the \cmd{\l_@@_renderer_tl} token list will still be
 % empty (other suffices that could be added will be later in the feature
 % processing), and if it is indeed still empty, assign it a value so that the
 % other weights of the font are specifically loaded with the same renderer.
@@ -923,21 +923,25 @@
   {
     \bool_if:NT \l_@@_ot_bool
       {
-        \tl_if_empty:NF \l_fontspec_script_tl
+        \tl_if_empty:NF \l_@@_script_tl
           {
-            script   = \l_fontspec_script_tl ;
-            language = \l_fontspec_lang_tl   ;
+            script   = \l_@@_script_tl ;
+            language = \l_@@_lang_tl   ;
           }
       }
   }
 %</XE>
 %<*LU>
   {
-    mode     = \l_fontspec_mode_tl   ;
-    \tl_if_empty:NF \l_fontspec_script_tl
+    mode     = \l_@@_mode_tl   ;
+    \tl_if_empty:NF \l_@@_shaper_tl
       {
-        script   = \l_fontspec_script_tl ;
-        language = \l_fontspec_lang_tl   ;
+        shaper = \l_@@_shaper_tl   ;
+      }
+    \tl_if_empty:NF \l_@@_script_tl
+      {
+        script   = \l_@@_script_tl ;
+        language = \l_@@_lang_tl   ;
       }
   }
 %</LU>
@@ -1001,6 +1005,7 @@
         \tl_gremove_all:Nn \g_@@_rawfeatures_sclist {##1;}
       }
   }
+\cs_generate_variant:Nn \@@_remove_clashing_featstr:n {x}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1020,12 +1025,12 @@
     \tl_clear:N \l_@@_font_path_tl
     \tl_clear:N \l_@@_optical_size_tl
     \tl_clear:N \l_@@_ttc_index_tl
-    \tl_clear:N \l_fontspec_renderer_tl
+    \tl_clear:N \l_@@_renderer_tl
     \tl_gclear:N \g_@@_defined_shapes_tl
     \tl_gclear:N \g_@@_curr_series_tl
     \tl_gset_eq:NN \g_@@_nfss_enc_tl \g_fontspec_encoding_tl
 %<*LU>
-    \tl_set:Nn \l_fontspec_mode_tl {node}
+    \tl_set:Nn \l_@@_mode_tl {node}
     \int_set:Nn \prehyphenchar { `\- } % fixme
     \int_zero:N \posthyphenchar        % fixme
     \int_zero:N \preexhyphenchar       % fixme
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx
index fd060cc7810..db10ba9ca70 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx
@@ -91,42 +91,67 @@
 %
 %
 % \paragraph{\feat{Renderer}}
-% This feature must be processed before all others (the other font shape and features options are also pre-parsed for convenience) because the renderer determines the format of the features and even whether certain features are available.
+% This feature must be processed before all others (the other font shape and features
+% options are also pre-parsed for convenience) because the renderer determines the format
+% of the features and whether certain features are available.
 %    \begin{macrocode}
+%<*XE>
 \keys_define:nn {fontspec-renderer}
   {
     Renderer .choices:nn =
-      {AAT,ICU,OpenType,Graphite,Full,Basic}
+      {AAT,ICU,OpenType,Graphite,Full,Basic,Node,Base,Harfbuzz}
       {
         \int_compare:nTF {\l_keys_choice_int <= 4}
           {
-%<*XE>
-            \tl_set:Nx \l_fontspec_renderer_tl
+            \tl_set:Nx \l_@@_renderer_tl
               {
                 \int_case:nn \l_keys_choice_int { 1 {/AAT} 2 {/OT} 3 {/OT} 4 {/GR} }
               }
-%<debug>\typeout{Renderer: \l_fontspec_renderer_tl}
-            \tl_gset:Nx \g_@@_single_feat_tl { \l_fontspec_renderer_tl }
-%</XE>
-%<*LU>
-            \@@_warning:nx {only-xetex-feature} {Renderer=AAT/OpenType/Graphite}
-%</LU>
+%<debug>\typeout{Renderer:~ \l_@@_renderer_tl}
+            \tl_gset:Nx \g_@@_single_feat_tl { \l_@@_renderer_tl }
           }
           {
-%<*XE>
-            \@@_warning:nx {only-luatex-feature} {Renderer=Full/Basic}
+            \@@_warning:nx {only-luatex-feature} {Renderer=Full/Basic/Node/Base/Harfbuzz}
+          }
+      }
+  }
 %</XE>
 %<*LU>
-              \tl_set:Nx \l_fontspec_mode_tl
-                {
-                  \int_case:nn \l_keys_choice_int { 5 {node} 6 {base} }
-                }
-%<debug>\typeout{Mode: \l_fontspec_mode_tl}
-              \tl_gset:Nx \g_@@_single_feat_tl { mode=\l_fontspec_mode_tl }
-%</LU>
+\keys_define:nn {fontspec-renderer}
+  {
+    Renderer .choices:nn =
+      {Full,Node,Basic,Base,Harfbuzz,OpenType,AAT,Graphite}
+      {
+        \int_compare:nTF {\l_keys_choice_int >= 5} { \bool_set_true:N \l_@@_harfbuzz_bool }
+
+        \tl_set:Nx \l_@@_mode_tl
+          {
+            \int_case:nn \l_keys_choice_int { 1 {node} 2 {node} 3 {base} 4 {base} 5 {harf} 6 {harf} 7 {harf} 8 {harf} }
           }
-      }
+
+        \tl_set:Nx \l_@@_shaper_tl
+          {
+            \int_case:nn \l_keys_choice_int { 1 {} 2 {} 3 {} 4 {} 5 {} 6 {ot} 7 {coretext_aat} 8 {graphite2} }
+          }
+
+%<debug>\typeout{Mode:~"\l_@@_mode_tl"~/~Shaper:~"\l_@@_shaper_tl"}
+
+        \tl_gset:Nx \g_@@_single_feat_tl
+          {
+            mode=\l_@@_mode_tl ;
+            \tl_if_empty:NF \l_@@_shaper_tl { shaper=\l_@@_shaper_tl}
+          }
+      } ,
+
+    Renderer unknown .code:n =
+      {
+        \bool_set_true:N \l_@@_harfbuzz_bool
+        \@@_warning:nx {unknown-renderer} {#1}
+        \tl_set:Nn \l_@@_mode_tl {harf}
+        \tl_set:Nn \l_@@_shaper_tl {#1}
+      } ,
   }
+%</LU>
 %    \end{macrocode}
 %
 % \subsection{Pre-parsed features}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-math.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-math.dtx
index aedef402cd8..dd6dfdad05f 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-math.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-math.dtx
@@ -220,6 +220,11 @@
   \@ifpackageloaded{MinionPro}    {\bool_gset_false:N \g_@@_math_bool}{}
   \@ifpackageloaded{unicode-math} {\bool_gset_false:N \g_@@_math_bool}{}
   \@ifpackageloaded{breqn}        {\bool_gset_false:N \g_@@_math_bool}{}
+  \@ifpackageloaded{pxfonts}      {\bool_gset_false:N \g_@@_math_bool}{}
+  \@ifpackageloaded{txfonts}      {\bool_gset_false:N \g_@@_math_bool}{}
+  \@ifpackageloaded{newpxmath}    {\bool_gset_false:N \g_@@_math_bool}{}
+  \@ifpackageloaded{newtxmath}    {\bool_gset_false:N \g_@@_math_bool}{}
+  \@ifpackageloaded{mtpro2}       {\bool_gset_false:N \g_@@_math_bool}{}
   \bool_if:NT \g_@@_math_bool
    {
     \@@_info:n {setup-math}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-msg.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-msg.dtx
index 7136249bdf3..0a37b692840 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-msg.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-msg.dtx
@@ -168,19 +168,24 @@
  }
 \@@_msg_new:nnn {fontspec} {only-xetex-feature}
  {
-  Ignored XeTeX only feature: '#1'.
+  Ignored XeTeX-only feature: '#1'.
  }
 \@@_msg_new:nnn {fontspec} {only-luatex-feature}
  {
-  Ignored LuaTeX only feature: '#1'.
+  Ignored LuaTeX-only feature: '#1'.
+ }
+\@@_msg_new:nnn {fontspec} {unknown-renderer}
+ {
+  Renderer '#1' unknown. Assuming Harfbuzz with 'shaper=#1'.
+  Please raise a fontspec issue to add this shaper to the interface.
  }
 \@@_msg_new:nnn {fontspec} {no-mapping}
  {
-  Input mapping not (yet?) supported in LuaTeX.
+  Input mapping not supported in LuaTeX.
  }
 \@@_msg_new:nnn {fontspec} {no-mapping-ligtex}
  {
-  Input mapping not (yet?) supported in LuaTeX.\\
+  Input mapping not supported in LuaTeX.\\
   Use "Ligatures=TeX" instead of "Mapping=tex-text".
  }
 \@@_msg_new:nnn {fontspec} {cm-default-obsolete}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
index 03289ea5788..2a2f2703e3e 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
@@ -113,10 +113,8 @@
 %<debug>  \typeout{:: @@_make_OT_feature:nnn \exp_not:n { {#1}{#2}{#3} } }
 
     \bool_set_true:N \l_@@_proceed_bool
-    \bool_set_true:N  \l_@@_check_feat_bool
 
-    \tl_if_empty:nT {#1} { \bool_set_false:N \l_@@_check_feat_bool }
-    \bool_if:NT \l_@@_check_feat_bool
+    \tl_if_empty:nF {#1}
       {
         \exp_args:No \@@_check_ot_feat:NnF \l_@@_fontface_cs_tl {#1}
           {
@@ -125,13 +123,9 @@
           }
       }
 
-    \bool_if:NT \l_@@_proceed_bool
-      {
-        \exp_args:Nx \@@_remove_clashing_featstr:n
-          { #2 , \@@_swap_plus_minus:n {#2} , #3 }
+    \@@_remove_clashing_featstr:x { #2 , \@@_swap_plus_minus:n {#2} , #3 }
 
-        \@@_update_featstr:n {#2}
-      }
+    \bool_if:NT \l_@@_proceed_bool { \@@_update_featstr:n {#2} }
   }
 \cs_generate_variant:Nn \@@_make_OT_feature:nnn {xxx}
 %    \end{macrocode}
@@ -208,7 +202,7 @@
 %    \begin{macrocode}
 \prg_new_conditional:Nnn \@@_check_lang:Nn {TF}
   {
-    \@@_check_lang:NnnTF #1 {#2} {\l_fontspec_script_tl} {\prg_return_true:} {\prg_return_false:}
+    \@@_check_lang:NnnTF #1 {#2} {\l_@@_script_tl} {\prg_return_true:} {\prg_return_false:}
   }
 %    \end{macrocode}
 %
@@ -272,7 +266,7 @@
 %    \begin{macrocode}
 \prg_new_conditional:Nnn \@@_check_ot_feat:Nn {TF,F}
   {
-    \@@_check_ot_feat:NnnnTF #1 {#2} {\l_fontspec_lang_tl} {\l_fontspec_script_tl}
+    \@@_check_ot_feat:NnnnTF #1 {#2} {\l_@@_lang_tl} {\l_@@_script_tl}
       {\prg_return_true:} {\prg_return_false:}
   }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx
index b7ed105edcf..1a0173c9814 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx
@@ -116,8 +116,8 @@
 %    \begin{macrocode}
 \cs_new:Nn \@@_main_setmathrm:nn
   {
-%<XE> \fontspec_set_family:Nnn \g_@@_mathrm_tl {#1} {#2}
-%<LU> \fontspec_set_family:Nnn \g_@@_mathrm_tl {Renderer=Basic,#1} {#2}
+%<XE> \fontspec_gset_family:Nnn \g_@@_mathrm_tl {#1} {#2}
+%<LU> \fontspec_gset_family:Nnn \g_@@_mathrm_tl {Renderer=Basic,#1} {#2}
     \@@_setmathrm_hook:nn {#1} {#2}
   }
 %    \end{macrocode}
@@ -127,8 +127,8 @@
 %    \begin{macrocode}
 \cs_new:Nn \@@_main_setboldmathrm:nn
   {
-%<XE> \fontspec_set_family:Nnn \g_@@_bfmathrm_tl {#1} {#2}
-%<LU> \fontspec_set_family:Nnn \g_@@_bfmathrm_tl {Renderer=Basic,#1} {#2}
+%<XE> \fontspec_gset_family:Nnn \g_@@_bfmathrm_tl {#1} {#2}
+%<LU> \fontspec_gset_family:Nnn \g_@@_bfmathrm_tl {Renderer=Basic,#1} {#2}
     \@@_setboldmathrm_hook:nn {#1} {#2}
   }
 %    \end{macrocode}
@@ -138,8 +138,8 @@
 %    \begin{macrocode}
 \cs_new:Nn \@@_main_setmathsf:nn
   {
-%<XE> \fontspec_set_family:Nnn \g_@@_mathsf_tl {#1} {#2}
-%<LU> \fontspec_set_family:Nnn \g_@@_mathsf_tl {Renderer=Basic,#1} {#2}
+%<XE> \fontspec_gset_family:Nnn \g_@@_mathsf_tl {#1} {#2}
+%<LU> \fontspec_gset_family:Nnn \g_@@_mathsf_tl {Renderer=Basic,#1} {#2}
     \@@_setmathsf_hook:nn {#1} {#2}
   }
 %    \end{macrocode}
@@ -149,8 +149,8 @@
 %    \begin{macrocode}
 \cs_new:Nn \@@_main_setmathtt:nn
   {
-%<XE> \fontspec_set_family:Nnn \g_@@_mathtt_tl {#1} {#2}
-%<LU> \fontspec_set_family:Nnn \g_@@_mathtt_tl {Renderer=Basic,#1} {#2}
+%<XE> \fontspec_gset_family:Nnn \g_@@_mathtt_tl {#1} {#2}
+%<LU> \fontspec_gset_family:Nnn \g_@@_mathtt_tl {Renderer=Basic,#1} {#2}
     \@@_setmathtt_hook:nn {#1} {#2}
   }
 %    \end{macrocode}
@@ -183,12 +183,12 @@
 \tl_gset:Nn \g_@@_mathtt_tl {\ttdefault}
 %    \end{macrocode}
 %
-% \begin{macro}{\@@_main_newfontfamily:nnnN}
+% \begin{macro}{\@@_main_newfontfamily:NnnN}
 %   The inner fontspec workings define a font family, which is then used in a typical
 %   NFSS \cmd\fontfamily\ declaration, saved in the macro name specified.
 %   The fourth argument determines which xparse function to set the macro with (new/renew/etc).
 %    \begin{macrocode}
-\cs_new:Nn \@@_main_newfontfamily:nnnN
+\cs_new:Nn \@@_main_newfontfamily:NnnN
   {
     \fontspec_set_family:cnn { l_@@_ \cs_to_str:N #1 _family_tl } {#2} {#3}
     \use:x
@@ -204,12 +204,12 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_main_newfontface:nnn}
+% \begin{macro}{\@@_main_newfontface:NnnN}
 % \cmd\newfontface\ uses the fact that if the argument to \feat{BoldFont}, etc., is empty (\ie, |BoldFont={}|), then no bold font is searched for.
 %    \begin{macrocode}
-\cs_new:Nn \@@_main_newfontface:nnn
+\cs_new:Nn \@@_main_newfontface:NnnN
   {
-    \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
+    \@@_main_newfontfamily:NnnN #1 { BoldFont={},ItalicFont={},SmallCapsFont={},#2 } {#3} #4
   }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-vars.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-vars.dtx
index 358acb36dca..ae5132b95cb 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-vars.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-vars.dtx
@@ -37,6 +37,7 @@
 \bool_new:N \l_@@_atsui_bool
 \bool_new:N \l_@@_ot_bool
 \bool_new:N \l_@@_mm_bool
+\bool_new:N \l_@@_harfbuzz_bool
 \bool_new:N \l_@@_graphite_bool
 \bool_new:N \l_@@_fontcfg_bool
 \bool_set_true:N \l_@@_fontcfg_bool
@@ -63,7 +64,6 @@
 \bool_new:N \l_@@_scriptlang_exist_bool
 \bool_new:N \g_@@_em_normalise_slant_bool
 \bool_new:N \l_@@_proceed_bool
-\bool_new:N \l_@@_check_feat_bool
 %    \end{macrocode}
 %
 % \begin{macro}{\l_@@_never_check_bool}
@@ -152,27 +152,36 @@
 %    \end{macrocode}
 %
 % \paragraph{Token lists}
+%
+% \paragraph{Visible (perhaps?)}
+%
 %    \begin{macrocode}
 \tl_new:N \l_fontspec_family_tl
 \tl_new:N \g_fontspec_encoding_tl
-\tl_new:N \l_fontspec_renderer_tl
 \tl_new:N \l_fontspec_fontname_tl
 %    \end{macrocode}
 %
+% \paragraph{2e interactions}
+%
 %    \begin{macrocode}
 \tl_clear_new:N \UTFencname
 \tl_clear_new:N \cyrillicencoding
 \tl_clear_new:N \latinencoding
 %    \end{macrocode}
 %
+% \paragraph{Renderer/shaper}
+%
+%    \begin{macrocode}
+\tl_new:N \l_@@_renderer_tl
+\tl_new:N \l_@@_mode_tl
+\tl_new:N \l_@@_shaper_tl
+%    \end{macrocode}
+%
 %    \begin{macrocode}
-\tl_new:N \l_fontspec_mode_tl
-\tl_new:N \g_@@_curr_series_tl
 \tl_new:N \g_@@_defined_shapes_tl
-\tl_new:N \g_@@_nfss_enc_tl
-\tl_new:N \g_@@_nfss_family_tl
 \tl_new:N \g_@@_single_feat_tl
 \tl_new:N \l_@@_basename_tl
+\tl_new:N \g_@@_curr_series_tl
 \tl_new:N \l_@@_curr_fontname_tl
 \tl_new:N \l_@@_curr_bfname_tl
 \tl_new:N \l_@@_ext_filename_tl
@@ -180,31 +189,43 @@
 \tl_new:N \l_@@_font_path_tl
 \tl_new:N \l_@@_fontid_tl
 \tl_new:N \l_@@_fontname_tl
-\tl_new:N \l_@@_hexcol_tl
+\tl_new:N \l_@@_options_tl
+\tl_new:N \l_@@_saved_fontname_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\tl_new:N \g_@@_nfss_enc_tl
+\tl_new:N \g_@@_nfss_family_tl
 \tl_new:N \l_@@_nfss_sc_tl
 \tl_new:N \l_@@_nfss_tl
 \tl_new:N \l_@@_nfss_fam_tl
-\tl_new:N \l_@@_opacity_tl
-\tl_new:N \l_@@_optical_size_tl
-\tl_new:N \l_@@_options_tl
-\tl_new:N \l_@@_saved_fontname_tl
-\tl_new:N \l_@@_scale_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \tl_new:N \l_@@_size_tl
 \tl_new:N \l_@@_sizedfont_tl
 \tl_new:N \l_@@_this_font_tl
-\tl_new:N \l_@@_tmp_tl
-\tl_new:N \l_@@_tmpa_tl
-\tl_new:N \l_@@_tmpb_tl
 \tl_new:N \l_@@_ttc_index_tl
+\tl_new:N \l_@@_smcp_shape_tl
+%    \end{macrocode}
+%
+% \paragraph{EM and STRONG}
+%    \begin{macrocode}
 \tl_new:N \l_@@_emshape_query_tl
 \tl_new:N \l_@@_em_switch_tl
+\tl_new:N \l_@@_strong_switch_tl
+%    \end{macrocode}
+%
+% \paragraph{Scratch variables}
+%    \begin{macrocode}
+\tl_new:N \l_@@_tmp_tl
+\tl_new:N \l_@@_tmpa_tl
+\tl_new:N \l_@@_tmpb_tl
 \tl_new:N \l_@@_em_tmp_tl
 \tl_new:N \l_@@_strong_tmp_tl
-\tl_new:N \l_@@_strong_switch_tl
-\tl_new:N \l_@@_hyphenchar_tl
-\tl_new:N \l_@@_smcp_shape_tl
 %    \end{macrocode}
 %
+% \paragraph{Maths fonts}
 %    \begin{macrocode}
 \tl_new:N \g_@@_mathrm_tl
 \tl_new:N \g_@@_bfmathrm_tl
@@ -212,7 +233,7 @@
 \tl_new:N \g_@@_mathtt_tl
 %    \end{macrocode}
 %
-% Defaults:
+% Defaults: (these are set elsewhere; TODO: check if redundant)
 %    \begin{macrocode}
 \tl_gset:Nn \g_@@_mathrm_tl {\rmdefault}
 \tl_gset:Nn \g_@@_mathsf_tl {\sfdefault}
@@ -225,6 +246,7 @@
 \tl_new:N \l_@@_fake_embolden_tl
 %    \end{macrocode}
 %
+% \paragraph{Internal font names}
 %    \begin{macrocode}
 \tl_new:N \l_@@_fontname_up_tl
 \tl_new:N \l_@@_fontname_bf_tl
@@ -235,20 +257,32 @@
 \tl_new:N \l_@@_fontname_sc_tl
 %    \end{macrocode}
 %
+% \paragraph{Script and Language}
+%
 %    \begin{macrocode}
-\tl_new:N \l_@@_script_name_tl
+\tl_new:N  \l_@@_script_tl
+\tl_new:N  \l_@@_script_name_tl
 \tl_set:Nn \l_@@_script_name_tl {CustomDefault}
-\tl_new:N \l_fontspec_script_tl
-\tl_new:N \l_@@_lang_name_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\tl_new:N  \l_@@_lang_tl
+\tl_new:N  \l_@@_lang_name_tl
 \tl_set:Nn \l_@@_lang_name_tl {Default}
-\tl_new:N \l_fontspec_lang_tl
 %    \end{macrocode}
 %
+% \paragraph{Generic font features}
+%
 %    \begin{macrocode}
-\tl_new:N  \l_@@_mapping_tl
-\tl_new:N  \l_@@_punctspace_adjust_tl
-\tl_new:N  \l_@@_wordspace_adjust_tl
-\tl_new:N  \l_@@_postadjust_tl
+\tl_new:N \l_@@_scale_tl
+\tl_new:N \l_@@_hyphenchar_tl
+\tl_new:N \l_@@_hexcol_tl
+\tl_new:N \l_@@_opacity_tl
+\tl_new:N \l_@@_optical_size_tl
+\tl_new:N \l_@@_mapping_tl
+\tl_new:N \l_@@_punctspace_adjust_tl
+\tl_new:N \l_@@_wordspace_adjust_tl
+\tl_new:N \l_@@_postadjust_tl
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -265,7 +299,6 @@
 %    \end{macrocode}
 %
 % \paragraph{Font families}
-% Again not a real data structure, and also probably poorly named.
 %    \begin{macrocode}
 \tl_new:N \l_@@_rmfamily_family_tl
 \tl_new:N \l_@@_sffamily_family_tl
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex
index 41d1ada2876..ed85ad9fa5c 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex
@@ -183,6 +183,7 @@ Since this has changed from \texttt{EU1}/\texttt{EU2} to \texttt{TU}, it is best
 
 \subsection{Functions for loading new fonts and families}
 
+\begin{macro}{\fontspec_gset_family:Nnn}
 \begin{macro}{\fontspec_set_family:Nnn}
 \darg{\LaTeX\ family}
 \darg{fontspec features}
@@ -193,11 +194,10 @@ This font family can then be selected with standard \LaTeX\ commands
 \cs{fontfamily}\marg{family}\cs{selectfont}.
 See the standard \pkg{fontspec} user commands for applications of this
 function.
-
-Previously this function set the \meta{family} variable locally, but this was inconsistent
-with how the NFSS assigns families. It is now a \textbf{global} operation.
+\end{macro}
 \end{macro}
 
+\begin{macro}{\fontspec_gset_fontface:NNnn}
 \begin{macro}{\fontspec_set_fontface:NNnn}
 \darg{primitive font}
 \darg{\LaTeX\ family}
@@ -209,9 +209,7 @@ If a family is loaded (with bold and italic shapes) the primitive font
 command will only select the regular face.
 This feature is designed for \LaTeX\ programmers who need to
 perform subsequent font-related tests on the \meta{primitive font}.
-
-Previously this function set the \meta{family} variable locally, but this was inconsistent
-with how the NFSS assigns families. It is now a \textbf{global} operation.
+\end{macro}
 \end{macro}
 
 
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
index b290167279b..5174a421d75 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
@@ -36,15 +36,15 @@ These defaults (and further customisations possible) are discussed in \vref{sec:
   \CMD{\string\newfontfamily}\meta{cmd}\marg{font}\oarg{font features}\\
   \CMD{\string\setfontfamily}{\color[gray]{0.5}\meta{cmd}\marg{font}\oarg{font features}}\\
   \CMD{\string\renewfontfamily}{\color[gray]{0.5}\meta{cmd}\marg{font}\oarg{font features}}
+  \CMD{\string\providefontfamily}{\color[gray]{0.5}\meta{cmd}\marg{font}\oarg{font features}}
 }
 
 These commands define new font family commands (like \cs{rmfamily}).
 The |new| command checks if \meta{cmd} has been defined, and issues an error if so.
 The |renew| command checks if \meta{cmd} has been defined, and issues an error if not.
+The |provide| command checks if \meta{cmd} has been defined, and silently aborts if so.
 The |set| command never checks; use at your own risk.
 
-\textbf{NEW:} In previous versions of \pkg{fontspec}, only \cs{newfontfamily} was provided, but it behaved
-like \cs{setfontfamily}. You'll have to update your code slightly if this now causes problems; apologies.
 
 
 \bigskip
@@ -282,20 +282,15 @@ The \cs{IfFontExistsTF} command is a synonym for the programming interface funct
 
 \section{Commands to select font families}
 
-\cmdbox{
-  \CMD{\string\newfontfamily}\cs{\meta{font-switch}}\marg{font name}\oarg{font features} \\
-  \CMD{\string\newfontface}\cs{\meta{font-switch}}\marg{font name}\oarg{font features}
-}
-
-\noindent For cases when a specific font with a specific
+For cases when a specific font with a specific
 feature set is going to be re-used many times in a document, it is inefficient
 to keep calling \cs{fontspec} for every use. While the \cs{fontspec} command does not define
 a new font instance after the first call, the feature options must still be
 parsed and processed.
 
-\DescribeMacro{\newfontfamily}
 For this reason, new commands can be created for loading a particular font
-family with the \cmd\newfontfamily\ command, demonstrated in \exref{nff}.
+family with the \cmd\newfontfamily\ command and variants,
+outlined in \vref{sec:main-cmd} and demonstrated in \exref{nff}.
 This macro should be used to create commands that would be used in
 the same way as \cmd\rmfamily, for example.
 If you would like to create a command that only changes the font
@@ -313,7 +308,31 @@ to delimit the scope of the font change.
   \notefont This is a \emph{note}.
 \end{Lexample}
 
-\DescribeMacro{\newfontface}
+\emph{Comment for advanced users:}
+The commands defined by \cs{newfontfamily} (and \cs{newfontface}; see next section) include
+their encoding information, so even if the document is set to use a
+legacy \TeX\ encoding, such commands will still work correctly. For example,
+\begin{Verbatim}
+\documentclass{article}
+\usepackage{fontspec}
+\newfontfamily\unicodefont{Lucida Grande}
+\usepackage{mathpazo}
+\usepackage[T1]{fontenc}
+\begin{document}
+A legacy \TeX\ font. {\unicodefont A unicode font.}
+\end{document}
+\end{Verbatim}
+
+
+\section{Commands to select single font faces}
+
+\cmdbox{%
+  \CMD{\string\newfontface}\meta{cmd}\marg{font}\oarg{font features}\\
+  \CMD{\string\setfontface}{\color[gray]{0.5}\meta{cmd}\marg{font}\oarg{font features}}\\
+  \CMD{\string\renewfontface}{\color[gray]{0.5}\meta{cmd}\marg{font}\oarg{font features}}
+  \CMD{\string\providefontface}{\color[gray]{0.5}\meta{cmd}\marg{font}\oarg{font features}}
+}
+
 Sometimes only a specific font face is desired, without accompanying italic or bold variants
 being automatically selected.
 This is common when selecting a fancy italic font, say, that has swash features unavailable
@@ -327,20 +346,6 @@ in \exref{nfface}, which is repeated in \vref{sec:contextuals}.
   % \emph, \textbf, etc., all don't work
 \end{Xexample}
 
-Comment for advanced users:
-The commands defined by \cs{newfontface} and \cs{newfontfamily} include
-their encoding information, so even if the document is set to use a
-legacy \TeX\ encoding, such commands will still work correctly. For example,
-\begin{Verbatim}
-\documentclass{article}
-\usepackage{fontspec}
-\newfontfamily\unicodefont{Lucida Grande}
-\usepackage{mathpazo}
-\usepackage[T1]{fontenc}
-\begin{document}
-A legacy \TeX\ font. {\unicodefont A unicode font.}
-\end{document}
-\end{Verbatim}
 
 \subsection{More control over font shape selection}
 \label{sec:bfitfonts}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex
index d8a16d56544..e6f752d6e92 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex
@@ -8,10 +8,43 @@
 \part{\LuaTeX-only font features}
 \label{sec:luatex-features}
 
+\section{Different font technologies and shapers}
+\label{sec:renderer-luatex}
+
+\LuaTeX\ does not directly support any font rendering technologies out of the box, it
+requires additional functionality to be added to properly support and control technologies such as OpenType.
+
+Using the \feat{Renderer} feature, there are a number of options that \pkg{fontspec} can pass to the engine to control which font technology is being used.
+Pre-2019, there were two options provided by \pkg{luaotfload} that generally did not require user intervention.
+
+\begin{itemize}
+\item \feat{Renderer} = \opt{Node} : the default `mode' for typesetting OpenType fonts.
+\item \feat{Renderer} = \opt{Base} : a simplified mode useful only in a limited number of situations such as mathematics typesetting.
+\end{itemize}
+
+From 2019 the possibility of using the Harfbuzz text shaping engine within \LuaTeX\ has
+been developed by Khaled Hosny. When running a suitable \LuaTeX\ engine with Harfbuzz support, \pkg{fontspec} provides the following options:
+
+\begin{itemize}
+\item \feat{Renderer} = \opt{Harfbuzz} : use the Harfbuzz engine without an explicit `shaper'.
+\item \feat{Renderer} = \opt{OpenType} : use the Harfbuzz engine with the OpenType shaper.
+\item \feat{Renderer} = \opt{AAT} : use the Harfbuzz engine with the AAT shaper.
+\item \feat{Renderer} = \opt{Graphite} : use the Harfbuzz engine with the Graphite shaper.
+\item \feat{Renderer} = \meta{foo} : use the Harfbuzz engine with the \meta{foo} shaper.
+\end{itemize}
+
+Support for the Harfbuzz renderer is preliminary and may be improved over time.
+Please treat the interface for Harfbuzz fonts as subject to change.
+
+
 \section{Custom font features}
 
 \LuaTeX, via the \pkg{luaotfload} package, allows the definition and re-definition of custom OpenType features for a selected font. This facility is particularly useful to implement custom substitutions or to disable unwanted but not all ligatures.
+
 Figure~\ref{fig:featurefile} shows an minimal example of this type of functionality.
+This example creates a new OpenType feature, \texttt{oneb}, which substitutes the glyph
+when typesetting `\texttt{1}' for the named glyph \texttt{one.ss01}. The glyph names
+are font specific and can be interrogated with third-party software such as \emph{FontForge}.
 
 A third-party collection of additional examples are maintained in the repository `\texttt{fonts-in-luatex}'\footnote{\url{https://github.com/mewtant/fonts-in-luatex}}.
 These examples are intended to correct or adjust font features in a range of commercial fonts and provide a good introduction to some of the possibilities that \LuaTeX\ affords.
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
index efb2ffccb08..9e16c370ee7 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
@@ -184,7 +184,7 @@ change which features are able to be selected for the font, the \feat{Script} an
 settings are automatically selected
 by \pkg{fontspec} before all others, and, if \XeTeX\ is being used, will
 specifically select the \opt{OpenType}
-renderer for this font, as described in \vref{sec:renderer}.
+renderer for this font, as described in \vref{sec:renderer-xetex}.
 
 OpenType fonts can make available different font features depending on the Script and
 Language chosen.
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex
index 8c1d4f1647e..0dc5e48cace 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex
@@ -30,7 +30,7 @@ The use of the latter syntax is recommended for better compatibility with
 \LuaTeX\ documents.
 
 
-\subsection{Different font technologies: \AAT, OpenType, and Graphite}\label{sec:renderer}
+\subsection{Different font technologies: \AAT, OpenType, and Graphite}\label{sec:renderer-xetex}
 
 \XeTeX\ supports three rendering technologies for typesetting, selected with
 the \feat{Renderer} font feature. The first, \opt{AAT}, is
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index feeb0af3733..78dc706b88b 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -71,7 +71,7 @@
 \ProvidesExplFile{fontspec.dtx}
 %</dtx>
 %<*fontspec>
-  {2019/01/25}{2.7a}{Font selection for XeLaTeX and LuaLaTeX}
+  {2019/02/12}{2.7b}{Font selection for XeLaTeX and LuaLaTeX}
 %</fontspec>
 %    \end{macrocode}
 %
@@ -90,8 +90,8 @@
 %<lua>local fontspec    = fontspec
 %<lua>fontspec.module   = {
 %<lua>    name          = "fontspec",
-%<lua>    version       = "2.7a",
-%<lua>    date          = "2019/01/25",
+%<lua>    version       = "2.7b",
+%<lua>    date          = "2019/02/12",
 %<lua>    description   = "Font selection for XeLaTeX and LuaLaTeX",
 %<lua>    author        = "Khaled Hosny, Philipp Gesang, Will Robertson",
 %<lua>    copyright     = "Khaled Hosny, Philipp Gesang, Will Robertson",