fontspec (22jan17)

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

63 files changed, 17126 insertions, 7078 deletions

diff --git a/Master/texmf-dist/doc/latex/fontspec/README.md b/Master/texmf-dist/doc/latex/fontspec/README.md
index 6715e5c64ba..2f522755053 100644
--- a/Master/texmf-dist/doc/latex/fontspec/README.md
+++ b/Master/texmf-dist/doc/latex/fontspec/README.md
@@ -1,4 +1,4 @@
-THE FONTSPEC PACKAGE v2.5a
+THE FONTSPEC PACKAGE v2.5c
 ==========================
 
 The fontspec package provides an automatic and unified interface for loading
@@ -35,39 +35,65 @@ Table of Contents
 Summary of user commands
 ------------------------
 
-Font families may be selected individually with the command
+To define commands for selecting fonts efficiently through a document:
 
-    \fontspec{<font name>}[<font options>]
-
-Commands for selecting fonts efficiently through a document are created with
-
-    \newfontfamily\myfamily{<font name>}[<font options>]
-    \newfontface\myfont{<font name>}[<font options>]
+    \newfontfamily\<font switch>{<font name>}[<font options>]
+    \newfontface  \<font switch>{<font name>}[<font options>]
 
-Default document fonts are selected with
+To select the default document fonts:
 
     \setmainfont{<font name>}[<font options>]
     \setsansfont{<font name>}[<font options>]
     \setmonofont{<font name>}[<font options>]
 
-Features to be used for every subsequently defined font are specified with
+To define an ad hoc font family individually:
+
+    \fontspec{<font name>}[<font options>]
+
+To specify features to be used for every subsequently defined font:
 
     \defaultfontfeatures{<default font options>}
     \defaultfontfeatures+{<add to default font options>}
-    \defaultfontfeatures[<font name>]{<default font options for "font name">}
-    \defaultfontfeatures+[<font name>]{<add to default font options for "font name">}
 
-Features may be added to the font currently in use with
+To specify features to be used for specific fonts:
+
+    \defaultfontfeatures[<font name or switch>]{<default font options>}
+    \defaultfontfeatures+[<font name or switch>]{<add to defaults>}
+
+To add features to the font family currently in use:
 
     \addfontfeatures{<font options to add>}
-    \addfontfeature{<...>} does the same thing
 
 
 
 Change history
 --------------
 
-- v2.5a (2016/02/01) "bugs fixed"
+- v2.5c (2017/01/20) "Christmas 2016 release"
+
+    * `TU` font encoding now default, with encoding files provided by the kernel.
+    * Experimental interface added for customising encodings.
+    * Add feature `Ornament=`*n* corresponding to OpenType feature `+ornm=`*n*.
+    * Add feature `FontIndex=`*n* to support TrueType Collection (TTC) files.
+    * Nested `\emph` is now much smarter and will cleverly nest even if manual font changes are made.
+    * Tries to resolve situations when font features clash.
+      E.g., `Numbers={Uppercase,Lowercase}` will define only `+onum` rather than the previous behaviour of `+lnum;+onum` to let the engine sort things out. Coverage may still be preliminary.
+    * Add API function `\fontspec_if_current_feature:nTF` for querying selected features based on their OpenType tag.
+    * Add user function `\IfFontFeatureActiveTF` for querying selected features based on their `fontspec` specification.
+    * All "tag-based" OpenType features are now provided in `Feat`/`FeatOff`/`FeatReset` forms to disable and reset them.
+    * `ResetAll` provided for all "tag-based" OpenType feature keys. (E.g., `Ligatures=ResetAll`.)
+    * Big table of OpenType feature tags to help cross-reference which fontspec feature (if any) corresponds to which OpenType feature.
+    * Bug fixed for `Script` selection.
+
+- v2.5b (2016/05/14) "More bugs" (somehow never released)
+
+    * Fixed bug with garbage text printed in certain "verbatim" situations under LuaTeX.
+    * Improve interaction between optical sizes and small caps.
+    * Remove documentation for `FeatureFile`, since this is no longer supported under LuaLaTeX
+      (there are other methods to perform the same thing, but no "easy" user interface that `fontspec` can provide at this stage).
+    * Fix regression causing an error message if `fontspec` loaded before `\documentclass'.
+
+- v2.5a (2016/02/01) "Bugs fixed"
 
     * Rather embarrassing bug fix! (`unicode-math` was broken.)
     * Remember to add the `fontspec.cfg` file to the distribution.
@@ -77,7 +103,8 @@ Change history
 
 - v2.5 (2016/01/30) "TL2016 release"
 
-    * Provide a new Unicode font encoding ("TU") to replace EU1/EU2 and xunicode. If this causes problems, load fontspec with the `[euenc]` option to revert to the old behaviour.
+    * Provide a new Unicode font encoding ("TU") to replace EU1/EU2 and xunicode.
+    * Activate with package option `[tuenc]'; once it becomes the default (later this year), `[euenc]` option will revert to the old behaviour.
     * New command `\emfontdeclare` for defining font shapes when arbitrarily nesting the `\emph` command.
     * Allow slanted small caps and better internal methods for "combining" font shapes; this fixes a few bugs.
     * Incorporate "new" font script tags for Indic fonts. E.g., when selecting `Script=Bengali`, fontspec will first query the font for the `bng2` OpenType script, and if not found select `beng`.
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index 0213413cc5b..7813508c0e5 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx
index 364ccf07b17..fbbe2dc3663 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-api.dtx
@@ -42,10 +42,10 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \bool_if:NTF \l_@@_atsui_bool
      {
-      \fontspec_make_AAT_feature_string:nnTF {#1}{#2}
+      \@@_make_AAT_feature_string:nnTF {#1}{#2}
         \prg_return_true: \prg_return_false:
      }
      {
@@ -69,7 +69,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool \prg_return_true: \prg_return_false:
    }
@@ -91,20 +91,20 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool
      {
       \prop_get:cnN {g_@@_ \f@family _prop} {script-num} \l_@@_tmp_tl
-      \int_set:Nn \l_fontspec_script_int {\l_@@_tmp_tl}
+      \int_set:Nn \l_@@_script_int {\l_@@_tmp_tl}
 
       \prop_get:cnN {g_@@_ \f@family _prop} {lang-num} \l_@@_tmp_tl
-      \int_set:Nn \l_fontspec_language_int {\l_@@_tmp_tl}
+      \int_set:Nn \l_@@_language_int {\l_@@_tmp_tl}
 
       \prop_get:cnN {g_@@_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
       \prop_get:cnN {g_@@_ \f@family _prop} {lang-tag}  \l_fontspec_lang_tl
 
-      \fontspec_check_ot_feat:nTF {#1} {\prg_return_true:} {\prg_return_false:}
+      \@@_check_ot_feat:nTF {#1} {\prg_return_true:} {\prg_return_false:}
      }
      {
       \prg_return_false:
@@ -127,13 +127,13 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool
      {
-      \fontspec_iv_str_to_num:Nn \l_fontspec_script_int {#1}
-      \fontspec_iv_str_to_num:Nn \l_fontspec_language_int {#2}
-      \fontspec_check_ot_feat:nTF {#3} \prg_return_true: \prg_return_false:
+      \@@_iv_str_to_num:Nn \l_@@_script_int {#1}
+      \@@_iv_str_to_num:Nn \l_@@_language_int {#2}
+      \@@_check_ot_feat:nTF {#3} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -153,11 +153,11 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool
      {
-      \fontspec_check_script:nTF {#1} \prg_return_true: \prg_return_false:
+      \@@_check_script:nTF {#1} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -177,15 +177,15 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool
      {
       \prop_get:cnN {g_@@_ \f@family _prop} {script-num} \l_@@_tmp_tl
-      \int_set:Nn \l_fontspec_script_int {\l_@@_tmp_tl}
+      \int_set:Nn \l_@@_script_int {\l_@@_tmp_tl}
       \prop_get:cnN {g_@@_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
 
-      \fontspec_check_lang:nTF {#1} \prg_return_true: \prg_return_false:
+      \@@_check_lang:nTF {#1} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -205,13 +205,13 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool
      {
       \tl_set:Nn \l_fontspec_script_tl {#1}
-      \fontspec_iv_str_to_num:Nn \l_fontspec_script_int {#1}
-      \fontspec_check_lang:nTF {#2} \prg_return_true: \prg_return_false:
+      \@@_iv_str_to_num:Nn \l_@@_script_int {#1}
+      \@@_check_lang:nTF {#2} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -230,7 +230,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool
      {
@@ -254,7 +254,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g_@@_ \f@family _prop} {fontdef} \l_@@_fontdef_tl
-    \@@_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
+    \@@_primitive_font_set:Nnn \l_fontspec_font {\l_@@_fontdef_tl} {\f@size pt}
     \@@_set_font_type:
     \bool_if:NTF \l_@@_ot_bool
      {
@@ -283,13 +283,13 @@
 % variable because the actual \LaTeX\ family name is automatically generated
 % by fontspec and it's easier to keep it that way.
 %
-% Please use |\fontspec_set_family:Nnn| instead of |\fontspec_select:nn|,
+% Please use |\fontspec_set_family:Nnn| instead of |\@@_select_font_family:nn|,
 % which may change in the future.
 %    \begin{macrocode}
 \cs_new:Nn \fontspec_set_family:Nnn
  {
   \tl_set:Nn \l_@@_family_label_tl { #1 }
-  \fontspec_select:nn {#2}{#3}
+  \@@_select_font_family:nn {#2}{#3}
   \tl_set_eq:NN #1 \l_fontspec_family_tl
  }
 \cs_generate_variant:Nn \fontspec_set_family:Nnn {c}
@@ -302,13 +302,45 @@
 \cs_new:Nn \fontspec_set_fontface:NNnn
  {
   \tl_set:Nn \l_@@_family_label_tl { #1 }
-  \fontspec_select:nn {#3}{#4}
+  \@@_select_font_family:nn {#3}{#4}
   \tl_set_eq:NN #1 \l_fontspec_font
   \tl_set_eq:NN #2 \l_fontspec_family_tl
  }
 %    \end{macrocode}
 % \end{macro}
 %
+%
+%
+% \begin{macro}{\fontspec_font_if_exist:n}
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \fontspec_font_if_exist:n {TF,T,F}
+  {
+    \group_begin:
+      \@@_init:
+      \@@_if_detect_external:nT {#1} { \@@_font_is_file: }
+      \@@_primitive_font_if_exist:nTF { \@@_construct_font_call:nn {#1} {} }
+        { \group_end: \prg_return_true: }
+        { \group_end: \prg_return_false:  }
+  }
+\cs_set_eq:NN \IfFontExistsTF \fontspec_font_if_exist:nTF
+%    \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\fontspec_if_current_feature:nTF}
+% Test whether the currently loaded font is using the specified raw
+% OpenType feature tag |#1|.
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \fontspec_if_current_feature:n {TF,T,F}
+  {
+    \exp_args:Nxx \tl_if_in:nnTF
+      { \fontname\font } { \tl_to_str:n {#1} }
+      { \prg_return_true: } { \prg_return_false: }%
+  }
+%    \end{macrocode}
+% \end{macro}
+
+
+%
 % \iffalse
 %    \begin{macrocode}
 %</fontspec&(xetexx|luatex)>
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx
index 7e09312d9ec..f2d3c1c2ce8 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-closing.dtx
@@ -19,7 +19,7 @@
 \tl_set:Nn \zf@enc { \g_fontspec_encoding_tl }
 \cs_set:Npn \zf@fontspec #1 #2
  {
-  \fontspec_select:nn {#1} {#2}
+  \@@_select_font_family:nn {#1} {#2}
   \tl_set:Nn \zf@family { \l_fontspec_family_tl }
   \tl_set:Nn \zf@basefont { \l_fontspec_font }
  }
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.aux
new file mode 100644
index 00000000000..df8601010c9
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.aux
@@ -0,0 +1,55 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{VIII\hspace  {1em}Customisation and programming interface}{65}{part.8}}
+\@writefile{toc}{\contentsline {section}{\numberline {23}Defining new features}{65}{section.23}}
+\newlabel{sec:newfeatures}{{Section\nobreakspace  {}23}{65}{Defining new features}{section.23}{}}
+\newlabel{ex:newAATfeat}{{50}{65}{Defining new features}{example.50}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {24}Defining new scripts and languages}{66}{section.24}}
+\newlabel{sec:newscriptlang}{{Section\nobreakspace  {}24}{66}{Defining new scripts and languages}{section.24}{}}
+\newlabel{39@xvr}{{}{66}{Defining new scripts and languages}{section.24}{}}
+\newlabel{39@vr}{{}{66}{Defining new scripts and languages}{section.24}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {25}Going behind \textsf  {fontspec}'s back}{66}{section.25}}
+\newlabel{ex:raw}{{51}{66}{Going behind \pkg {fontspec}'s back}{example.51}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {26}Renaming existing features \& options}{66}{section.26}}
+\newlabel{sec:aliasfontfeature}{{Section\nobreakspace  {}26}{66}{Renaming existing features \& options}{section.26}{}}
+\newlabel{ex:alias}{{52}{66}{Renaming existing features \& options}{example.52}{}}
+\newlabel{ex:aliasopt}{{53}{67}{Renaming existing features \& options}{example.53}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {27}Programming interface}{67}{section.27}}
+\newlabel{sec:api}{{Section\nobreakspace  {}27}{67}{Programming interface}{section.27}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {27.1}Variables}{67}{subsection.27.1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {27.2}Functions for loading new fonts and families}{67}{subsection.27.2}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {27.3}Conditionals}{68}{subsection.27.3}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {27.3.1}Querying font families}{68}{subsubsection.27.3.1}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {27.3.2}Availability of features}{68}{subsubsection.27.3.2}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {27.3.3}Currently selected features}{69}{subsubsection.27.3.3}}
+\@setckpt{fontspec-doc-api}{
+\setcounter{page}{70}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{13}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{8}
+\setcounter{section}{27}
+\setcounter{subsection}{3}
+\setcounter{subsubsection}{3}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{1}
+\setcounter{table}{17}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{4}
+\setcounter{vrcnt}{39}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{13}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{92}
+\setcounter{example}{53}
+\setcounter{argument}{0}
+\setcounter{section@level}{3}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex
new file mode 100644
index 00000000000..3779259c004
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-api.tex
@@ -0,0 +1,300 @@
+
+
+
+\part{Customisation and programming interface}
+
+This is the beginning of some work to provide some hooks that use
+\pkg{fontspec} for various macro programming purposes.
+
+
+\section{Defining new features} \label{sec:newfeatures}
+This package cannot hope to contain every possible font
+feature. Three commands are provided for selecting font features
+that are not provided for out of the box. If you are using
+them a lot, chances are I've left something out, so please let me
+know.
+
+\DescribeMacro{\newAATfeature}
+New \AAT\ features may be created with this command:\par
+{\centering\cmd\newAATfeature\marg{feature}\marg{option}\marg{feature code}\marg{selector code}\par}\noindent
+Use the \XeTeX\ file \path{AAT-info.tex} to obtain the code numbers.
+See \exref{newAATfeat}.
+
+\begin{Xexample}{newAATfeat}{Assigning new \AAT\ features.}
+  \newAATfeature{Alternate}{HoeflerSwash}{17}{1}
+  \fontspec{Hoefler Text Italic}[Alternate=HoeflerSwash]
+   This is XeTeX by Jonathan Kew.
+\end{Xexample}
+
+
+\DescribeMacro{\newopentypefeature}
+New OpenType features may be created with this command:\par
+{\centering\cmd\newopentypefeature\marg{feature}\marg{option}\marg{feature tag}\par}
+The synonym \cs{newICUfeature} is deprecated.
+
+Here's what it would look like in practise:
+\begin{Verbatim}
+\newopentypefeature{Style}{NoLocalForms}{-locl}
+\end{Verbatim}
+
+\DescribeMacro{\newfontfeature}
+In case the above commands do not accommodate the desired font feature
+(perhaps a new \XeTeX\ feature that \pkg{fontspec} hasn't been updated
+to support), a command is provided to pass arbitrary input into the
+font selection string:\par
+{\centering\cmd{\newfontfeature}\marg{name}\marg{input string}\par}
+
+For example, Zapfino used to
+contain an AAT feature `Avoid d-collisions'. To access it
+with this package, you could do some like the following:
+
+\begin{Verbatim}
+  \newfontfeature{AvoidD}  {Special= Avoid d-collisions}
+  \newfontfeature{NoAvoidD}{Special=!Avoid d-collisions}
+  \fontspec{Zapfino}[AvoidD,Variant=1]
+   sockdolager rubdown               \\
+  \fontspec{Zapfino}[NoAvoidD,Variant=1]
+   sockdolager rubdown
+\end{Verbatim}
+
+The advantage to using the \cmd\newAATfeature\ and \cmd\newopentypefeature\
+commands instead of \cs{newfontfeature} is that they check if the selected font actually contains the desired font
+feature at load time. By contrast, \cmd\newfontfeature\ will not give a warning
+for improper input.
+
+
+\section{Defining new scripts and languages}
+\label{sec:newscriptlang}
+
+\DescribeMacro{\newfontscript}
+\DescribeMacro{\newfontlanguage}
+While the scripts and languages listed in \ref{tab:ot-scpt} and \ref{tab:ot-lang}
+are intended to be comprehensive, there may be some missing; alternatively,
+you might wish to use different names to access scripts/languages that are
+already listed.
+Adding scripts and languages can be performed with the \cmd\newfontscript\
+and \cmd\newfontlanguage\ commands. For example,
+\begin{Verbatim}
+  \newfontscript{Arabic}{arab}
+  \newfontlanguage{Zulu}{ZUL}
+\end{Verbatim}
+The first argument is the \pkg{fontspec} name, the second the OpenType
+tag. The advantage to using these commands rather than \cmd\newfontfeature\
+(see \vref{sec:newfeatures}) is the error-checking that is performed when
+the script or language is requested.
+
+
+
+\section{Going behind \pkg{fontspec}'s back}
+Expert users may wish not to use \pkg{fontspec}'s feature handling at all,
+while still taking advantage of its \LaTeX\ font selection conveniences. The
+\feat{RawFeature} font feature allows font feature selection using a literal feature selection string if you happen to have the OpenType feature tag memorised.
+
+\begin{Xexample}{raw}{Using raw font features directly.}
+  \fontspec{texgyrepagella-regular.otf}[RawFeature=+smcp]
+  Pagella small caps
+\end{Xexample}
+
+Multiple features can either be included in a single declaration:\par
+{\centering|[RawFeature=+smcp;+onum]|\par}
+\noindent or with multiple declarations:\par
+{\centering|[RawFeature=+smcp, RawFeature=+onum]|\par}
+
+
+\section{Renaming existing features \& options}
+\label{sec:aliasfontfeature}
+
+\DescribeMacro{\aliasfontfeature}
+If you don't like the name of a particular font feature,
+it may be aliased to another with the
+\cs{aliasfontfeature}\marg{existing name}\marg{new name} command,
+such as shown in \exref{alias}.
+
+\begin{Xexample}{alias}{Renaming font features.}
+  \aliasfontfeature{ItalicFeatures}{IF}
+  \fontspec{Hoefler Text}[IF = {Alternate=1}]
+  Roman Letters \itshape And Swash
+\end{Xexample}
+
+Spaces in feature (and option names, see below) \emph{are} allowed. (You may have
+noticed this already in the lists of OpenType scripts and languages).
+
+\DescribeMacro{\aliasfontfeatureoption}
+If you wish to change the name of a font feature option,
+it can be aliased to another with the command
+\cs{aliasfontfeatureoption}\marg{font feature}\marg{existing name}\marg{new name}, such as shown in \exref{aliasopt}.
+
+\begin{Lexample}{aliasopt}{Renaming font feature options.}
+  \aliasfontfeature{VerticalPosition}{Vert Pos}
+  \aliasfontfeatureoption{VerticalPosition}{ScientificInferior}{Sci Inf}
+  \fontspec{LinLibertine_R.otf}[Vert Pos=Sci Inf]
+   Scientific Inferior: 12345
+\end{Lexample}
+
+This example demonstrates an important point: when aliasing the feature
+options, the \emph{original} feature name must be used when declaring
+to which feature the option belongs.
+
+Only feature options that exist as sets of fixed strings may be altered in
+this way. That is, \opt{Proportional} can be aliased to \opt{Prop} in the
+\feat{Letters} feature, but \opt{550099BB} cannot be substituted for \opt{Purple}
+in a \feat{Color} specification. For this type of thing, the \cmd\newfontfeature\
+command should be used to declare a new, \eg, \feat{PurpleColor} feature:
+\begin{Verbatim}
+  \newfontfeature{PurpleColor}{color=550099BB}
+\end{Verbatim}
+Except that this example was written before support for named colours was
+implemented. But you get the idea.
+
+
+
+
+\section{Programming interface}
+\label{sec:api}
+
+
+\subsection{Variables}
+
+\DescribeMacro{\l_fontspec_family_tl}
+\DescribeMacro{\l_fontspec_font}
+In some cases, it is useful to know what the \LaTeX\ font family
+of a specific \pkg{fontspec} font is. After a \cmd\fontspec-like
+command, this is stored inside the \cmd\l_fontspec_family_tl\ macro.
+Otherwise, \LaTeX's own \cmd\f@family\ macro can be useful here,
+too.
+The raw \TeX\ font that is defined from the `base' font in the family is stored in \cmd{\l_fontspec_font}.
+
+\DescribeMacro{\g_fontspec_encoding_tl}
+Package authors who need to load fonts with legacy \LaTeX\ \NFSS\ commands may also need to know what the default font encoding is.
+Since this has changed from \texttt{EU1}/\texttt{EU2} to \texttt{TU}, it is best to use the variables \cs{g_fontspec_encoding_tl} or \cs{UTFencname} instead.
+
+\subsection{Functions for loading new fonts and families}
+
+\begin{macro}{\fontspec_set_family:Nnn}
+\darg{\LaTeX\ family}
+\darg{fontspec features}
+\darg{font name}
+Defines a new \NFSS\ family from given \meta{features} and \meta{font},
+and stores the family name in the variable \meta{family}.
+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.
+\end{macro}
+
+\begin{macro}{\fontspec_set_fontface:NNnn}
+\darg{primitive font}
+\darg{\LaTeX\ family}
+\darg{fontspec features}
+\darg{font name}
+Variant of the above in which the primitive \TeX\ font command is stored in
+the variable \meta{primitive font}.
+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}.
+\end{macro}
+
+
+\subsection{Conditionals}
+
+The following functions in \pkg{expl3} syntax may be used
+for writing code that interfaces with \pkg{fontspec}-loaded fonts.
+The following conditionals are all provided in |TF|, |T|, and |F| forms.
+
+\subsubsection{Querying font families}
+
+\begin{macro}{\fontspec_font_if_exist:nTF}
+Test whether the `font name' (|#1|) exists or is loadable.
+The syntax of |#1| is a restricted/simplified version of \pkg{fontspec}'s usual font loading syntax; fonts to be loaded by filename are detected by the presence of an appropriate extension (|.otf|, etc.), and paths should be included inline.
+E.g.:
+\begin{Verbatim}
+  \fontspec_font_if_exist:nTF {cmr10}{T}{F}
+  \fontspec_font_if_exist:nTF {Times~ New~ Roman}{T}{F}
+  \fontspec_font_if_exist:nTF {texgyrepagella-regular.otf}{T}{F}
+  \fontspec_font_if_exist:nTF {/Users/will/Library/Fonts/CODE2000.TTF}{T}{F}
+\end{Verbatim}
+\end{macro}
+The synonym \cs{IfFontExistsTF} is provided for `document authors'.
+
+
+\begin{macro}{\fontspec_if_fontspec_font:TF}
+Test whether the currently selected font has been loaded by fontspec.
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_opentype:TF}
+Test whether the currently selected font is an OpenType font.
+Always true for \LuaTeX{} fonts.
+\end{macro}
+
+
+\subsubsection{Availability of features}
+
+\begin{macro}{\fontspec_if_aat_feature:nnTF}
+Test whether the currently selected font contains the \AAT\
+feature (|#1|,|#2|).
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_feature:nTF}
+Test whether the currently selected font contains the raw OpenType
+feature |#1|. E.g.: |\fontspec_if_feature:nTF {pnum} {True} {False}|.
+Returns false if the font is not loaded by fontspec or is not an OpenType
+font.
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_feature:nnnTF}
+Test whether the currently selected font with raw OpenType script tag |#1| and raw OpenType language tag |#2| contains the raw OpenType feature tag |#3|. E.g.: |\fontspec_if_feature:nnnTF {latn} {ROM} {pnum} {True} {False}|.
+Returns false if the font is not loaded by fontspec or is not an OpenType
+font.
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_script:nTF}
+Test whether the currently selected font contains the raw OpenType
+script |#1|. E.g.: |\fontspec_if_script:nTF {latn} {True} {False}|.
+Returns false if the font is not loaded by fontspec or is not an OpenType
+font.
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_language:nTF}
+Test whether the currently selected font contains the raw OpenType language
+tag |#1|. E.g.: |\fontspec_if_language:nTF {ROM} {True} {False}|.
+Returns false if the font is not loaded by fontspec or is not an OpenType
+font.
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_language:nnTF}
+Test whether the currently selected font contains the raw OpenType language
+tag |#2| in script |#1|. E.g.: |\fontspec_if_language:nnTF {cyrl} {SRB} {True} {False}|.
+Returns false if the font is not loaded by fontspec or is not an OpenType
+font.
+\end{macro}
+
+
+\subsubsection{Currently selected features}
+
+\begin{macro}{\fontspec_if_current_feature:nTF}
+Test whether the currently loaded font is using the specified raw
+OpenType feature tag |#1|.
+The tag string |#1| should be prefixed with |+| to query an active feature, and with a |-| (hyphen) to query a disabled feature.
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_current_script:nTF}
+Test whether the currently loaded font is using the specified raw
+OpenType script tag |#1|.
+\end{macro}
+
+
+\begin{macro}{\fontspec_if_current_language:nTF}
+Test whether the currently loaded font is using the specified raw
+OpenType language tag |#1|.
+\end{macro}
+
+
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.aux
new file mode 100644
index 00000000000..3cb74a8fdb2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.aux
@@ -0,0 +1,38 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{V\hspace  {1em}Commands for accents and symbols (`encodings')}{53}{part.5}}
+\newlabel{part:enc}{{V}{53}{Commands for accents and symbols (`encodings')}{part.5}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {17}A new Unicode-based encoding from scratch}{53}{section.17}}
+\@writefile{toc}{\contentsline {section}{\numberline {18}Adjusting a pre-existing encoding}{54}{section.18}}
+\@writefile{toc}{\contentsline {section}{\numberline {19}Summary of commands}{56}{section.19}}
+\@setckpt{fontspec-doc-enc}{
+\setcounter{page}{57}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{11}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{5}
+\setcounter{section}{19}
+\setcounter{subsection}{0}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{0}
+\setcounter{table}{17}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{2}
+\setcounter{vrcnt}{32}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{11}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{61}
+\setcounter{example}{40}
+\setcounter{argument}{0}
+\setcounter{section@level}{1}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.log b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.log
new file mode 100644
index 00000000000..6d6be36c1fd
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.log
@@ -0,0 +1,1735 @@
+This is XeTeX, Version 3.14159265-2.6-0.99996 (TeX Live 2016) (preloaded format=xelatex 2016.5.14)  6 JAN 2017 16:52
+entering extended mode
+ \write18 enabled.
+ file:line:error style messages enabled.
+ %&-line parsing enabled.
+**fontspec-doc-enc.tex
+(./fontspec-doc-enc.tex
+LaTeX2e <2016/03/31>
+Babel <3.9r> and hyphenation patterns for 81 language(s) loaded.
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/ltxdoc.cls
+Document Class: ltxdoc 2015/03/26 v2.0w Standard LaTeX documentation class
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/article.cls
+Document Class: article 2014/09/29 v1.4h Standard LaTeX document class
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/size10.clo
+File: size10.clo 2014/09/29 v1.4h Standard LaTeX file (size option)
+)
+\c@part=\count79
+\c@section=\count80
+\c@subsection=\count81
+\c@subsubsection=\count82
+\c@paragraph=\count83
+\c@subparagraph=\count84
+\c@figure=\count85
+\c@table=\count86
+\abovecaptionskip=\skip41
+\belowcaptionskip=\skip42
+\bibindent=\dimen102
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/doc.sty
+Package: doc 2016/02/15 v2.1g Standard LaTeX documentation package (FMi)
+\c@StandardModuleDepth=\count87
+\guard@level=\count88
+\MacrocodeTopsep=\skip43
+\MacroIndent=\dimen103
+\macro@cnt=\count89
+\MacroTopsep=\skip44
+\index@excludelist=\toks14
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tools/multicol.sty
+Package: multicol 2016/02/08 v1.8o multicolumn formatting (FMi)
+\c@tracingmulticols=\count90
+\mult@box=\box26
+\multicol@leftmargin=\dimen104
+\c@unbalance=\count91
+\c@collectmore=\count92
+\doublecol@number=\count93
+\multicoltolerance=\count94
+\multicolpretolerance=\count95
+\full@width=\dimen105
+\page@free=\dimen106
+\premulticols=\dimen107
+\postmulticols=\dimen108
+\multicolsep=\skip45
+\multicolbaselineskip=\skip46
+\partial@page=\box27
+\last@line=\box28
+\maxbalancingoverflow=\dimen109
+\mult@rightbox=\box29
+\mult@grightbox=\box30
+\mult@gfirstbox=\box31
+\mult@firstbox=\box32
+\@tempa=\box33
+\@tempa=\box34
+\@tempa=\box35
+\@tempa=\box36
+\@tempa=\box37
+\@tempa=\box38
+\@tempa=\box39
+\@tempa=\box40
+\@tempa=\box41
+\@tempa=\box42
+\@tempa=\box43
+\@tempa=\box44
+\@tempa=\box45
+\@tempa=\box46
+\@tempa=\box47
+\@tempa=\box48
+\@tempa=\box49
+\c@columnbadness=\count96
+\c@finalcolumnbadness=\count97
+\last@try=\dimen110
+\multicolovershoot=\dimen111
+\multicolundershoot=\dimen112
+\mult@nat@firstbox=\box50
+\colbreak@box=\box51
+\mc@col@check@num=\count98
+)
+\IndexMin=\dimen113
+\c@IndexColumns=\count99
+\GlossaryMin=\dimen114
+\c@GlossaryColumns=\count100
+\check@sum=\count101
+\bslash@cnt=\count102
+\wrong@table=\toks15
+\c@CodelineNo=\count103
+))
+(./fontspec-doc-style.sty
+Package: fontspec-doc-style 
+ (./fontspec.sty
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3kernel/expl3.sty
+Package: expl3 2016/11/21 v6760 L3 programming layer (loader) 
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+Package: expl3 2016/11/21 v6760 L3 programming layer (code)
+L3 Module: l3bootstrap 2016/06/13 v6596 L3 Bootstrap code
+L3 Module: l3names 2016/10/13 v6722 L3 Namespace for primitives
+L3 Module: l3basics 2016/09/01 v6696 L3 Basic definitions
+L3 Module: l3expan 2016/08/19 v6684 L3 Argument expansion
+L3 Module: l3tl 2016/08/19 v6692 L3 Token lists
+L3 Module: l3str 2016/08/19 v6692 L3 Strings
+L3 Module: l3seq 2016/08/19 v6685 L3 Sequences and stacks
+L3 Module: l3int 2016/09/07 v6700 L3 Integers
+\c_max_int=\count104
+\l_tmpa_int=\count105
+\l_tmpb_int=\count106
+\g_tmpa_int=\count107
+\g_tmpb_int=\count108
+L3 Module: l3quark 2016/08/19 v6685 L3 Quarks
+L3 Module: l3prg 2016/08/18 v6679 L3 Control structures
+\g__prg_map_int=\count109
+L3 Module: l3clist 2016/08/19 v6685 L3 Comma separated lists
+L3 Module: l3token 2016/09/01 v6695 L3 Experimental token manipulation
+L3 Module: l3prop 2016/08/19 v6685 L3 Property lists
+L3 Module: l3msg 2016/08/19 v6691 L3 Messages
+L3 Module: l3file 2016/08/19 v6685 L3 File and I/O operations
+\l_iow_line_count_int=\count110
+\l__iow_target_count_int=\count111
+\l__iow_current_line_int=\count112
+\l__iow_current_word_int=\count113
+\l__iow_current_indentation_int=\count114
+L3 Module: l3skip 2016/08/19 v6692 L3 Dimensions and skips
+\c_zero_dim=\dimen115
+\c_max_dim=\dimen116
+\l_tmpa_dim=\dimen117
+\l_tmpb_dim=\dimen118
+\g_tmpa_dim=\dimen119
+\g_tmpb_dim=\dimen120
+\c_zero_skip=\skip47
+\c_max_skip=\skip48
+\l_tmpa_skip=\skip49
+\l_tmpb_skip=\skip50
+\g_tmpa_skip=\skip51
+\g_tmpb_skip=\skip52
+\c_zero_muskip=\muskip10
+\c_max_muskip=\muskip11
+\l_tmpa_muskip=\muskip12
+\l_tmpb_muskip=\muskip13
+\g_tmpa_muskip=\muskip14
+\g_tmpb_muskip=\muskip15
+L3 Module: l3keys 2016/09/21 v6711 L3 Key-value interfaces
+\l_keys_choice_int=\count115
+L3 Module: l3fp 2016/11/21 v6761 L3 Floating points
+\c__fp_leading_shift_int=\count116
+\c__fp_middle_shift_int=\count117
+\c__fp_trailing_shift_int=\count118
+\c__fp_big_leading_shift_int=\count119
+\c__fp_big_middle_shift_int=\count120
+\c__fp_big_trailing_shift_int=\count121
+\c__fp_Bigg_leading_shift_int=\count122
+\c__fp_Bigg_middle_shift_int=\count123
+\c__fp_Bigg_trailing_shift_int=\count124
+L3 Module: l3box 2016/08/19 v6685 L3 Experimental boxes
+\c_empty_box=\box52
+\l_tmpa_box=\box53
+\l_tmpb_box=\box54
+\g_tmpa_box=\box55
+\g_tmpb_box=\box56
+L3 Module: l3coffins 2016/08/19 v6685 L3 Coffin code layer
+\l__coffin_internal_box=\box57
+\l__coffin_internal_dim=\dimen121
+\l__coffin_offset_x_dim=\dimen122
+\l__coffin_offset_y_dim=\dimen123
+\l__coffin_x_dim=\dimen124
+\l__coffin_y_dim=\dimen125
+\l__coffin_x_prime_dim=\dimen126
+\l__coffin_y_prime_dim=\dimen127
+\c_empty_coffin=\box58
+\l__coffin_aligned_coffin=\box59
+\l__coffin_aligned_internal_coffin=\box60
+\l_tmpa_coffin=\box61
+\l_tmpb_coffin=\box62
+\l__coffin_display_coffin=\box63
+\l__coffin_display_coord_coffin=\box64
+\l__coffin_display_pole_coffin=\box65
+\l__coffin_display_offset_dim=\dimen128
+\l__coffin_display_x_dim=\dimen129
+\l__coffin_display_y_dim=\dimen130
+L3 Module: l3color 2016/06/13 v6596 L3 Experimental color support
+L3 Module: l3sys 2015/09/25 v6087 L3 Experimental system/runtime functions
+L3 Module: l3candidates 2016/08/19 v6688 L3 Experimental additions to l3kernel
+\l__box_top_dim=\dimen131
+\l__box_bottom_dim=\dimen132
+\l__box_left_dim=\dimen133
+\l__box_right_dim=\dimen134
+\l__box_top_new_dim=\dimen135
+\l__box_bottom_new_dim=\dimen136
+\l__box_left_new_dim=\dimen137
+\l__box_right_new_dim=\dimen138
+\l__box_internal_box=\box66
+\l__coffin_bounding_shift_dim=\dimen139
+\l__coffin_left_corner_dim=\dimen140
+\l__coffin_right_corner_dim=\dimen141
+\l__coffin_bottom_corner_dim=\dimen142
+\l__coffin_top_corner_dim=\dimen143
+\l__coffin_scaled_total_height_dim=\dimen144
+\l__coffin_scaled_width_dim=\dimen145
+L3 Module: l3luatex 2016/08/18 v6679 L3 Experimental LuaTeX-specific functions
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+File: l3xdvidpfmx.def 2016/08/18 v6679 L3 Experimental driver: xdvipdfmx
+\l__driver_tmp_box=\box67
+))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+Package: xparse 2016/11/21 v6760 L3 Experimental document command parser
+\l__xparse_current_arg_int=\count125
+\l__xparse_m_args_int=\count126
+\l__xparse_mandatory_args_int=\count127
+\l__xparse_processor_int=\count128
+\l__xparse_v_nesting_int=\count129
+)
+Package: fontspec 2017/01/02 v2.5c Font selection for XeLaTeX and LuaLaTeX
+
+(./fontspec-xetex.sty
+Package: fontspec-xetex 2017/01/02 v2.5c Font selection for XeLaTeX and LuaLaTe
+X
+\l__fontspec_script_int=\count130
+\l__fontspec_language_int=\count131
+\l__fontspec_strnum_int=\count132
+\l__fontspec_tmp_int=\count133
+\l__fontspec_em_int=\count134
+\l__fontspec_emdef_int=\count135
+\l__fontspec_tmpa_dim=\dimen146
+\l__fontspec_tmpb_dim=\dimen147
+\l__fontspec_tmpc_dim=\dimen148
+\g__file_internal_ior=\read1
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/fontenc.sty
+Package: fontenc 2005/09/27 v1.99g Standard LaTeX package
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/fontspec/tuenc.def
+File: tuenc.def 2016/01/29 v0.1 Unicode font encoding for LaTeX2e
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/fontspec/tufontrange-T1.def
+File: ucfontrange-T1.def 
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/fontspec/tufontrange-TS1.def
+File: ucfontrange-TS1.def 
+)))
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \fontspec with sig. 'O{}mO{}' on line 424.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmainfont with sig. 'O{}mO{}' on line 440.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setsansfont with sig. 'O{}mO{}' on line 456.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmonofont with sig. 'O{}mO{}' on line 472.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmathrm with sig. 'O{}mO{}' on line 477.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setboldmathrm with sig. 'O{}mO{}' on line 482.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmathsf with sig. 'O{}mO{}' on line 487.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmathtt with sig. 'O{}mO{}' on line 492.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontfamily with sig. 'mO{}mO{}' on line 512.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontface with sig. 'mO{}mO{}' on line 516.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \defaultfontfeatures with sig. 't+om' on line 523.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \addfontfeatures with sig. 'm' on line 574.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontfeature with sig. 'mm' on line 585.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newAATfeature with sig. 'mmmm' on line 593.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newopentypefeature with sig. 'mmm' on line 601.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \aliasfontfeature with sig. 'mm' on line 622.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \aliasfontfeatureoption with sig. 'mmm' on line 639.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontscript with sig. 'mm' on line 643.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontlanguage with sig. 'mm' on line 647.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \DeclareFontsExtensions with sig. 'm' on line 652.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \IfFontFeatureActiveTF with sig. 'mmm' on line 660.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \EncodingCommand with sig. 'mO{}m' on line 3322.
+.................................................
+.................................................
+. LaTeX info: "xparse/redefine-command"
+. 
+. Redefining command \DeclareUnicodeEncoding with sig. 'mm' on line 3368.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \ImportEncodingFile with sig. 'm' on line 3377.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \UndeclareSymbol with sig. 'm' on line 3384.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \UndeclareComposite with sig. 'mm' on line 3390.
+.................................................
+
+(./fontspec.cfg)
+LaTeX Info: Redefining \itshape on input line 3571.
+LaTeX Info: Redefining \slshape on input line 3576.
+LaTeX Info: Redefining \scshape on input line 3581.
+LaTeX Info: Redefining \upshape on input line 3586.
+LaTeX Info: Redefining \em on input line 3606.
+LaTeX Info: Redefining \emph on input line 3623.
+LaTeX Info: Redefining \- on input line 3630.
+.................................................
+. LaTeX info: "xparse/redefine-command"
+. 
+. Redefining command \oldstylenums with sig. 'm' on line 3725.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \liningnums with sig. 'm' on line 3729.
+.................................................
+))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/booktabs/booktabs.sty
+Package: booktabs 2016/04/27 v1.618033 publication quality tables
+\heavyrulewidth=\dimen149
+\lightrulewidth=\dimen150
+\cmidrulewidth=\dimen151
+\belowrulesep=\dimen152
+\belowbottomsep=\dimen153
+\aboverulesep=\dimen154
+\abovetopsep=\dimen155
+\cmidrulesep=\dimen156
+\cmidrulekern=\dimen157
+\defaultaddspace=\dimen158
+\@cmidla=\count136
+\@cmidlb=\count137
+\@aboverulesep=\dimen159
+\@belowrulesep=\dimen160
+\@thisruleclass=\count138
+\@lastruleclass=\count139
+\@thisrulewidth=\dimen161
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tools/calc.sty
+Package: calc 2014/10/28 v4.3 Infix arithmetic (KKT,FJ)
+\calc@Acount=\count140
+\calc@Bcount=\count141
+\calc@Adimen=\dimen162
+\calc@Bdimen=\dimen163
+\calc@Askip=\skip53
+\calc@Bskip=\skip54
+LaTeX Info: Redefining \setlength on input line 80.
+LaTeX Info: Redefining \addtolength on input line 81.
+\calc@Ccount=\count142
+\calc@Cskip=\skip55
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/caption/caption.sty
+Package: caption 2016/02/21 v3.3-144 Customizing captions (AR)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/caption/caption3.sty
+Package: caption3 2016/02/04 v1.7-139 caption3 kernel (AR)
+Package caption3 Info: TeX engine: e-TeX on input line 67.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/keyval.sty
+Package: keyval 2014/10/28 v1.15 key=value parser (DPC)
+\KV@toks@=\toks16
+)
+\captionmargin=\dimen164
+\captionmargin@=\dimen165
+\captionwidth=\dimen166
+\caption@tempdima=\dimen167
+\caption@indent=\dimen168
+\caption@parindent=\dimen169
+\caption@hangindent=\dimen170
+)
+\c@ContinuedFloat=\count143
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/color.sty
+Package: color 2016/01/03 v1.1b Standard LaTeX Color (DPC)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics-cfg/color.cfg
+File: color.cfg 2016/01/02 v1.6 sample color configuration
+)
+Package color Info: Driver file: xetex.def on input line 143.
+
+(/usr/local/texlive/2016/texmf-dist/tex/xelatex/xetex-def/xetex.def
+File: xetex.def 2016/04/06 v4.08 LaTeX color/graphics driver for XeTeX (TeX Liv
+e/RRM/JK)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+Package: infwarerr 2010/04/08 v1.3 Providing info/warning/error messages (HO)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)
+)))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/enumitem/enumitem.sty
+Package: enumitem 2011/09/28 v3.5.2 Customized lists
+\labelindent=\skip56
+\enit@outerparindent=\dimen171
+\enit@toks=\toks17
+\enit@inbox=\box68
+\enitdp@description=\count144
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
+Package: fancyvrb 2008/02/07
+
+Style option: `fancyvrb' v2.7a, with DG/SPQR fixes, and firstline=lastline fix 
+<2008/02/07> (tvz)
+\FV@CodeLineNo=\count145
+\FV@InFile=\read2
+\FV@TabBox=\box69
+\c@FancyVerbLine=\count146
+\FV@StepNumber=\count147
+\FV@OutFile=\write3
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/hologo.sty
+Package: hologo 2012/04/26 v1.10 A logo collection with bookmark support (HO)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
+Package: kvsetkeys 2012/04/25 v1.16 Key value parser (HO)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/etexcmds.sty
+Package: etexcmds 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/ifluatex.sty
+Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)
+Package ifluatex Info: LuaTeX not detected.
+)
+Package etexcmds Info: Could not find \expanded.
+(etexcmds)             That can mean that you are not using pdfTeX 1.50 or
+(etexcmds)             that some package has redefined \expanded.
+(etexcmds)             In the latter case, load this package earlier.
+))
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty
+Package: kvdefinekeys 2011/04/07 v1.3 Define keys (HO)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
+Package: pdftexcmds 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO
+)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/ifpdf/ifpdf.sty
+Package: ifpdf 2016/04/04 v3.0 Provides the ifpdf switch
+)
+Package pdftexcmds Info: LuaTeX not detected.
+Package pdftexcmds Info: pdfTeX >= 1.30 not detected.
+Package pdftexcmds Info: \pdf@primitive is available.
+Package pdftexcmds Info: \pdf@ifprimitive is available.
+Package pdftexcmds Info: \pdfdraftmode not found.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+Package: ifvtex 2010/03/01 v1.5 Detect VTeX and its facilities (HO)
+Package ifvtex Info: VTeX not detected.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+Package: kvoptions 2011/06/30 v3.11 Key value format for package options (HO)
+)
+Package hologo Info: Using driver `xetex'.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/graphicx.sty
+Package: graphicx 2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/graphics.sty
+Package: graphics 2016/01/03 v1.0q Standard LaTeX Graphics (DPC,SPQR)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/trig.sty
+Package: trig 2016/01/03 v1.10 sin cos tan (DPC)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
+File: graphics.cfg 2016/01/02 v1.10 sample graphics configuration
+)
+Package graphics Info: Driver file: xetex.def on input line 95.
+)
+\Gin@req@height=\dimen172
+\Gin@req@width=\dimen173
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/ifthen.sty
+Package: ifthen 2014/09/29 v1.1c Standard LaTeX ifthen package (DPC)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/url/url.sty
+\Urlmuskip=\muskip16
+Package: url 2013/09/16  ver 3.4  Verb mode for urls, etc.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tools/varioref.sty
+Package: varioref 2016/02/16 v1.5c package for extended references (FMi)
+\c@vrcnt=\count148
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/varwidth/varwidth.sty
+Package: varwidth 2009/03/30 ver 0.92;  Variable-width minipages
+\@vwid@box=\box70
+\sift@deathcycles=\count149
+\@vwid@loff=\dimen174
+\@vwid@roff=\dimen175
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/microtype.sty
+Package: microtype 2016/05/01 v2.6 Micro-typographical refinements (RS)
+\MT@toks=\toks18
+\MT@count=\count150
+LaTeX Info: Redefining \textls on input line 774.
+\MT@outer@kern=\dimen176
+LaTeX Info: Redefining \textmicrotypecontext on input line 1310.
+\MT@listname@count=\count151
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/microtype-xetex.def
+File: microtype-xetex.def 2016/05/01 v2.6 Definitions specific to xetex (RS)
+LaTeX Info: Redefining \lsstyle on input line 255.
+)
+Package microtype Info: Loading configuration file microtype.cfg.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/microtype.cfg
+File: microtype.cfg 2016/05/01 v2.6 microtype main configuration file (RS)
+))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tocloft/tocloft.sty
+Package: tocloft 2013/05/02 v2.3f parameterised ToC, etc., typesetting
+Package tocloft Info: The document has section divisions on input line 44.
+\cftparskip=\skip57
+\cftbeforetoctitleskip=\skip58
+\cftaftertoctitleskip=\skip59
+\cftbeforepartskip=\skip60
+\cftpartnumwidth=\skip61
+\cftpartindent=\skip62
+\cftbeforesecskip=\skip63
+\cftsecindent=\skip64
+\cftsecnumwidth=\skip65
+\cftbeforesubsecskip=\skip66
+\cftsubsecindent=\skip67
+\cftsubsecnumwidth=\skip68
+\cftbeforesubsubsecskip=\skip69
+\cftsubsubsecindent=\skip70
+\cftsubsubsecnumwidth=\skip71
+\cftbeforeparaskip=\skip72
+\cftparaindent=\skip73
+\cftparanumwidth=\skip74
+\cftbeforesubparaskip=\skip75
+\cftsubparaindent=\skip76
+\cftsubparanumwidth=\skip77
+\cftbeforeloftitleskip=\skip78
+\cftafterloftitleskip=\skip79
+\cftbeforefigskip=\skip80
+\cftfigindent=\skip81
+\cftfignumwidth=\skip82
+\c@lofdepth=\count152
+\c@lotdepth=\count153
+\cftbeforelottitleskip=\skip83
+\cftafterlottitleskip=\skip84
+\cftbeforetabskip=\skip85
+\cfttabindent=\skip86
+\cfttabnumwidth=\skip87
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/framed/framed.sty
+Package: framed 2011/10/22 v 0.96: framed or shaded text with page breaks
+\OuterFrameSep=\skip88
+\fb@frw=\dimen177
+\fb@frh=\dimen178
+\FrameRule=\dimen179
+\FrameSep=\dimen180
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/docmute/docmute.sty
+Package: docmute 2012/03/22 v1.4 Input stand-alone documents
+)
+::__fontspec_init:
+::__fontspec_if_detect_external:n{AldusNovaPro-Book.otf}
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,} {aldus-nova}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{aldus-nova}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {aldus-nova}
+(/Users/will/Dropbox/texmf/tex/latex/willfonts/aldus-nova.fontspec)
+::__fontspec_extract_all_features:n{,}
+fontid:aldus-nova-:-Numbers=OldStyle,Ligatures=TeX,Extension = .otf,UprightFont
+ = AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont = PalatinoNo
+vaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle,Ligatures=TeX,Exte
+nsion = .otf,UprightFont = AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItal
+ic,BoldFont = PalatinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt}
+
+Setting bold font "PalatinoNovaPro-Medium" with series "bx"
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[AldusNovaPro-Book.otf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[AldusNovaPro-Book.otf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'AldusNovaPro-Book' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+save family: aldus-nova
+==fontid_tl:"aldus-nova-:-Numbers=OldStyle,Ligatures=TeX,Extension = .otf,Uprig
+htFont = AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont = Pala
+tinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt".
+\g__fontspec_family_aldus-nova_int=\count154
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{AldusNovaPro-Book}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+Book}
+= declare_shape: {AldusNovaPro-Book} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{AldusNovaPro-Book}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+Book}
+==== Setup NFSS shape: <-> AldusNovaPro-Book
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'AldusNovaPro-Book' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: AldusNovaPro-Book
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{n}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoNovaPro-Medium}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-Medium}
+= declare_shape: {PalatinoNovaPro-Medium} {bx} {n}
+== size: -
+::__fontspec_load_fontname:n{PalatinoNovaPro-Medium}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-Medium}
+==== Setup NFSS shape: <-> PalatinoNovaPro-Medium
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'PalatinoNovaPro-Medium' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: PalatinoNovaPro-Medium
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{n}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{AldusNovaPro-BookItalic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+BookItalic}
+= declare_shape: {AldusNovaPro-BookItalic} {m} {it}
+== size: -
+::__fontspec_load_fontname:n{AldusNovaPro-BookItalic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+BookItalic}
+==== Setup NFSS shape: <-> AldusNovaPro-BookItalic
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'AldusNovaPro-BookItalic' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: AldusNovaPro-BookItalic
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{it}...
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{sl}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoNovaPro-MediumIt}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-MediumIt}
+= declare_shape: {PalatinoNovaPro-MediumIt} {bx} {it}
+== size: -
+::__fontspec_load_fontname:n{PalatinoNovaPro-MediumIt}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-MediumIt}
+==== Setup NFSS shape: <-> PalatinoNovaPro-MediumIt
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'PalatinoNovaPro-MediumIt' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: PalatinoNovaPro-MediumIt
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{it}...
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{sl}...
+.................................................
+. fontspec info: "defining-font"
+. 
+.  Font family 'aldus-nova(0)' created for font 'aldus-nova' with options
+. [Numbers=OldStyle,Ligatures=TeX,Extension = .otf,UprightFont =
+. AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont =
+. PalatinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[AldusNovaPro-Book.otf]/OT:script=latn;language=DFLT;mapping=tex-text;"
+. - 'small caps'  (m/sc) with NFSS spec.: 
+. - 'bold' (bx/n) with NFSS spec.:
+. <->"[PalatinoNovaPro-Medium.otf]/OT:script=latn;language=DFLT;mapping=tex-tex
+t;"
+. - 'bold small caps'  (bx/sc) with NFSS spec.: 
+. - 'italic' (m/it) with NFSS spec.:
+. <->"[AldusNovaPro-BookItalic.otf]/OT:script=latn;language=DFLT;mapping=tex-te
+xt;"
+. - 'italic small caps'  (m/itsc) with NFSS spec.: 
+. - 'bold italic' (bx/it) with NFSS spec.:
+. <->"[PalatinoNovaPro-MediumIt.otf]/OT:script=latn;language=DFLT;mapping=tex-t
+ext;"
+. - 'bold italic small caps'  (bx/itsc) with NFSS spec.: 
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+*  Font family 'aldus-nova(0)' created for font 'aldus-nova' with options
+* [Numbers=OldStyle,Ligatures=TeX,Extension = .otf,UprightFont =
+* AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont =
+* PalatinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[AldusNovaPro-Book.otf]/OT:script=latn;language=DFLT;mapping=tex-text;"
+* - 'small caps'  (m/sc) with NFSS spec.: 
+* - 'bold' (bx/n) with NFSS spec.:
+* <->"[PalatinoNovaPro-Medium.otf]/OT:script=latn;language=DFLT;mapping=tex-tex
+t;"
+* - 'bold small caps'  (bx/sc) with NFSS spec.: 
+* - 'italic' (m/it) with NFSS spec.:
+* <->"[AldusNovaPro-BookItalic.otf]/OT:script=latn;language=DFLT;mapping=tex-te
+xt;"
+* - 'italic small caps'  (m/itsc) with NFSS spec.: 
+* - 'bold italic' (bx/it) with NFSS spec.:
+* <->"[PalatinoNovaPro-MediumIt.otf]/OT:script=latn;language=DFLT;mapping=tex-t
+ext;"
+* - 'bold italic small caps'  (bx/itsc) with NFSS spec.: 
+*************************************************
+LaTeX Info: Redefining \rmfamily on input line 65.
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,} {palatino-sans-light}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{palatino-sans-light}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {palatino-sans
+-light}
+(/Users/will/Dropbox/texmf/tex/latex/willfonts/palatino-sans-light.fontspec)
+::__fontspec_extract_all_features:n{,}
+fontid:palatino-sans-light-:-Numbers=OldStyle,Ligatures=TeX,Extension = .ttf,Up
+rightFont = PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,BoldFon
+t = PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle,Ligatures=TeX,Exte
+nsion = .ttf,UprightFont = PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-L
+ightIta,BoldFont = PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Ita
+lic}
+Setting bold font "PalatinoSansCom-Regular" with series "bx"
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[PalatinoSansCom-Light.ttf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[PalatinoSansCom-Light.ttf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'PalatinoSansCom-Light' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+save family: palatino-sans-light
+==fontid_tl:"palatino-sans-light-:-Numbers=OldStyle,Ligatures=TeX,Extension = .
+ttf,UprightFont = PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,B
+oldFont = PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic".
+\g__fontspec_family_palatino-sans-light_int=\count155
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-Light}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Light}
+= declare_shape: {PalatinoSansCom-Light} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-Light}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Light}
+==== Setup NFSS shape: <-> PalatinoSansCom-Light
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'PalatinoSansCom-Light' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: PalatinoSansCom-Light
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{n}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-Regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Regular}
+= declare_shape: {PalatinoSansCom-Regular} {bx} {n}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-Regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Regular}
+==== Setup NFSS shape: <-> PalatinoSansCom-Regular
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'PalatinoSansCom-Regular' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: PalatinoSansCom-Regular
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{n}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-LightIta}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-LightIta}
+= declare_shape: {PalatinoSansCom-LightIta} {m} {it}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-LightIta}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-LightIta}
+==== Setup NFSS shape: <-> PalatinoSansCom-LightIta
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'PalatinoSansCom-LightIta' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: PalatinoSansCom-LightIta
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{it}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{sl}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-Italic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Italic}
+= declare_shape: {PalatinoSansCom-Italic} {bx} {it}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-Italic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Italic}
+==== Setup NFSS shape: <-> PalatinoSansCom-Italic
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'PalatinoSansCom-Italic' with script 'Latin' and language 'Default'. 
+*************************************************
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: mapping=tex-text;
+=== sized font: PalatinoSansCom-Italic
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{it}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{sl}...
+.................................................
+. fontspec info: "defining-font"
+. 
+.  Font family 'palatino-sans-light(0)' created for font 'palatino-sans-light'
+. with options [Numbers=OldStyle,Ligatures=TeX,Extension = .ttf,UprightFont =
+. PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,BoldFont =
+. PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[PalatinoSansCom-Light.ttf]/OT:script=latn;language=DFLT;mapping=tex-text
+;"
+. - 'small caps'  (m/sc) with NFSS spec.: 
+. - 'bold' (bx/n) with NFSS spec.:
+. <->"[PalatinoSansCom-Regular.ttf]/OT:script=latn;language=DFLT;mapping=tex-te
+xt;"
+. - 'bold small caps'  (bx/sc) with NFSS spec.: 
+. - 'italic' (m/it) with NFSS spec.:
+. <->"[PalatinoSansCom-LightIta.ttf]/OT:script=latn;language=DFLT;mapping=tex-t
+ext;"
+. - 'italic small caps'  (m/itsc) with NFSS spec.: 
+. - 'bold italic' (bx/it) with NFSS spec.:
+. <->"[PalatinoSansCom-Italic.ttf]/OT:script=latn;language=DFLT;mapping=tex-tex
+t;"
+. - 'bold italic small caps'  (bx/itsc) with NFSS spec.: 
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+*  Font family 'palatino-sans-light(0)' created for font 'palatino-sans-light'
+* with options [Numbers=OldStyle,Ligatures=TeX,Extension = .ttf,UprightFont =
+* PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,BoldFont =
+* PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[PalatinoSansCom-Light.ttf]/OT:script=latn;language=DFLT;mapping=tex-text
+;"
+* - 'small caps'  (m/sc) with NFSS spec.: 
+* - 'bold' (bx/n) with NFSS spec.:
+* <->"[PalatinoSansCom-Regular.ttf]/OT:script=latn;language=DFLT;mapping=tex-te
+xt;"
+* - 'bold small caps'  (bx/sc) with NFSS spec.: 
+* - 'italic' (m/it) with NFSS spec.:
+* <->"[PalatinoSansCom-LightIta.ttf]/OT:script=latn;language=DFLT;mapping=tex-t
+ext;"
+* - 'italic small caps'  (m/itsc) with NFSS spec.: 
+* - 'bold italic' (bx/it) with NFSS spec.:
+* <->"[PalatinoSansCom-Italic.ttf]/OT:script=latn;language=DFLT;mapping=tex-tex
+t;"
+* - 'bold italic small caps'  (bx/itsc) with NFSS spec.: 
+*************************************************
+LaTeX Info: Redefining \sffamily on input line 65.
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,BoldFont=lmmonolt10-bold.otf} {lmmonolt10-regular.otf}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{lmmonolt10-regular.otf}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-re
+gular.otf}
+::__fontspec_extract_all_features:n{,BoldFont=lmmonolt10-bold.otf}
+fontid:lmmonolt10-regular-:-Numbers=OldStyle,WordSpace={1,0,0},PunctuationSpace
+=WordSpace,BoldFont=lmmonolt10-bold.otf
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle,WordSpace={1,0,0},
+PunctuationSpace=WordSpace,BoldFont=lmmonolt10-bold.otf}
+Setting bold font "lmmonolt10-bold.otf" with series "bx"
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace}}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace}}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[lmmonolt10-regular.otf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[lmmonolt10-regular.otf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace},}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec} {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace
+={WordSpace}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'lmmonolt10-regular' with script 'Latin' and language 'Default'. 
+*************************************************
+save family: lmmonolt10-regular.otf
+==fontid_tl:"lmmonolt10-regular-:-Numbers=OldStyle,WordSpace={1,0,0},Punctuatio
+nSpace=WordSpace,BoldFont=lmmonolt10-bold.otf".
+\g__fontspec_family_lmmonolt10-regular.otf_int=\count156
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{lmmonolt10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-re
+gular}
+= declare_shape: {lmmonolt10-regular} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{lmmonolt10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-re
+gular}
+==== Setup NFSS shape: <-> lmmonolt10-regular
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace},,,,}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec} {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace
+={WordSpace}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'lmmonolt10-regular' with script 'Latin' and language 'Default'. 
+*************************************************
+==== Gathered features: 
+=== sized font: lmmonolt10-regular
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{lmmonolt10-regular.otf(0)}{m}{n}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{lmmonolt10-bold.otf}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-bo
+ld.otf}
+= declare_shape: {lmmonolt10-bold} {bx} {n}
+== size: -
+::__fontspec_load_fontname:n{lmmonolt10-bold}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-bo
+ld}
+==== Setup NFSS shape: <-> lmmonolt10-bold
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace},,,,}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec} {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace
+={WordSpace}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'lmmonolt10-bold' with script 'Latin' and language 'Default'. 
+*************************************************
+==== Gathered features: 
+=== sized font: lmmonolt10-bold
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{lmmonolt10-regular.otf(0)}{bx}{n}...
+.................................................
+. fontspec info: "defining-font"
+. 
+.  Font family 'lmmonolt10-regular.otf(0)' created for font
+. 'lmmonolt10-regular.otf' with options
+. [Numbers=OldStyle,WordSpace={1,0,0},PunctuationSpace=WordSpace,BoldFont=lmmon
+olt10-bold.otf].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[lmmonolt10-regular.otf]/OT:script=latn;language=DFLT;"
+. - 'small caps'  (m/sc) with NFSS spec.: 
+. and font adjustment code:
+. \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+. \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+. - 'bold' (bx/n) with NFSS spec.:
+. <->"[lmmonolt10-bold.otf]/OT:script=latn;language=DFLT;"
+. - 'bold small caps'  (bx/sc) with NFSS spec.: 
+. and font adjustment code:
+. \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+. \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+*  Font family 'lmmonolt10-regular.otf(0)' created for font
+* 'lmmonolt10-regular.otf' with options
+* [Numbers=OldStyle,WordSpace={1,0,0},PunctuationSpace=WordSpace,BoldFont=lmmon
+olt10-bold.otf].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[lmmonolt10-regular.otf]/OT:script=latn;language=DFLT;"
+* - 'small caps'  (m/sc) with NFSS spec.: 
+* and font adjustment code:
+* \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+* \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+* - 'bold' (bx/n) with NFSS spec.:
+* <->"[lmmonolt10-bold.otf]/OT:script=latn;language=DFLT;"
+* - 'bold small caps'  (bx/sc) with NFSS spec.: 
+* and font adjustment code:
+* \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+* \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+*************************************************
+LaTeX Info: Redefining \ttfamily on input line 66.
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,} {lmmonoltcond10-regular.otf}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{lmmonoltcond10-regular.otf}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonoltcond1
+0-regular.otf}
+::__fontspec_extract_all_features:n{,}
+fontid:lmmonoltcond10-regular-:-Numbers=OldStyle
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[lmmonoltcond10-regular.otf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[lmmonoltcond10-regular.otf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'lmmonoltcond10-regular' with script 'Latin' and language 'Default'. 
+*************************************************
+save family: lmmonoltcond10-regular.otf
+==fontid_tl:"lmmonoltcond10-regular-:-Numbers=OldStyle".
+\g__fontspec_family_lmmonoltcond10-regular.otf_int=\count157
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{lmmonoltcond10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonoltcond1
+0-regular}
+= declare_shape: {lmmonoltcond10-regular} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{lmmonoltcond10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonoltcond1
+0-regular}
+==== Setup NFSS shape: <-> lmmonoltcond10-regular
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},,,,}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+*************************************************
+* fontspec warning: "icu-feature-not-exist-in-font"
+* 
+*  OpenType feature 'Lowercase=' (onum) not available for font
+* 'lmmonoltcond10-regular' with script 'Latin' and language 'Default'. 
+*************************************************
+==== Gathered features: 
+=== sized font: lmmonoltcond10-regular
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{lmmonoltcond10-regular.otf(0)}{m}{n}...
+.................................................
+. fontspec info: "defining-font"
+. 
+.  Font family 'lmmonoltcond10-regular.otf(0)' created for font
+. 'lmmonoltcond10-regular.otf' with options [Numbers=OldStyle].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[lmmonoltcond10-regular.otf]/OT:script=latn;language=DFLT;"
+. - 'small caps'  (m/sc) with NFSS spec.: 
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+*  Font family 'lmmonoltcond10-regular.otf(0)' created for font
+* 'lmmonoltcond10-regular.otf' with options [Numbers=OldStyle].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[lmmonoltcond10-regular.otf]/OT:script=latn;language=DFLT;"
+* - 'small caps'  (m/sc) with NFSS spec.: 
+*************************************************
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/hyperref.sty
+Package: hyperref 2012/11/06 v6.83m Hypertext links for LaTeX
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
+Package: hobsub-hyperref 2012/05/28 v1.13 Bundle oberdiek, subset hyperref (HO)
+
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+Package: hobsub-generic 2012/05/28 v1.13 Bundle oberdiek, subset generic (HO)
+Package: hobsub 2012/05/28 v1.13 Construct package bundles (HO)
+Package hobsub Info: Skipping package `infwarerr' (already loaded).
+Package hobsub Info: Skipping package `ltxcmds' (already loaded).
+Package hobsub Info: Skipping package `ifluatex' (already loaded).
+Package hobsub Info: Skipping package `ifvtex' (already loaded).
+Package: intcalc 2007/09/27 v1.1 Expandable calculations with integers (HO)
+Package hobsub Info: Skipping package `ifpdf' (already loaded).
+Package hobsub Info: Skipping package `etexcmds' (already loaded).
+Package hobsub Info: Skipping package `kvsetkeys' (already loaded).
+Package hobsub Info: Skipping package `kvdefinekeys' (already loaded).
+Package hobsub Info: Skipping package `pdftexcmds' (already loaded).
+Package: pdfescape 2011/11/25 v1.13 Implements pdfTeX's escape features (HO)
+Package: bigintcalc 2012/04/08 v1.3 Expandable calculations on big integers (HO
+)
+Package: bitset 2011/01/30 v1.1 Handle bit-vector datatype (HO)
+Package: uniquecounter 2011/01/30 v1.2 Provide unlimited unique counter (HO)
+)
+Package hobsub Info: Skipping package `hobsub' (already loaded).
+Package: letltxmacro 2010/09/02 v1.4 Let assignment for LaTeX macros (HO)
+Package: hopatch 2012/05/28 v1.2 Wrapper for package hooks (HO)
+Package: xcolor-patch 2011/01/30 xcolor patch
+Package: atveryend 2011/06/30 v1.8 Hooks at the very end of document (HO)
+Package atveryend Info: \enddocument detected (standard20110627).
+Package atveryend Info: \docmute@enddocument detected (standard20110627).
+Package: atbegshi 2011/10/05 v1.16 At begin shipout hook (HO)
+Package: refcount 2011/10/16 v3.4 Data extraction from label references (HO)
+Package: hycolor 2011/01/30 v1.7 Color options for hyperref/bookmark (HO)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/oberdiek/auxhook.sty
+Package: auxhook 2011/03/04 v1.3 Hooks for auxiliary files (HO)
+
+
+Package auxhook Warning: Cannot patch \document,
+(auxhook)                using \AtBeginDocument instead.
+
+)
+\@linkdim=\dimen181
+\Hy@linkcounter=\count158
+\Hy@pagecounter=\count159
+ (/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/pd1enc.def
+File: pd1enc.def 2012/11/06 v6.83m Hyperref: PDFDocEncoding definition (HO)
+)
+\Hy@SavedSpaceFactor=\count160
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/latexconfig/hyperref.cfg
+File: hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive
+)
+Package hyperref Info: Option `bookmarks' set `true' on input line 4328.
+Package hyperref Info: Option `colorlinks' set `true' on input line 4328.
+
+
+Package hyperref Warning: XeTeX driver only supports unicode.
+(hyperref)                Enabling option `unicode'.
+
+Package hyperref Info: Option `unicode' set `true' on input line 4328.
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/puenc.def
+File: puenc.def 2012/11/06 v6.83m Hyperref: PDF Unicode definition (HO)
+)
+Package hyperref Info: Hyper figures OFF on input line 4452.
+Package hyperref Info: Link nesting OFF on input line 4457.
+Package hyperref Info: Hyper index ON on input line 4460.
+Package hyperref Info: Plain pages OFF on input line 4467.
+Package hyperref Info: Backreferencing OFF on input line 4472.
+Package hyperref Info: Implicit mode ON; LaTeX internals redefined.
+Package hyperref Info: Bookmarks ON on input line 4697.
+\c@Hy@tempcnt=\count161
+LaTeX Info: Redefining \url on input line 5051.
+\XeTeXLinkMargin=\dimen182
+\Fld@menulength=\count162
+\Field@Width=\dimen183
+\Fld@charsize=\dimen184
+Package hyperref Info: Hyper figures OFF on input line 6305.
+Package hyperref Info: Link nesting OFF on input line 6310.
+Package hyperref Info: Hyper index ON on input line 6313.
+Package hyperref Info: backreferencing OFF on input line 6320.
+Package hyperref Info: Link coloring ON on input line 6323.
+Package hyperref Info: Link coloring with OCG OFF on input line 6330.
+Package hyperref Info: PDF/A mode OFF on input line 6335.
+LaTeX Info: Redefining \ref on input line 6375.
+LaTeX Info: Redefining \pageref on input line 6379.
+\Hy@abspage=\count163
+\c@Item=\count164
+\c@Hfootnote=\count165
+)
+
+Package hyperref Message: Driver (autodetected): hxetex.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/hxetex.def
+File: hxetex.def 2012/11/06 v6.83m Hyperref driver for XeTeX
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/stringenc.sty
+Package: stringenc 2011/12/02 v1.10 Convert strings between diff. encodings (HO
+)
+)
+\pdfm@box=\box71
+\c@Hy@AnnotLevel=\count166
+\HyField@AnnotCount=\count167
+\Fld@listcount=\count168
+\c@bookmark@seq@number=\count169
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty
+Package: rerunfilecheck 2011/04/15 v1.7 Rerun checks for auxiliary files (HO)
+Package rerunfilecheck Info: Feature \pdfmdfivesum is not available
+(rerunfilecheck)             (e.g. pdfTeX or LuaTeX with package `pdftexcmds').
+
+(rerunfilecheck)             Therefore file contents cannot be checked efficien
+tly
+(rerunfilecheck)             and the loading of the package is aborted.
+)
+\Hy@SectionHShift=\skip89
+)
+\X=\box72
+\Y=\box73
+\c@example=\count170
+\c@argument=\count171
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \otf with sig. 'somm' on line 248.
+.................................................
+)
+(./fontspec-doc-enc.aux)
+\openout1 = `fontspec-doc-enc.aux'.
+
+LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for TU/lmr/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for PD1/pdf/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+LaTeX Font Info:    Checking defaults for PU/pdf/m/n on input line 4.
+LaTeX Font Info:    ... okay on input line 4.
+Package doc Info: Made | a short reference for \verb on input line 4.
+.................................................
+. fontspec info: "setup-math"
+. 
+.  Adjusting the maths setup (use [no-math] to avoid this). 
+.................................................
+\symlegacymaths=\mathgroup4
+LaTeX Font Info:    Overwriting symbol font `legacymaths' in version `bold'
+(Font)                  OT1/cmr/m/n --> OT1/cmr/bx/n on input line 4.
+LaTeX Font Info:    Redeclaring math accent \acute on input line 4.
+LaTeX Font Info:    Redeclaring math accent \grave on input line 4.
+LaTeX Font Info:    Redeclaring math accent \ddot on input line 4.
+LaTeX Font Info:    Redeclaring math accent \tilde on input line 4.
+LaTeX Font Info:    Redeclaring math accent \bar on input line 4.
+LaTeX Font Info:    Redeclaring math accent \breve on input line 4.
+LaTeX Font Info:    Redeclaring math accent \check on input line 4.
+LaTeX Font Info:    Redeclaring math accent \hat on input line 4.
+LaTeX Font Info:    Redeclaring math accent \dot on input line 4.
+LaTeX Font Info:    Redeclaring math accent \mathring on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \colon on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Gamma on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Delta on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Theta on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Lambda on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Xi on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Pi on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Sigma on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Upsilon on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Phi on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Psi on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \Omega on input line 4.
+LaTeX Font Info:    Redeclaring math symbol \mathdollar on input line 4.
+LaTeX Font Info:    Redeclaring symbol font `operators' on input line 4.
+LaTeX Font Info:    Encoding `OT1' has changed to `TU' for symbol font
+(Font)              `operators' in the math version `normal' on input line 4.
+LaTeX Font Info:    Overwriting symbol font `operators' in version `normal'
+(Font)                  OT1/cmr/m/n --> TU/aldus-nova(0)/m/n on input line 4.
+LaTeX Font Info:    Encoding `OT1' has changed to `TU' for symbol font
+(Font)              `operators' in the math version `bold' on input line 4.
+LaTeX Font Info:    Overwriting symbol font `operators' in version `bold'
+(Font)                  OT1/cmr/bx/n --> TU/aldus-nova(0)/m/n on input line 4.
+LaTeX Font Info:    Overwriting symbol font `operators' in version `normal'
+(Font)                  TU/aldus-nova(0)/m/n --> TU/aldus-nova(0)/m/n on input 
+line 4.
+LaTeX Font Info:    Overwriting math alphabet `\mathit' in version `normal'
+(Font)                  OT1/cmr/m/it --> TU/aldus-nova(0)/m/it on input line 4.
+
+LaTeX Font Info:    Overwriting math alphabet `\mathbf' in version `normal'
+(Font)                  OT1/cmr/bx/n --> TU/aldus-nova(0)/bx/n on input line 4.
+
+LaTeX Font Info:    Overwriting math alphabet `\mathsf' in version `normal'
+(Font)                  OT1/cmss/m/n --> TU/palatino-sans-light(0)/m/n on input
+ line 4.
+LaTeX Font Info:    Overwriting math alphabet `\mathtt' in version `normal'
+(Font)                  OT1/cmtt/m/n --> TU/lmmonolt10-regular.otf(0)/m/n on in
+put line 4.
+LaTeX Font Info:    Overwriting symbol font `operators' in version `bold'
+(Font)                  TU/aldus-nova(0)/m/n --> TU/aldus-nova(0)/bx/n on input
+ line 4.
+LaTeX Font Info:    Overwriting math alphabet `\mathit' in version `bold'
+(Font)                  OT1/cmr/bx/it --> TU/aldus-nova(0)/bx/it on input line 
+4.
+LaTeX Font Info:    Overwriting math alphabet `\mathsf' in version `bold'
+(Font)                  OT1/cmss/bx/n --> TU/palatino-sans-light(0)/bx/n on inp
+ut line 4.
+LaTeX Font Info:    Overwriting math alphabet `\mathtt' in version `bold'
+(Font)                  OT1/cmtt/m/n --> TU/lmmonolt10-regular.otf(0)/bx/n on i
+nput line 4.
+Package caption Info: Begin \AtBeginDocument code.
+Package caption Info: hyperref package is loaded.
+Package caption Info: End \AtBeginDocument code.
+LaTeX Info: Redefining \microtypecontext on input line 4.
+Package microtype Info: Character protrusion enabled (level 2).
+Package microtype Info: Using default protrusion set `alltext'.
+Package microtype Info: No adjustment of tracking.
+Package microtype Info: No adjustment of spacing.
+Package microtype Info: No adjustment of kerning.
+Package microtype Info: Loading generic settings for font family
+(microtype)             `aldus-nova' (encoding: TU).
+(microtype)             For optimal results, create family-specific settings.
+(microtype)             See the microtype manual for details.
+\AtBeginShipoutBox=\box74
+Package hyperref Info: Link coloring ON on input line 4.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/nameref.sty
+Package: nameref 2012/10/27 v2.43 Cross-referencing by name of section
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
+Package: gettitlestring 2010/12/03 v1.4 Cleanup title references (HO)
+)
+\c@section@level=\count172
+LaTeX Info: Redefining \Ref on input line 513.
+)
+LaTeX Info: Redefining \ref on input line 4.
+LaTeX Info: Redefining \pageref on input line 4.
+LaTeX Info: Redefining \nameref on input line 4.
+
+(./fontspec-doc-enc.out) (./fontspec-doc-enc.out)
+\@outlinefile=\write4
+\openout4 = `fontspec-doc-enc.out'.
+
+LaTeX Info: Redefining \Ref on input line 4.
+\docmute@nestinglevel=\count173
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <7> on input line 8.
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <5> on input line 8.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/mt-cmr.cfg
+File: mt-cmr.cfg 2013/05/19 v2.2 microtype config. file: Computer Modern Roman 
+(RS)
+)
+Package microtype Info: Loading generic settings for font family
+(microtype)             `palatino-sans-light' (encoding: TU).
+(microtype)             For optimal results, create family-specific settings.
+(microtype)             See the microtype manual for details.
+Package microtype Info: Loading generic settings for font family
+(microtype)             `lmmonolt10-regular.otf' (encoding: TU).
+(microtype)             For optimal results, create family-specific settings.
+(microtype)             See the microtype manual for details.
+ [1
+
+]
+[2]
+Overfull \hbox (25.95908pt too wide) in paragraph at lines 166--166
+[]\TU/lmmonolt10-regular.otf(0)/m/n/10 \DeclareTextCommand{$\OMS/cmsy/m/n/10 h$
+[]\TU/aldus-nova(0)/m/it/10 command$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular
+.otf(0)/m/n/10 }{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 encoding$\OMS/
+cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/n/10 }[$\OMS/cmsy/m/n/10 h$[]\T
+U/aldus-nova(0)/m/it/10 num$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/
+m/n/10 ][$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 default$\OMS/cmsy/m/n/
+10 i$[]\TU/lmmonolt10-regular.otf(0)/m/n/10 ]{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-n
+ova(0)/m/it/10 code$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/n/10 }
+ 
+ []
+
+
+Overfull \hbox (27.98126pt too wide) in paragraph at lines 170--170
+[]\TU/lmmonolt10-regular.otf(0)/m/n/10 \DeclareTextCompositeCommand{$\OMS/cmsy/
+m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 command$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt1
+0-regular.otf(0)/m/n/10 }{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 encod
+ing$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/n/10 }{$\OMS/cmsy/m/n/
+10 h$[]\TU/aldus-nova(0)/m/it/10 letter$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-reg
+ular.otf(0)/m/n/10 }{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 code$\OMS/
+cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/n/10 } 
+ []
+
+[3]
+Package atveryend Info: Empty hook `BeforeClearDocument' on input line 189.
+ [4]
+Package atveryend Info: Empty hook `AfterLastShipout' on input line 189.
+ (./fontspec-doc-enc.aux)
+Package atveryend Info: Empty hook `AtVeryEndDocument' on input line 189.
+Package atveryend Info: Empty hook `AtEndAfterFileList' on input line 189.
+Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 189.
+ ) 
+Here is how much of TeX's memory you used:
+ 22127 strings out of 493624
+ 435094 string characters out of 6144511
+ 498131 words of memory out of 5000000
+ 25338 multiletter control sequences out of 15000+600000
+ 4184 words of font info for 38 fonts, out of 8000000 for 9000
+ 1328 hyphenation exceptions out of 8191
+ 57i,5n,94p,10357b,452s stack positions out of 5000i,500n,10000p,200000b,80000s
+
+Output written on fontspec-doc-enc.pdf (4 pages).
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.out b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.out
new file mode 100644
index 00000000000..1ee521cf9a2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.out
@@ -0,0 +1,4 @@
+\BOOKMARK [0][-]{part.1}{\376\377\000I\000\040\000C\000o\000m\000m\000a\000n\000d\000s\000\040\000f\000o\000r\000\040\000a\000c\000c\000e\000n\000t\000s\000\040\000a\000n\000d\000\040\000s\000y\000m\000b\000o\000l\000s\000\040\000\050\000`\000e\000n\000c\000o\000d\000i\000n\000g\000s\000'\000\051}{}% 1
+\BOOKMARK [1][-]{section.1}{\376\377\000A\000\040\000n\000e\000w\000\040\000U\000n\000i\000c\000o\000d\000e\000-\000b\000a\000s\000e\000d\000\040\000e\000n\000c\000o\000d\000i\000n\000g\000\040\000f\000r\000o\000m\000\040\000s\000c\000r\000a\000t\000c\000h}{part.1}% 2
+\BOOKMARK [1][-]{section.2}{\376\377\000A\000d\000j\000u\000s\000t\000i\000n\000g\000\040\000a\000\040\000p\000r\000e\000-\000e\000x\000i\000s\000t\000i\000n\000g\000\040\000e\000n\000c\000o\000d\000i\000n\000g}{part.1}% 3
+\BOOKMARK [1][-]{section.3}{\376\377\000S\000u\000m\000m\000a\000r\000y\000\040\000o\000f\000\040\000c\000o\000m\000m\000a\000n\000d\000s}{part.1}% 4
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.pdf b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.pdf
new file mode 100644
index 00000000000..537ed051f60
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.pdf
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.synctex.gz b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.synctex.gz
new file mode 100644
index 00000000000..cded7488ec9
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.synctex.gz
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.tex
new file mode 100644
index 00000000000..53e9e20d790
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-enc.tex
@@ -0,0 +1,198 @@
+\documentclass[a4paper]{ltxdoc}
+\usepackage{fontspec-doc-style}
+
+\begin{document}
+
+\part{Commands for accents and symbols (`encodings')}
+\label{part:enc}
+
+\textbf{The functionality described in this section is experimental.}
+
+In the pre-Unicode era, significant work was required by \LaTeX\ to ensure that
+input characters in the source could be interpreted correctly depending on file encoding,
+and that glyphs in the output were selected correctly depending on the font encoding.
+With Unicode, we have the luxury of a single file and font encoding that is used for both input
+and output.
+
+While this may provide some illusion that we could get away simply with typing
+Unicode text and receive correct output, this is not always the case.
+For a start, hyphenation in particular is language-specific, so tags should be used
+when switch between languages in a document.
+The \pkg{babel} and \pkg{polyglossia} packages both provide features for this.
+
+Multilingual documents will often use different fonts for different languages,
+not just for style, but for the more pragmatic reason that fonts do not all contain
+the same glyphs. (In fact, only test fonts such as Code2000 provide
+anywhere near the full Unicode coverage.)
+Indeed, certain fonts may be perfect for a certain application but miss a handful
+of necessary diacritics or accented letters.
+In these cases, \pkg{fontspec} can leverage the font encoding technology built
+into \LaTeX2\ to provide on a per-font basis either provide fallback options or
+error messages when a desired accent or symbol is not available.
+However, at present
+these features can only be provided for input using \LaTeX\ commands rather
+than Unicode input; for example, typing |\`e| instead of |è| or |\textcopyright|
+instead of |©| in the source file.
+
+The most widely-used encoding in \LaTeXe\ was |T1| with companion `|TS1|' symbols
+provided by the \pkg{textcomp} package.
+These encodings provided glyphs to typeset text in a variety of western European languages.
+As with most legacy \LaTeXe\ input methods, accents and symbols were input using
+encoding-dependent commands such as |\`e| as described above.
+As of 2017, in \LaTeXe\ on \XeTeX\ and \LuaTeX, the default encoding is |TU|,
+which uses Unicode for input and output.
+The |TU| encoding provides appropriate encoding-dependent definitions for input commands
+to match the coverage of the |T1+TS1| encodings.
+Wider coverage is not provided by default since (a)~each font will provide different glyph coverage, and
+(b)~it is expected that most users will be writing with direct Unicode input.
+
+For those users who do need finer-grained control, \pkg{fontspec} provides an
+interface for a more extensible system.
+
+
+\section{A new Unicode-based encoding from scratch}
+
+Let's say you need to provide support for a document originally written with fonts
+in the |OT2| encoding, which contains encoding-dependent commands for Cyrillic letters.
+An example from the |OT2| encoding definition file (|ot2enc.def|) reads:
+\begin{Verbatim}[numbers=left,firstnumber=57]
+\DeclareTextSymbol{\CYRIE}{OT2}{5}
+\DeclareTextSymbol{\CYRDJE}{OT2}{6}
+\DeclareTextSymbol{\CYRTSHE}{OT2}{7}
+\DeclareTextSymbol{\cyrnje}{OT2}{8}
+\DeclareTextSymbol{\cyrlje}{OT2}{9}
+\DeclareTextSymbol{\cyrdzhe}{OT2}{10}
+\end{Verbatim}
+
+To recreate this encoding in a form suitable for \pkg{fontspec}, create a new file
+named, say, |fontrange-cyr.def| and populate it with
+\begin{Verbatim}
+...
+\DeclareTextSymbol{\CYRIE}  {\LastDeclaredEncoding}{"0404}
+\DeclareTextSymbol{\CYRDJE} {\LastDeclaredEncoding}{"0402}
+\DeclareTextSymbol{\CYRTSHE}{\LastDeclaredEncoding}{"040B}
+\DeclareTextSymbol{\cyrnje} {\LastDeclaredEncoding}{"045A}
+\DeclareTextSymbol{\cyrlje} {\LastDeclaredEncoding}{"0459}
+\DeclareTextSymbol{\cyrdzhe}{\LastDeclaredEncoding}{"045F}
+...
+\end{Verbatim}
+The numbers |"0404|, |"0402|, \dots, are the Unicode slots (in hexadecimal)
+of each glyph respectively.
+The \pkg{fontspec} package provides a number of shorthands to simplify this style of input; in this case,
+you could also write
+\begin{Verbatim}
+\EncodingSymbol{\CYRIE}{"0404}
+...
+\end{Verbatim}
+
+To use this encoding in a \pkg{fontspec} font, you would first add this to your preamble:
+\begin{Verbatim}
+\DeclareUnicodeEncoding{unicyr}{
+  \input{fontrange-cyr.def}
+}
+\end{Verbatim}
+Then follow it up with a font loading call such as
+\begin{Verbatim}
+\setmainfont{...}[NFSSEncoding=unicyr]
+\end{Verbatim}
+The first argument |unicyr| is the name of the `encoding' to use in the
+font family. (There's nothing special about the name chosen but it must be unique.)
+The second argument to |\DeclareUnicodeEncoding| also allows adjustments to be made
+for per-font changes.
+We'll cover this use case in the next section.
+
+
+\section{Adjusting a pre-existing encoding}
+
+There are three reasons to adjust a pre-existing encoding:
+to add, to remove, and to redefine some symbols, letters, and/or accents.
+
+When adding symbols, etc., simply write
+\begin{Verbatim}
+\DeclareUnicodeEncoding{unicyr}{
+  \input{tuenc.def}
+  \input{fontrange-cyr.def}
+  \EncodingSymbol{\textruble}{"20BD}
+}
+\end{Verbatim}
+Of course if you consistently add a number of symbols to an encoding it would be
+a good idea to create a new |fontrange-XX.def| file to suit your needs.
+
+When removing symbols, use the |\UndeclareSymbol|\marg{cmd} command.
+For example, if you a loading a font that you know is missing, say, the interrobang
+(not that unusual a situation), you might write:
+\begin{Verbatim}
+\DeclareUnicodeEncoding{nobang}{
+  \input{tuenc.def}
+  \UndeclareSymbol\textinterrobang
+}
+\end{Verbatim}
+Provided that you use the command |\textinterrobang| to typeset this symbol,
+it will appear in fonts with the default encoding, while in any font loaded with
+the |nobang| encoding an attempt to access the symbol will either use the default
+fallback definition or return an error, depending on the symbol being undeclared.
+
+
+The third use case is to redefine a symbol or accent. The most common use case
+in this scenario is to adjust a specific accent command to either fine-tune its placement
+or to `fake' it entirely.
+For example, the underdot diacritic is used in typeset Sanskrit,
+but it is not necessarily included as an accent symbol is all fonts.
+By default the underdot is defined in |TU| as:
+\begin{Verbatim}
+\EncodingAccent{\d}{"0323}
+\end{Verbatim}
+For fonts with a missing (or poorly-spaced) |"0323| accent glyph, the `traditional' \TeX\ fake accent
+construction could be used instead:
+\begin{Verbatim}
+\DeclareUnicodeEncoding{fakeacc}{
+  \input{tuenc.def}
+  \EncodingCommand{\d}[1]{%
+    \hmode@bgroup
+      \o@lign{\relax#1\crcr\hidewidth\ltx@sh@ft{-1ex}.\hidewidth}%
+    \egroup
+  }
+}
+\end{Verbatim}
+This would be set up in a document as such:
+\begin{Verbatim}
+\newfontfamily\sanskitfont{CharisSIL}
+\newfontfamily\titlefont{Posterama}[NFSSEncoding=fakeacc]
+\end{Verbatim}
+Then later in the document, no additional work is needed:
+\begin{Verbatim}
+...{\titlefont   kalita\d m}...  % <- uses fake accent
+...{\sanskitfont kalita\d m}...  % <- uses real accent
+\end{Verbatim}
+To reiterate from above, typing this input with Unicode text (`|kalitaṃ|')
+will \emph{bypass} this encoding mechanism and you will receive only what is contained
+literally within the font.
+
+
+\section{Summary of commands}
+
+The \LaTeXe\ kernel provides the following font encoding commands suitable for Unicode encodings:
+\begin{quote}\obeylines
+  \cs{DeclareTextCommand}\marg{command}\marg{encoding}\oarg{num}\oarg{default}\marg{code}
+  \cs{DeclareUnicodeAccent}\marg{command}\marg{encoding}\marg{slot}
+  \cs{DeclareTextSymbol}\marg{command}\marg{encoding}\marg{slot}
+  \cs{DeclareTextComposite}\marg{command}\marg{encoding}\marg{letter}\marg{slot}
+  \cs{DeclareTextCompositeCommand}\marg{command}\marg{encoding}\marg{letter}\marg{code}
+  \cs{UndeclareTextCommand}\marg{command}\marg{encoding}
+\end{quote}
+See |fntguide.pdf| for full documentation of these.
+As shown above, the following shorthands a provided by \pkg{fontspec} to simplify
+the process of defining Unicode font range encodings:
+\begin{quote}\obeylines
+  \cs{EncodingCommand}\marg{command}\oarg{num}\oarg{default}\marg{code}
+  \cs{EncodingAccent}\marg{command}\marg{code}
+  \cs{EncodingSymbol}\marg{command}\marg{code}
+  \cs{EncodingComposite}\marg{command}\marg{letter}\marg{slot}
+  \cs{EncodingCompositeCommand}\marg{command}\marg{letter}\marg{code}
+  \cs{UndeclareSymbol}\marg{command}
+  \cs{UndeclareComposite}\marg{command}\marg{letter}
+\end{quote}
+Despite its name, |\UndeclareSymbol| can be used for commands defined by all three of |\EncodingCommand|,
+|\EncodingAccent|, and |\EncodingSymbol|.
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featsel.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featsel.aux
new file mode 100644
index 00000000000..87a3d5bcf2b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featsel.aux
@@ -0,0 +1,33 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@setckpt{fontspec-doc-featsel}{
+\setcounter{page}{19}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{4}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{2}
+\setcounter{section}{7}
+\setcounter{subsection}{0}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{0}
+\setcounter{table}{0}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{2}
+\setcounter{vrcnt}{12}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{4}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{26}
+\setcounter{example}{4}
+\setcounter{argument}{0}
+\setcounter{section@level}{4}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.aux
new file mode 100644
index 00000000000..b51d9188896
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.aux
@@ -0,0 +1,87 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{III\hspace  {1em}Selecting font features}{20}{part.3}}
+\newlabel{sec:selectingfeature}{{III}{20}{Selecting font features}{part.3}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {8}Default settings}{20}{section.8}}
+\newlabel{sec:defaults}{{Section\nobreakspace  {}8}{20}{Default settings}{section.8}{}}
+\newlabel{ex:dff}{{5}{20}{Default settings}{example.5}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {9}Default settings from a file}{21}{section.9}}
+\@writefile{toc}{\contentsline {section}{\numberline {10}Working with the currently selected features}{22}{section.10}}
+\newlabel{sec:addfontfeatures}{{Section\nobreakspace  {}10}{22}{Working with the currently selected features}{section.10}{}}
+\newlabel{ex:aff}{{6}{22}{Working with the currently selected features}{example.6}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {10.1}Priority of feature selection}{22}{subsection.10.1}}
+\@writefile{toc}{\contentsline {section}{\numberline {11}Different features for different font shapes}{23}{section.11}}
+\newlabel{sec:bfit-feat}{{Section\nobreakspace  {}11}{23}{Different features for different font shapes}{section.11}{}}
+\newlabel{ex:itfeat}{{7}{23}{Different features for different font shapes}{example.7}{}}
+\newlabel{ex:scfeat}{{8}{23}{Different features for different font shapes}{example.8}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {12}Selecting fonts from TrueType Collections (TTC files)}{24}{section.12}}
+\@writefile{toc}{\contentsline {section}{\numberline {13}Different features for different font sizes}{25}{section.13}}
+\newlabel{sec:sizefeature}{{Section\nobreakspace  {}13}{25}{Different features for different font sizes}{section.13}{}}
+\newlabel{13@xvr}{{}{25}{Different features for different font sizes}{section.13}{}}
+\newlabel{13@vr}{{}{25}{Different features for different font sizes}{section.13}{}}
+\newlabel{ex:sizefeat}{{9}{25}{Different features for different font sizes}{example.9}{}}
+\newlabel{14@xvr}{{}{25}{Different features for different font sizes}{figure.caption.12}{}}
+\newlabel{14@vr}{{}{25}{Different features for different font sizes}{figure.caption.12}{}}
+\@writefile{toc}{\contentsline {paragraph}{Interaction with other features}{25}{section*.14}}
+\@writefile{lot}{\contentsline {table}{\numberline {1}{\ignorespaces Syntax for specifying the size to apply custom font features.\relax }}{26}{table.caption.13}}
+\providecommand*\caption@xref[2]{\@setref\relax\@undefined{#1}}
+\newlabel{tab:sizing}{{Table\nobreakspace  {}1}{26}{Syntax for specifying the size to apply custom font features.\relax }{table.caption.13}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {14}Font independent options}{26}{section.14}}
+\newlabel{sec:font-ind-features}{{Section\nobreakspace  {}14}{26}{Font independent options}{section.14}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.1}Colour}{26}{subsection.14.1}}
+\newlabel{ex:color}{{10}{26}{Colour}{example.10}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.2}Scale}{27}{subsection.14.2}}
+\newlabel{ex:scale}{{11}{27}{Scale}{example.11}{}}
+\newlabel{15@xvr}{{}{28}{Scale}{figure.caption.16}{}}
+\newlabel{15@vr}{{}{28}{Scale}{figure.caption.16}{}}
+\newlabel{16@xvr}{{}{28}{Scale}{figure.caption.16}{}}
+\newlabel{16@vr}{{}{28}{Scale}{figure.caption.16}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.3}Interword space}{28}{subsection.14.3}}
+\newlabel{ex:wordspace}{{12}{28}{Interword space}{example.12}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.4}Post-punctuation space}{28}{subsection.14.4}}
+\newlabel{ex:punctspace}{{13}{28}{Post-punctuation space}{example.13}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.5}The hyphenation character}{28}{subsection.14.5}}
+\newlabel{ex:hyphchar}{{14}{28}{The hyphenation character}{example.14}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.6}Optical font sizes}{30}{subsection.14.6}}
+\newlabel{sec:opticalsize}{{Section\nobreakspace  {}14.6}{30}{Optical font sizes}{subsection.14.6}{}}
+\newlabel{ex:optsize}{{15}{30}{Optical font sizes}{example.15}{}}
+\newlabel{ex:optsize0}{{16}{30}{Optical font sizes}{example.16}{}}
+\newlabel{17@xvr}{{}{30}{Optical font sizes}{figure.caption.21}{}}
+\newlabel{17@vr}{{}{30}{Optical font sizes}{figure.caption.21}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.7}Font transformations}{30}{subsection.14.7}}
+\newlabel{ex:fake}{{17}{30}{Font transformations}{example.17}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {14.8}Letter spacing}{31}{subsection.14.8}}
+\newlabel{ex:tracking}{{18}{31}{Letter spacing}{example.18}{}}
+\newlabel{18@xvr}{{}{31}{Letter spacing}{figure.caption.23}{}}
+\newlabel{18@vr}{{}{31}{Letter spacing}{figure.caption.23}{}}
+\@setckpt{fontspec-doc-featset}{
+\setcounter{page}{32}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{5}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{3}
+\setcounter{section}{14}
+\setcounter{subsection}{8}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{0}
+\setcounter{table}{1}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{5}
+\setcounter{vrcnt}{18}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{5}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{43}
+\setcounter{example}{18}
+\setcounter{argument}{0}
+\setcounter{section@level}{2}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex
new file mode 100644
index 00000000000..a0e95d282e6
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-featset.tex
@@ -0,0 +1,627 @@
+
+\part{Selecting font features}
+\label{sec:selectingfeature}
+
+The commands discussed so far such as \cs{fontspec} each take an optional argument for
+accessing the font features of the requested font.
+Commands are provided to set default features to be applied for all fonts, and even to change the features that a font is presently loaded with.
+Different font shapes can be loaded with separate features, and different features can even be selected for different sizes that the font appears in.
+This part discusses these options.
+
+\section{Default settings}
+\label{sec:defaults}
+
+\cmdbox{\cmd\defaultfontfeatures\marg{font features}}
+
+It is sometimes useful to define
+font features that are applied to every subsequent font selection command.
+This may be defined with the
+\cmd{\defaultfontfeatures} command, shown in \exref{dff}.
+New calls of \cs{defaultfontfeatures} overwrite previous ones, and defaults can be reset by calling the command with an empty argument.
+
+\begin{Xexample}{dff}{A demonstration of the \cs{defaultfontfeatures} command.}
+  \fontspec{texgyreadventor-regular.otf}
+  Some default text 0123456789 \\
+  \defaultfontfeatures{
+     Numbers=OldStyle, Color=888888
+  }
+  \fontspec{texgyreadventor-regular.otf}
+  Now grey, with old-style figures:
+  0123456789
+\end{Xexample}
+
+\cmdbox{\cmd\defaultfontfeatures\oarg{font name}\marg{font features}}
+
+Default font features can be specified on a per-font and per-face basis
+by using the optional argument to \cs{defaultfontfeatures} as shown.
+\begin{Verbatim}
+  \defaultfontfeatures[texgyreadventor-regular.otf]{Color=blue}
+  \setmainfont{texgyreadventor-regular.otf}% will be blue
+\end{Verbatim}
+Multiple fonts may be affected by using a comma separated list of font names.
+
+\cmdbox{\cmd\defaultfontfeatures\oarg{\cs{font-switch}}\marg{font features}}
+
+\textbf{New in v2.4}.
+Defaults can also be applied to symbolic families such as those created with the |\newfontfamily| command and for |\rmfamily|, |\sffamily|, and |\ttfamily|:
+\begin{Verbatim}
+  \defaultfontfeatures[\rmfamily,\sffamily]{Ligatures=TeX}
+  \setmainfont{texgyreadventor-regular.otf}% will use standard TeX ligatures
+\end{Verbatim}
+The line above to set \TeX-like ligatures is now activated by \emph{default} in \texttt{fontspec.cfg}.
+To reset default font features, simply call the command with an empty argument:
+\begin{Verbatim}
+  \defaultfontfeatures[\rmfamily,\sffamily]{}
+  \setmainfont{texgyreadventor-regular.otf}% will no longer use standard TeX ligatures
+\end{Verbatim}
+
+\cmdbox{\cmd\defaultfontfeatures\texttt{+}\marg{font features}\\
+        \cmd\defaultfontfeatures\texttt{+}\oarg{font name}\marg{font features}}
+
+\textbf{New in v2.4}.
+Using the |+| form of the command appends the \meta{font features} to any already-selected defaults.
+
+
+\section{Default settings from a file}
+
+In addition to the defaults that may be specified in the document as described above, when a font is first loaded, a configuration file is searched
+for with the name `\meta{fontname}\texttt{.fontspec}'.\footnote{Located in the current folder or within a standard \texttt{texmf} location.}
+
+The contents of this file can be used to specify default font features without
+having to have this information present within each document.
+\meta{fontname} is stripped of spaces and file extensions are omitted; for
+example, the line above for \TeX\ Gyre Adventor could be placed in a file
+called \texttt{TeXGyreAdventor.fontspec}, or for specifying options for
+\texttt{texgyreadventor-regular.otf} (when loading by filename), the configuration
+file would be \texttt{texgyreadventor-regular.fontspec}.
+(N.B. the lettercase of the names should match.)
+
+This mechanism can be used to define custom names or aliases for your font collections.
+If you create a file \texttt{MyCharis.fontspec} containing, say,
+\begin{Verbatim}
+  \defaultfontfeatures[My Charis]
+   {
+    Extension = .ttf ,
+    UprightFont = CharisSILR,
+    BoldFont = CharisSILB,
+    ItalicFont = CharisSILI,
+    BoldItalicFont = CharisSILBI,
+    % <any other desired options>
+   }
+\end{Verbatim}
+you can load that custom family with \verb|\fontspec{My Charis}| and similar.
+The optional argument to \cs{defaultfontfeatures} must match that requested by the font loading command (\verb|\fontspec|, etc.), else the options won't take effect.
+
+Finally, note that options for font faces can also be defined in this way.
+To continue the example above, here we colour the different faces:
+\begin{Verbatim}
+  \defaultfontfeatures[CharisSILR]{Color=blue}
+  \defaultfontfeatures[CharisSILB]{Color=red}
+\end{Verbatim}
+And such configuration lines can be stored either inline inside \texttt{My Charis.fontspec} or within their own \texttt{.fontspec} files; in this way, \pkg{fontspec} is designed to handle `nested' configuration options as well.
+
+\section{Working with the currently selected features}
+\label{sec:addfontfeatures}
+
+
+\cmdbox{\cmd\IfFontFeatureActiveTF\marg{font feature}\marg{true code}\marg{false code}}
+
+This command queries the currently selected font face and executes the appropriate branch based on whether the \meta{font feature} as specified by \pkg{fontspec} is currently active.
+
+For example, the following will print `True':
+\begin{Verbatim}
+\setmainfont{texgyrepagella-regular.otf}[Numbers=OldStyle]
+\IfFontFeatureActiveTF{Numbers=OldStyle}{True}{False}
+\end{Verbatim}
+
+Note that there is no way for \pkg{fontspec} to know what the default features of a font will be. For example, by default the |texgyrepagella| fonts use lining numbers. But in the following example, querying for lining numbers returns false since they have not been explicitly requested:
+\begin{Verbatim}
+\setmainfont{texgyrepagella-regular.otf}
+\IfFontFeatureActiveTF{Numbers=Lining}{True}{False}
+\end{Verbatim}
+
+Please note: At time of writing this function only supports OpenType fonts; AAT/Graphite fonts under the \XeTeX\ engine are not supported.
+
+
+\cmdbox{\cmd\addfontfeatures\marg{font features}}
+
+This command allows font features to
+be changed without knowing what features are currently selected or even what
+font is being used. A good example of this could be to add a hook to all
+tabular material to use monospaced numbers, as shown in \exref{aff}.
+If you attempt to \emph{change} an already-selected feature, \pkg{fontspec} will try to de-activate any features that clash with the new ones.
+\Eg, the following two invocations are mutually exclusive:
+\begin{Verbatim}
+\addfontfeature{Numbers=OldStyle}...
+\addfontfeature{Numbers=Lining}...
+123
+\end{Verbatim}
+Since |Numbers=Lining| comes last, it takes precedence and deactivates the call |Numbers=OldStyle|.
+
+\begin{Lexample}{aff}{A demonstration of the \cs{addfontfeatures} command.}
+  \fontspec{texgyreadventor-regular.otf}%
+           [Numbers={Proportional,OldStyle}]
+  `In 1842, 999 people sailed 97 miles in
+   13 boats. In 1923, 111 people sailed 54
+   miles in 56 boats.'            \bigskip
+
+  {\addfontfeatures{Numbers={Monospaced,Lining}}
+  \begin{tabular}{@{} cccc @{}}
+            Year & People & Miles & Boats \\
+    \hline  1842 &  999   &  75   &  13   \\
+            1923 &  111   &  54   &  56
+  \end{tabular}}
+\end{Lexample}
+
+\DescribeMacro{\addfontfeature}
+This command may also be executed under the alias \cmd{\addfontfeature}.
+
+
+\subsection{Priority of feature selection}
+Features defined with \cs{addfontfeatures} override features
+specified by \cs{fontspec}, which in turn override features
+specified by \cs{defaultfontfeatures}.  If in doubt, whenever a
+new font is chosen for the first time, an entry is made in the
+transcript (\texttt{.log}) file displaying the font name and the
+features requested.
+
+
+\section{Different features for different font shapes}
+\label{sec:bfit-feat}
+
+\cmdbox{
+ \feat{BoldFeatures}\texttt=\marg{features} \\
+ \feat{ItalicFeatures}\texttt=\marg{features} \\
+ \feat{BoldItalicFeatures}\texttt=\marg{features} \\
+ \feat{SlantedFeatures}\texttt=\marg{features} \\
+ \feat{BoldSlantedFeatures}\texttt=\marg{features} \\
+ \feat{SmallCapsFeatures}\texttt=\marg{features}
+}
+
+It is entirely possible that separate fonts in a family will require
+separate options; \eg, Hoefler Text Italic contains various swash
+feature options that are completely unavailable in the upright shapes.
+
+The font features defined at the top level of the optional \cmd\fontspec\
+argument are applied to \emph{all} shapes of the family.
+Using \feat{Upright-}, \feat{SmallCaps-}, \feat{Bold-},
+\feat{Italic-}, and \feat{BoldItalicFeatures},
+separate font features may be defined to their respective shapes
+\emph{in addition} to, and with precedence over, the `global' font features.
+See \exref{itfeat}.
+
+\begin{Xexample}{itfeat}{Features for, say, just italics.}
+\fontspec{EBGaramond12-Regular.otf}%
+  [ItalicFont=EBGaramond12-Italic.otf]
+\itshape Don’t Ask Victoria! \\
+\addfontfeature{ItalicFeatures={Style=Swash}}
+Don’t Ask Victoria! \\
+\end{Xexample}
+
+Note that because most fonts include their small caps glyphs
+within the main font, features specified with \feat{SmallCapsFeatures} are applied \emph{in addition} to
+any other shape-specific features as defined above, and hence \feat{SmallCapsFeatures}
+can be nested within \feat{ItalicFeatures} and friends. Every combination
+of upright, italic, bold and small caps can thus be assigned individual
+features, as shown in the somewhat ludicrous \exref{scfeat}.
+
+\begin{Xexample}{scfeat}{An example of setting the \feat{SmallCapsFeatures}
+separately for each font shape.}
+  \fontspec{texgyretermes}[
+      Extension = {.otf},
+      UprightFont = {*-regular}, ItalicFont = {*-italic},
+      BoldFont = {*-bold}, BoldItalicFont = {*-bolditalic},
+      UprightFeatures={Color = 220022,
+           SmallCapsFeatures = {Color=115511}},
+       ItalicFeatures={Color = 2244FF,
+           SmallCapsFeatures = {Color=112299}},
+         BoldFeatures={Color = FF4422,
+           SmallCapsFeatures = {Color=992211}},
+   BoldItalicFeatures={Color = 888844,
+           SmallCapsFeatures = {Color=444422}},
+           ]
+  Upright {\scshape Small Caps}\\
+  \itshape Italic {\scshape Italic Small Caps}\\
+  \upshape\bfseries Bold {\scshape Bold Small Caps}\\
+  \itshape Bold Italic {\scshape Bold Italic Small Caps}
+\end{Xexample}
+
+
+\section{Selecting fonts from TrueType Collections (TTC files)}
+TrueType Collections are multiple fonts contained within a single file.
+Each font within a collection must be explicitly chosen using the \feat{FontIndex} command.
+Since TrueType Collections are often used to contain the italic/bold shapes in a family, \pkg{fontspec} automatically selects the italic, bold, and bold italic fontfaces from the same file.
+For example, to load the macOS system font Optima:
+\begin{Verbatim}
+\setmainfont{Optima.ttc}[
+  Path = /System/Library/Fonts/ ,
+  UprightFeatures    = {FontIndex=0} ,
+  BoldFeatures       = {FontIndex=1} ,
+  ItalicFeatures     = {FontIndex=2} ,
+  BoldItalicFeatures = {FontIndex=3} ,
+]
+\end{Verbatim}
+Support for TrueType Collections has only been tested in \XeTeX, but should also work with an up-to-date version of \LuaTeX\ and the \pkg{luaotfload} package.
+
+
+\section{Different features for different font sizes}
+\label{sec:sizefeature}
+
+\cmdbox{
+\ttfamily SizeFeatures = \char`\{\\
+\null\quad...\\
+\null\quad\char`\{~Size =
+\rmfamily\meta{size range}\ttfamily
+,
+\rmfamily \meta{font features}\ttfamily
+~\char`\} , \\
+\null\quad\char`\{~Size =
+\rmfamily\meta{size range}\ttfamily
+, Font =
+\rmfamily\meta{font name}\texttt, \meta{font features}\ttfamily
+~\char`\} , \\
+\null\quad... \\
+\char`\}}
+
+The \feat{SizeFeature} feature is a little more complicated
+than the previous features discussed. It allows different fonts
+and different font features to be selected for a given font
+family as the point size varies.
+
+It takes a comma separated list of braced, comma separated lists of features for each size range.
+Each sub-list must contain the \opt{Size} option
+to declare the size range, and optionally \opt{Font} to change the
+font based on size. Other (regular) fontspec features that are added
+are used on top of the font features that would be used anyway.
+A demonstration to clarify these details is shown in \exref{sizefeat}.
+A less trivial example is shown in the context of optical font sizes
+in \vref{sec:opticalsize}.
+
+\begin{Xexample}{sizefeat}{An example of specifying different font features for different sizes of font with \feat{SizeFeatures}.}
+  \fontspec{texgyrechorus-mediumitalic.otf}[
+    SizeFeatures={
+      {Size={-8}, Font=texgyrebonum-italic.otf, Color=AA0000},
+      {Size={8-14}, Color=00AA00},
+      {Size={14-}, Color=0000AA}} ]
+
+  {\scriptsize Small\par} Normal size\par {\Large Large\par}
+\end{Xexample}
+
+To be precise, the \opt{Size} sub-feature accepts arguments in the form shown in \vref{tab:sizing}.
+Braces around the size range are optional. For an exact font size (|Size=X|)
+font sizes chosen near that size will `snap'. For example, for size definitions
+at exactly 11pt and 14pt, if a 12pt font is requested \emph{actually} the
+11pt font will be selected. This is a remnant of the past when fonts were designed
+in metal (at obviously rigid sizes) and later when bitmap fonts were similarly
+designed for fixed sizes.
+
+If additional features are only required for a single size, the other sizes
+must still be specified.  As in:
+\begin{Verbatim}
+  SizeFeatures={
+     {Size=-10,Numbers=Uppercase},
+     {Size=10-}}
+\end{Verbatim}
+Otherwise, the font sizes greater than 10 won't be defined at all!
+
+\begin{table}
+\caption{Syntax for specifying the size to apply custom font features.}\label{tab:sizing}
+\centering
+\begin{tabular}{@{}ll@{}}
+\toprule
+Input & Font size, $s$ \\
+\midrule
+ |Size = X-| & $s \geq \texttt{X}$ \\
+ |Size = -Y| & $s < \texttt{Y}$ \\
+ |Size = X-Y| & $\texttt{X} \leq s < \texttt{Y}$ \\
+ |Size = X| & $s = \texttt{X}$ \\
+\bottomrule
+\end{tabular}
+\end{table}
+
+\paragraph{Interaction with other features}
+For \feat{SizeFeatures} to work with \feat{ItalicFeatures}, \feat{BoldFeatures}, etc., and \feat{SmallCapsFeatures}, a strict heirarchy is required:
+\begin{Verbatim}
+ UprightFeatures =
+  {
+   SizeFeatures =
+    {
+     {
+      Size = -10,
+      Font = ..., % if necessary
+      SmallCapsFeatures = {...},
+      ... % other features for this size range
+     },
+     ... % other size ranges
+    }
+  }
+\end{Verbatim}
+Suggestions on simplifying this interface welcome.
+
+
+\section{Font independent options}
+\label{sec:font-ind-features}
+
+Features introduced in this section may be used with any font.
+
+\subsection{Colour}
+
+\feat{Color} (or \feat{Colour}) uses font specifications to set the colour of
+the text.
+You should think of this as the literal glyphs of the font being coloured in a certain way.
+Notably, this mechanism is different to that of the \pkg{color}/\pkg{xcolor}/\pkg{hyperref}/etc.\ packages, and in fact using \pkg{fontspec} commands to set colour will prevent your text from changing colour using those packages at all!
+For example, if you set the colour in a \verb|\setmainfont| command, \verb|\color{...}| and related commands, including hyperlink colouring, will no longer have any effect on text in this font.)
+Therefore, \pkg{fontspec}'s colour commands are best used to set explicit colours in specific situations, and the \pkg{xcolor} package is recommended for more general colour functionality.
+
+The colour is defined as a triplet of two-digit Hex RGB
+values, with optionally another value for the transparency (where
+|00| is completely transparent and |FF| is opaque.)
+\begin{Lexample}{color}{Selecting colour with transparency.}
+  \fontsize{48}{48}
+  \fontspec{texgyrebonum-bold.otf}
+  {\addfontfeature{Color=FF000099}W}\kern-0.4ex
+  {\addfontfeature{Color=0000FF99}S}\kern-0.4ex
+  {\addfontfeature{Color=DDBB2299}P}\kern-0.5ex
+  {\addfontfeature{Color=00BB3399}R}
+\end{Lexample}
+Transparency is supported by \LuaLaTeX; \XeLaTeX\ with the \texttt{xdvipdfmx} driver
+does not support this feature.
+
+If you load the \pkg{xcolor} package, you may use any named colour instead
+of writing the colours in hexadecimal.
+\begin{Verbatim}
+ \usepackage{xcolor}
+ ...
+ \fontspec[Color=red]{Verdana} ...
+ \definecolor{Foo}{rgb}{0.3,0.4,0.5}
+ \fontspec[Color=Foo]{Verdana} ...
+\end{Verbatim}
+The \pkg{color} package is \emph{not} supported; use \pkg{xcolor} instead.
+
+You may specify the transparency with a named colour using the \feat{Opacity}
+feature which takes an decimal from zero to one corresponding to
+transparent to opaque respectively:
+\begin{Verbatim}
+ \fontspec[Color=red,Opacity=0.7]{Verdana} ...
+\end{Verbatim}
+It is still possible to specify a colour in six-char hexadecimal form
+while defining opacity in this way, if you like.
+
+\subsection{Scale}
+
+\cmdbox{
+ \feat{Scale} = \meta{number} \\
+ \feat{Scale} = \opt{MatchLowercase} \\
+ \feat{Scale} = \opt{MatchUppercase}
+}
+
+In its explicit form, \feat{Scale} takes a single
+numeric argument for linearly scaling the font, as demonstrated
+in \exref{fontload}.
+It is now possible to
+measure the correct dimensions of the fonts loaded and
+calculate values to scale them automatically.
+
+As well as a numerical argument, the \feat{Scale} feature
+also accepts options \opt{MatchLowercase}
+and \opt{MatchUppercase}, which will scale the font being selected to match
+the current default roman font to either the height of the lowercase or
+uppercase letters, respectively; these features are shown in \exref{scale}.
+
+\begin{Xexample}{scale}{Automatically calculated scale values.}
+  \setmainfont{Georgia}
+  \newfontfamily\lc[Scale=MatchLowercase]{Verdana}
+   The perfect match {\lc is hard to find.}\\
+  \newfontfamily\uc[Scale=MatchUppercase]{Arial}
+   L O G O \uc F O N T
+\end{Xexample}
+
+The amount of scaling used in each instance is reported in the \texttt{.log} file.
+Since there is some subjectivity about the exact scaling to be used, these values
+should be used to fine-tune the results.
+
+Note that when |Scale=MatchLowercase| is used with |\setmainfont|, the new `main' font of the document will be scaled to match the old default.
+This may be undesirable in some cases, so to achieve `natural' scaling for the main font but automatically scale all other fonts selected, you may write
+\begin{Verbatim}
+  \defaultfontfeatures{ Scale = MatchLowercase }
+  \defaultfontfeatures[\rmfamily]{ Scale = 1}
+\end{Verbatim}
+One or both of these lines may be placed into a local |fontspec.cfg| file (see \vref{sec:config}) for this behaviour to be effected in your own documents automatically.
+(Also see \vref{sec:defaults} for more information on setting font defaults.)
+
+
+
+\subsection{Interword space}
+
+While the space between words can be varied on an individual
+basis with the \TeX\ primitive \cmd\spaceskip\ command, it is
+more convenient to specify this information when the font is
+first defined.
+
+The space in between words in a paragraph will be chosen automatically,
+and generally will not need to be adjusted. For those
+times when the precise details are important, the \feat{WordSpace}
+feature is
+provided, which takes either a single scaling factor to scale the
+default value, or a triplet of comma-separated
+values to scale the nominal value, the stretch, and the shrink of the
+interword space by, respectively. (|WordSpace={|$x$|}| is the same as
+|WordSpace={|$x$|,|$x$|,|$x$|}|.)
+
+\begingroup
+\let\centering\relax
+\begin{Xexample}{wordspace}{Scaling the default interword space. An exaggerated value has been chosen to emphasise the effects here.}
+  \fontspec{texgyretermes-regular.otf}
+  Some text for our example to take
+  up some space, and to demonstrate
+  the default interword space.
+  \bigskip
+
+  \fontspec{texgyretermes-regular.otf}%
+    [WordSpace = 0.3]
+  Some text for our example to take
+  up some space, and to demonstrate
+  the default interword space.
+\end{Xexample}
+\endgroup
+
+Note that \TeX's optimisations in how it loads fonts means that you cannot
+use this feature in \cs{addfontfeatures}.
+
+\subsection{Post-punctuation space}
+
+If \cmd\frenchspacing\ is \emph{not} in effect, \TeX\ will allow extra
+space after some punctuation in its goal of justifying the lines of text.
+Generally, this is considered old-fashioned, but occasionally in small amounts the
+effect can be justified, pardon the pun.
+
+The \feat{PunctuationSpace} feature takes a scaling factor by which to
+adjust the nominal value chosen for the font; this is demonstrated in
+\exref{punctspace}.
+Note that |PunctuationSpace=0|
+is \emph{not} equivalent to \cmd\frenchspacing, although the difference
+will only be apparent when a line of text is under-full.
+
+\begin{Lexample}{punctspace}{Scaling the default post-punctuation space.}
+  \nonfrenchspacing
+  \fontspec{texgyreschola-regular.otf}
+   Letters, Words. Sentences.          \par
+  \fontspec{texgyreschola-regular.otf}[PunctuationSpace=2]
+   Letters, Words. Sentences.          \par
+  \fontspec{texgyreschola-regular.otf}[PunctuationSpace=0]
+   Letters, Words. Sentences.
+\end{Lexample}
+
+Note that \TeX's optimisations in how it loads fonts means that you cannot
+use this feature in \cs{addfontfeatures}.
+
+
+
+\subsection{The hyphenation character}
+
+The letter used for hyphenation may be chosen with the \feat{HyphenChar}
+feature. It takes three types of input, which are chosen according to some
+simple rules. If the input is the string \opt{None}, then hyphenation is
+suppressed for this font.
+If the input is a single character, then this
+character is used. Finally, if the input is longer than a single character
+it must be the UTF-8 slot number of the hyphen character you desire.
+
+This package redefines \LaTeX's \cmd\-\ macro such that it adjusts along with the above changes.
+
+\begin{Xexample}{hyphchar}{Explicitly choosing the hyphenation character.}
+ \def\text{\fbox{\parbox{1.55cm}{%
+   EXAMPLE HYPHENATION%
+ }}\qquad\qquad\null\par\bigskip}
+
+ \fontspec{Linux Libertine O}[HyphenChar=None]
+ \text
+ \fontspec{Linux Libertine O}[HyphenChar={+}]
+ \text
+\end{Xexample}
+
+Note that \TeX's optimisations in how it loads fonts means that you cannot
+use this feature in \cs{addfontfeatures}.
+
+\subsection{Optical font sizes} \label{sec:opticalsize}
+
+Optically scaled fonts thicken out as the font size decreases
+in order to make the glyph shapes more robust (less prone to losing
+detail), which improves legibility. Conversely, at large optical
+sizes the serifs and other small details may be more delicately
+rendered.
+
+OpenType fonts with optical scaling will exist in
+several discrete sizes, and these will be selected by \XeTeX\
+and Lua\TeX\
+\emph{automatically} determined by the current font size as in
+\exref{optsize}, in which we've scaled down some large text in order to be
+able to compare the difference for equivalent font sizes.
+
+The
+\opt{OpticalSize} option may be used to specify a different optical
+size.
+With \opt{OpticalSize} set
+to zero, no optical size font substitution is performed, as shown in
+\exref{optsize0}.
+
+\begin{Xexample}{optsize}{A demonstration of automatic optical size selection.}
+  \fontspec{Latin Modern Roman}
+   Automatic optical size                  \\
+  \scalebox{0.4}{\Huge
+   Automatic optical size}
+\end{Xexample}
+
+\begin{Xexample}{optsize0}{Optical size substitution is suppressed when set to zero.}
+  \fontspec{Latin Modern Roman 5 Regular}[OpticalSize=0]
+   Latin Modern optical sizes                \\
+  \fontspec{Latin Modern Roman 8 Regular}[OpticalSize=0]
+   Latin Modern optical sizes                \\
+  \fontspec{Latin Modern Roman 12 Regular}[OpticalSize=0]
+   Latin Modern optical sizes                \\
+  \fontspec{Latin Modern Roman 17 Regular}[OpticalSize=0]
+   Latin Modern optical sizes
+\end{Xexample}
+
+The \feat{SizeFeatures} feature (\vref*{sec:sizefeature}) can be
+used to specify exactly which optical sizes will be used for ranges
+of font size. For example, something like:
+\begin{Verbatim}
+  \fontspec{Latin Modern Roman}[
+    UprightFeatures = { SizeFeatures = {
+      {Size=-10,     OpticalSize=8 },
+      {Size= 10-14,  OpticalSize=10},
+      {Size= 14-18,  OpticalSize=14},
+      {Size=    18-, OpticalSize=18}}}
+           ]
+\end{Verbatim}
+
+\subsection{Font transformations}
+
+In rare situations users may want to mechanically distort the shapes of the glyphs in the current font such as shown in \exref{fake}. Please don't overuse these features; they are \emph{not} a good alternative to having the real shapes.
+
+\begin{Xexample}{fake}{Articifial font transformations.}
+  \fontspec{Charis SIL} \emph{ABCxyz} \quad
+  \fontspec{Charis SIL}[FakeSlant=0.2] ABCxyz
+
+  \fontspec{Charis SIL}  ABCxyz \quad
+  \fontspec{Charis SIL}[FakeStretch=1.2] ABCxyz
+
+  \fontspec{Charis SIL} \textbf{ABCxyz} \quad
+  \fontspec{Charis SIL}[FakeBold=1.5] ABCxyz
+\end{Xexample}
+
+If values are omitted, their defaults are as shown above.
+
+If you want the bold shape to be faked automatically, or the italic shape
+to be slanted automatically, use the \feat{AutoFakeBold} and
+\feat{AutoFakeSlant} features. For example, the following two invocations
+are equivalent:
+\begin{Verbatim}
+  \fontspec[AutoFakeBold=1.5]{Charis SIL}
+  \fontspec[BoldFeatures={FakeBold=1.5}]{Charis SIL}
+\end{Verbatim}
+If both of the \feat{AutoFake...} features are used, then the bold italic
+font will also be faked.
+
+The \feat{FakeBold} and \feat{AutoFakeBold} features are only available with the \XeTeX\ engine and will be ignored in \LuaTeX.
+
+
+\subsection{Letter spacing}
+Letter spacing, or tracking, is the term given to adding (or subtracting) a small amount of horizontal space in between adjacent characters. It is specified with the \feat{LetterSpace}, which takes a numeric argument,
+shown in \exref{tracking}.
+
+The letter spacing parameter is a normalised additive factor (not a scaling factor); it is defined as a percentage of the font size. That is, for a 10\,pt font, a letter spacing parameter of `|1.0|' will add 0.1\,pt between each letter.
+
+\begin{Xexample}{tracking}{The \feat{LetterSpace} feature.}
+  \fontspec{Didot}
+  \addfontfeature{LetterSpace=0.0}
+  USE TRACKING FOR DISPLAY CAPS TEXT \\
+  \addfontfeature{LetterSpace=2.0}
+  USE TRACKING FOR DISPLAY CAPS TEXT
+\end{Xexample}
+
+This functionality is not generally used for lowercase text in modern typesetting but does have historic precedent in a variety of situations.
+In particular, small amounts of letter spacing can be very useful, when setting small caps or all caps titles.
+Also see the OpenType \opt{Uppercase} option of the \feat{Letters} feature (\vref*{sec:letters}).
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.aux
new file mode 100644
index 00000000000..c5ff9236a69
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.aux
@@ -0,0 +1,74 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{II\hspace  {1em}General font selection}{10}{part.2}}
+\newlabel{3@xvr}{{}{10}{General font selection}{part.2}{}}
+\newlabel{3@vr}{{}{10}{General font selection}{part.2}{}}
+\newlabel{ex:fontload}{{1}{10}{General font selection}{example.1}{}}
+\newlabel{4@xvr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{4@vr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{5@xvr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{5@vr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{6@xvr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{6@vr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{7@xvr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{7@vr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{8@xvr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{8@vr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{9@xvr}{{}{10}{General font selection}{figure.caption.1}{}}
+\newlabel{9@vr}{{}{10}{General font selection}{figure.caption.1}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {5}Font selection}{10}{section.5}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {5.1}By font name}{11}{subsection.5.1}}
+\@writefile{toc}{\contentsline {paragraph}{\hologoRobust {LuaTeX}\ users only}{11}{section*.2}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {5.2}By file name}{11}{subsection.5.2}}
+\newlabel{sec:by-file-name}{{Section\nobreakspace  {}5.2}{11}{By file name}{subsection.5.2}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {5.3}Querying whether a font `exists'}{12}{subsection.5.3}}
+\newlabel{10@xvr}{{}{13}{Querying whether a font `exists'}{subsection.5.3}{}}
+\newlabel{10@vr}{{}{13}{Querying whether a font `exists'}{subsection.5.3}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {6}Commands to select font families}{13}{section.6}}
+\newlabel{ex:nff}{{2}{13}{Commands to select font families}{example.2}{}}
+\newlabel{11@xvr}{{}{13}{Commands to select font families}{figure.caption.3}{}}
+\newlabel{11@vr}{{}{13}{Commands to select font families}{figure.caption.3}{}}
+\newlabel{ex:nfface}{{3}{13}{Commands to select font families}{example.3}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {6.1}More control over font shape selection}{14}{subsection.6.1}}
+\newlabel{sec:bfitfonts}{{Section\nobreakspace  {}6.1}{14}{More control over font shape selection}{subsection.6.1}{}}
+\newlabel{ex:bff}{{4}{14}{More control over font shape selection}{example.4}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {6.1.1}Small caps and slanted font shapes}{15}{subsubsection.6.1.1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {6.2}Specifically choosing the \textsc  {nfss}\ family}{15}{subsection.6.2}}
+\newlabel{12@xvr}{{}{16}{Specifically choosing the \NFSS \ family}{subsection.6.2}{}}
+\newlabel{12@vr}{{}{16}{Specifically choosing the \NFSS \ family}{subsection.6.2}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {6.3}Choosing additional \textsc  {nfss}\ font faces}{16}{subsection.6.3}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {6.4}Math(s) fonts}{17}{subsection.6.4}}
+\@writefile{toc}{\contentsline {section}{\numberline {7}Miscellaneous font selecting details}{18}{section.7}}
+\@writefile{toc}{\contentsline {paragraph}{The optional argument --- from v2.4}{18}{section*.6}}
+\@writefile{toc}{\contentsline {paragraph}{Spaces}{19}{section*.7}}
+\@setckpt{fontspec-doc-fontsel}{
+\setcounter{page}{20}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{4}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{2}
+\setcounter{section}{7}
+\setcounter{subsection}{0}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{0}
+\setcounter{table}{0}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{2}
+\setcounter{vrcnt}{12}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{4}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{26}
+\setcounter{example}{4}
+\setcounter{argument}{0}
+\setcounter{section@level}{4}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
new file mode 100644
index 00000000000..110266c858a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-fontsel.tex
@@ -0,0 +1,497 @@
+
+
+\part{General font selection}
+
+This section concerns the variety of commands that can be used to select
+fonts.
+
+\cmdbox{%
+  \CMD{\string\fontspec}\marg{font name}\oarg{font features}\\
+  \CMD{\string\setmainfont}\marg{font name}\oarg{font features}\\
+  \CMD{\string\setsansfont}\marg{font name}\oarg{font features}\\
+  \CMD{\string\setmonofont}\marg{font name}\oarg{font features}\\
+  \CMD{\string\newfontfamily}\meta{cmd}\marg{font name}\oarg{font features}
+}
+
+These are the main font-selecting commands of this package.
+The \cs{fontspec} command selects a font for one-time use; all
+others should be used to define the standard fonts used in a document, as shown in \exref{fontload}.
+Here, the scales of the fonts have been chosen to equalise their
+lowercase letter heights. The \feat{Scale} font feature will be discussed
+further in \vref{sec:font-ind-features}, including methods for automatic
+scaling.
+
+\begin{Lexample}{fontload}{Loading the default, sans serif, and monospaced fonts.}
+  \setmainfont{texgyrebonum-regular.otf}
+  \setsansfont{lmsans10-regular.otf}[Scale=MatchLowercase]
+  \setmonofont{Inconsolata.otf}[Scale=MatchLowercase]
+
+  \rmfamily Pack my box with five dozen liquor jugs\par
+  \sffamily Pack my box with five dozen liquor jugs\par
+  \ttfamily Pack my box with five dozen liquor jugs
+\end{Lexample}
+
+Note that while these commands all look and behave largely identically, the default setup for font loading automatically adds the |Ligatures=TeX| feature for the \cs{setmainfont} and \cs{setsansfont} commands.
+These defaults (and further customisations possible) are discussed in \vref{sec:defaults}.
+
+The font features argument accepts comma separated
+\meta{font feature}=\meta{option} lists; these are described later:
+\begin{itemize}
+\item For general font features, see \vref{sec:font-ind-features}
+\item For OpenType fonts, see Part~\vref{sec:opentype-features}
+\item For \XeTeX-only general font features, see Part~\vref{sec:xetex-features}
+\item For \LuaTeX-only general font features, see Part~\vref{sec:luatex-features}
+\item For features for \AAT\ fonts in \XeTeX, see \vref{sec:aat-features}
+\end{itemize}
+
+\section{Font selection}
+
+In both \LuaTeX\ and \XeTeX, fonts can be selected either by `font name' or
+by `file name', but there are some differences in how each engine finds and selects fonts --- don't be too surprised if a font invocation in one engine needs correction to work in the other.
+
+
+\subsection{By font name}
+
+Fonts known to \LuaTeX\ or \XeTeX\ may be loaded by their standard names as
+you'd speak them out loud, such as \emph{Times New Roman} or
+\emph{Adobe Garamond}.
+`Known to' in this case generally means `exists in a standard fonts location'
+such as |~/Library/Fonts| on \MacOSX, or |C:\Windows\Fonts| on Windows.
+In \LuaTeX, fonts found in the \textsc{texmf} tree can also be loaded by name.
+
+The simplest example might be something like
+\begin{Verbatim}
+  \setmainfont{Cambria}[ ... ]
+\end{Verbatim}
+in which the bold and italic fonts will be found automatically
+(if they exist) and are immediately accessible with the usual
+\cs{textit} and \cs{textbf} commands.
+
+The `font name' can be found in various ways, such as by looking in the name listed in a application like \emph{Font Book} on Mac~OS~X.
+Alternatively, \TeX{}Live contains the \texttt{otfinfo} command line program, which can query this information; for example:
+\begin{Verbatim}
+    otfinfo -a `kpsewhich lmroman10-regular.otf`
+\end{Verbatim}
+results in `\texttt{LM Roman 10}'.
+
+\paragraph{\LuaTeX\ users only}
+In order to load fonts by their name rather than by their filename (\eg,
+`Latin Modern Roman' instead of `ec-lmr10'), you may need to run the script
+\texttt{luaotfload-tool}, which is distributed with the \pkg{luaotfload}
+package. Note that if you do not execute this script beforehand, the first
+time you attempt to typeset the process will pause for (up to) several
+minutes. (But only the first time.)
+Please see the \pkg{luaotfload} documentation for more information.
+
+
+\subsection{By file name}
+\label{sec:by-file-name}
+
+\XeTeX\ and \LuaTeX\ also allow fonts to be loaded by file name instead of font name.
+When you have a very large collection of fonts, you will sometimes not
+wish to have them all installed in your system's font directories.
+In this case, it is more convenient to load them from a different location on your disk.
+This technique is also necessary in \XeTeX\ when loading OpenType fonts that are present within your \TeX\ distribution, such as \path{/usr/local/texlive/2013/texmf-dist/fonts/opentype/public}.
+Fonts in such locations are visible to \XeTeX\ but cannot be loaded by font name, only file name; \LuaTeX\ does not have this restriction.
+
+When selecting fonts by file name, any font that can be found in the default
+search paths may be used directly (including in the current directory)
+without having to explicitly define the location of the font file on disk.
+
+Fonts selected by filename must include bold and italic variants explicitly.
+\begin{Verbatim}
+  \setmainfont{texgyrepagella-regular.otf}[
+       BoldFont       = texgyrepagella-bold.otf ,
+       ItalicFont     = texgyrepagella-italic.otf ,
+       BoldItalicFont = texgyrepagella-bolditalic.otf ]
+\end{Verbatim}
+\pkg{fontspec} knows that the font is to be selected by file name by the
+presence of the `|.otf|' extension.
+An alternative is to specify the extension separately, as shown following:
+\begin{Verbatim}
+  \setmainfont{texgyrepagella-regular}[
+       Extension      = .otf ,
+       BoldFont       = texgyrepagella-bold ,
+       ... ]
+\end{Verbatim}
+If desired, an abbreviation can be applied to the font names based on the
+mandatory `font name' argument:
+\begin{Verbatim}
+  \setmainfont{texgyrepagella}[
+       Extension      = .otf ,
+       UprightFont    = *-regular ,
+       BoldFont       = *-bold ,
+       ... ]
+\end{Verbatim}
+In this case `texgyrepagella' is no longer the name of an actual font,
+but is used to construct the font names for each shape;
+the |*| is replaced by `texgyrepagella'.
+Note in this case that |UprightFont| is required for constructing the font
+name of the normal font to use.
+
+To load a font that is not in one of the default search paths, its location
+in the filesystem must be specified with the |Path| feature:
+\begin{Verbatim}
+  \setmainfont{texgyrepagella}[
+       Path           = /Users/will/Fonts/ ,
+       UprightFont    = *-regular ,
+       BoldFont       = *-bold ,
+       ... ]
+\end{Verbatim}
+Note that \XeTeX\ and \LuaTeX\ are able to load the font without giving an
+extension, but \pkg{fontspec} must know to search for the file; this can can
+be indicated by using the |Path| feature without an argument:
+\begin{Verbatim}
+  \setmainfont{texgyrepagella-regular}[
+       Path, BoldFont = texgyrepagella-bold,
+       ... ]
+\end{Verbatim}
+My preference is to always be explicit and include the extension; this also allows \pkg{fontspec} to automatically identify that the font should be loaded by filename.
+
+In previous versions of the package, the |Path| feature was also provided under the alias |ExternalLocation|, but this latter name is now deprecated and should not be used for new documents.
+
+
+\subsection{Querying whether a font `exists'}
+
+\cmdbox{
+  \CMD{\string\IfFontExistsTF}\marg{font name}\marg{true branch}\marg{false branch}
+}
+
+The conditional \cs{IfFontExistsTF} is provided to test whether the \meta{font name} exists or is loadable.
+If it is, the \meta{true branch} code is executed; otherwise, the \meta{false branch} code is.
+
+This command can be slow since the engine may resort to scanning the filesystem for a missing font.
+Nonetheless, it has been a popular request for users who wish to define `fallback fonts' for their documents for greater portability.
+
+In this command, the syntax for the \meta{font name} is a restricted/simplified version of the font loading syntax used for \cs{fontspec} and so on.
+Fonts to be loaded by filename are detected by the presence of an appropriate extension (|.otf|, etc.), and paths should be included inline.
+E.g.:
+\begin{Verbatim}
+  \IfFontExistsTF{cmr10}{T}{F}
+  \IfFontExistsTF{Times New Roman}{T}{F}
+  \IfFontExistsTF{texgyrepagella-regular.otf}{T}{F}
+  \IfFontExistsTF{/Users/will/Library/Fonts/CODE2000.TTF}{T}{F}
+\end{Verbatim}
+
+The \cs{IfFontExistsTF} command is a synonym for the programming interface function \cs{fontspec_font_if_exist:nTF} (\vref*{sec:api}).
+
+
+
+\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
+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}.
+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
+inside its argument (i.e., the same behaviour as \cs{emph}) define it using regular \LaTeX\
+commands:
+\begin{Verbatim}
+  \newcommand\textnote[1]{{\notefont #1}}
+  \textnote{This is a note.}
+\end{Verbatim}
+Note that the double braces are intentional; the inner pair are used to
+to delimit the scope of the font change.
+
+\begin{Lexample}{nff}{Defining new font families.}
+  \newfontfamily\notefont{Kurier}
+  \notefont This is a \emph{note}.
+\end{Lexample}
+
+\DescribeMacro{\newfontface}
+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
+in the upright forms. \cmd\newfontface\ is used for this purpose, shown
+in \exref{nfface}, which is repeated in \vref{sec:contextuals}.
+
+\begin{Xexample}{nfface}{Defining a single font face.}
+  \newfontface\fancy{Hoefler Text Italic}%
+      [Contextuals={WordInitial,WordFinal}]
+  \fancy where is all the vegemite
+  % \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}
+
+\cmdbox{
+ \feat{BoldFont} = \meta{font name} \\
+ \feat{ItalicFont} = \meta{font name} \\
+ \feat{~BoldItalicFont} = \meta{font name} \\
+ \feat{SlantedFont} = \meta{font name} \\
+ \feat{BoldSlantedFont} = \meta{font name} \\
+ \feat{SmallCapsFont} = \meta{font name}
+}
+
+The automatic bold, italic, and bold italic font selections will not be
+adequate for the needs of every font: while some fonts mayn't even
+have bold or italic shapes, in which case a skilled (or lucky)
+designer may be able to chose well-matching accompanying shapes from
+a different font altogether, others can have a range of bold and
+italic fonts to chose among.  The \feat{BoldFont} and
+\feat{ItalicFont} features are provided for these situations. If only
+one of these is used, the bold italic font is requested as the
+default from the \emph{new} font. See \exref{bff}.
+
+\begin{Xexample}{bff}{Explicit selection of the bold font.}
+  \fontspec{Helvetica Neue UltraLight}%
+           [BoldFont={Helvetica Neue}]
+                Helvetica Neue UltraLight         \\
+  {\itshape     Helvetica Neue UltraLight Italic} \\
+  {\bfseries               Helvetica Neue       } \\
+  {\bfseries\itshape       Helvetica Neue Italic} \\
+\end{Xexample}
+
+If a bold italic shape is not defined, or you want to specify
+\emph{both} custom bold and italic shapes, the \feat{BoldItalicFont}
+feature is provided.
+
+
+
+\subsubsection{Small caps and slanted font shapes}
+
+When a font family has both slanted \emph{and} italic shapes, these may be specified separately using the analogous features \feat{SlantedFont} and \feat{BoldSlantedFont}.
+Without these, however, the \LaTeX\ font switches for slanted (\cs{textsl}, \cs{slshape}) will default to the italic shape.
+
+Pre-OpenType, it was common for font families to be distributed with small caps glyphs in separate fonts, due to the limitations on the number of glyphs allowed in the PostScript Type~1 format.
+Such fonts may be used by declaring the \feat{SmallCapsFont} of the family you are specifying:
+\begin{Verbatim}
+  \setmainfont{Minion MM Roman}[
+    SmallCapsFont={Minion MM Small Caps & Oldstyle Figures}
+  ]
+  Roman 123 \\ \textsc{Small caps 456}
+\end{Verbatim}
+In fact, you should specify the small caps font for each individual bold and
+italic shape as in
+\begin{Verbatim}
+  \setmainfont{ <upright> }[
+    UprightFeatures    = { SmallCapsFont={ <sc> } } ,
+    BoldFeatures       = { SmallCapsFont={ <bf sc> } } ,
+    ItalicFeatures     = { SmallCapsFont={ <it sc> } } ,
+    BoldItalicFeatures = { SmallCapsFont={ <bf it sc> } } ,
+  ]
+  Roman 123 \\ \textsc{Small caps 456}
+\end{Verbatim}
+For most modern fonts that have small caps as a font feature, this level of
+control isn't generally necessary.
+
+All of the bold, italic, and small caps fonts can be loaded with different
+font features from the main font. See \ref{sec:bfit-feat} for details.
+When an OpenType font is selected for |SmallCapsFont|, the small caps
+font feature is \emph{not} automatically enabled. In this case, users
+should write instead, if necessary,
+\begin{Verbatim}
+  \setmainfont{...}[
+    SmallCapsFont={...},
+    SmallCapsFeatures={Letters=SmallCaps},
+  ]
+\end{Verbatim}
+
+\subsection{Specifically choosing the \NFSS\ family}
+
+In \LaTeX's \NFSS, font families are defined with names such as `\texttt{ppl}' (Palatino), `\texttt{lmr}' (Latin Modern Roman), and so on, which are selected with the \cs{fontfamily} command:
+\begin{Verbatim}
+  \fontfamily{ppl}\selectfont
+\end{Verbatim}
+In \pkg{fontspec}, the family names are auto-generated based on the fontname of the font; for example, writing |\fontspec{Times New Roman}| for the first time would generate an internal font family name of `\texttt{TimesNewRoman(1)}'.
+Please note that should not rely on the name that is generated.
+
+In certain cases it is desirable to be able to choose this internal font family name so it can be re-used elsewhere for interacting with other packages that use the \LaTeX's font selection interface; an example might be
+\begin{Verbatim}
+  \usepackage{fancyvrb}
+  \fvset{fontfamily=myverbatimfont}
+\end{Verbatim}
+To select a font for use in this way in \pkg{fontspec} use the \feat{NFSSFamily} feature:\footnote{Thanks to Luca Fascione for the example and motivation for finally implementing this feature.}
+\begin{Verbatim}
+  \newfontfamily\verbatimfont[NFSSFamily=myverbatimfont]{Inconsolata}
+\end{Verbatim}
+It is then possible to write commands such as:
+\begin{Verbatim}
+  \fontfamily{myverbatimfont}\selectfont
+\end{Verbatim}
+which is essentially the same as writing |\verbatimfont|, or to go back to the orginal example:
+\begin{Verbatim}
+  \fvset{fontfamily=myverbatimfont}
+\end{Verbatim}
+Only use this feature when necessary; the in-built font switching commands that \pkg{fontspec} generates (such as |\verbatimfont| in the example above) are recommended in all other cases.
+
+If you don't wish to explicitly set the \NFSS\ family but you would like to know what it is, an alternative mechanism for package writers is introduced as part of the \pkg{fontspec} programming interface; see the function \cs{fontspec_set_family:Nnn} for details (\vref*{sec:api}).
+
+\subsection{Choosing additional \NFSS\ font faces}
+
+\LaTeX's font selection scheme (\NFSS) is more flexible than the \pkg{fontspec} interface discussed up until this point.
+It assigns to each font face a \emph{family} (discussed above), a \emph{series} such as bold or light or condensed, and a \emph{shape} such as italic or slanted or small caps.
+The \pkg{fontspec} features such as \feat{BoldFont} and so on all assign faces for the default series and shapes of the \NFSS, but it's not uncommon to have font families that have multiple weights and shapes and so on.
+
+If you set up a regular font family with the `standard four' (upright, bold, italic, and bold italic) shapes and then want to use, say, a light font for a certain document element, many users will be perfectly happy to use \cs{newfontface}\cs{\meta{switch}} and use the resulting font \cs{\meta{switch}}.
+In other cases, however, it is more convenient or even necessary to load additional fonts using additional \NFSS\ specifiers.
+
+\cmdbox{
+  \texttt{FontFace = }\marg{series}\marg{shape}
+     \texttt{\char`\{} \texttt{Font = }\meta{font name} \texttt, \meta{features} \texttt{\char`\}} \\
+  \texttt{FontFace = }\marg{series}\marg{shape}\marg{font name}
+}
+
+The font thus specified will inherit the font features of the main font, with optional additional \meta{features} as requested.
+(Note that the optional \marg{features} argument is still surrounded with curly braces.)
+Multiple \feat{FontFace} commands may be used in a single declaration to specify multiple fonts.
+As an example:
+\begin{Verbatim}
+  \setmainfont{font1.otf}[
+     FontFace = {c}{\updefault}{ font2.otf } ,
+     FontFace = {c}{m}{ Font = font3.otf , Color = red }
+    ]
+\end{Verbatim}
+Writing |\fontseries{c}\selectfont| will result in |font2| being selected, which then followed by |\fontshape{m}\selectfont| will result in |font3| being selected (in red).
+A font face that is defined in terms of a different series but an upright shape (|\updefault|, as shown above) will attempt to find a matching small caps feature and define that face as well.
+Conversely, a font face defined in terms of a non-standard font shape will not.
+
+There are some standards for choosing shape and series codes; the \LaTeXe\ font selection guide\footnote{\texttt{texdoc fntguide}} lists series |m| for medium, |b| for bold, |bx| for bold extended, |sb| for semi-bold, and |c| for condensed.
+A far more comprehensive listing is included in Appendix~A of Philipp Lehman's `The Font Installation Guide'\footnote{\texttt{texdoc fontinstallationguide}} covering 14 separate weights and 12 separate widths.
+
+The \feat{FontFace} command also interacts properly with the \feat{SizeFeatures} command as follows: (nonsense set of font selection choices)
+\begin{Verbatim}
+  FontFace = {c}{n}{
+    Font = Times ,
+    SizeFeatures = {
+      { Size =   -10 , Font = Georgia } ,
+      { Size = 10-15}                 , % default "Font = Times"
+      { Size = 15-   , Font = Cochin  } ,
+    },
+  },
+\end{Verbatim}
+Note that if the first \feat{Font} feature is omitted then each size needs its own inner \feat{Font} declaration.
+
+\subsection{Math(s) fonts}
+
+When \cmd\setmainfont, \cmd\setsansfont\ and \cmd\setmonofont\ are used in the
+preamble, they also define the fonts to be used in maths mode inside the
+\cmd\mathrm-type commands. This only occurs in the preamble because \LaTeX\
+freezes the maths fonts after this stage of the processing. The \pkg{fontspec}
+package must also be loaded after any maths font packages (\eg, \pkg{euler})
+to be successful. (Actually, it is \emph{only} \pkg{euler} that is the
+problem.\note{Speaking of \pkg{euler}, if you want to use its
+\texttt{[mathbf]} option, it won't work, and you'll need to put this after
+\pkg{fontspec} is loaded instead:
+\ttfamily\cmd\AtBeginDocument\char`\{\cmd\DeclareMathAlphabet\cmd\mathbf\char`\{U\char`\}\char`\{eur\char`\}\char`\{b\char`\}\char`\{n\char`\}})
+
+Note that \pkg{fontspec} will not change the font for general mathematics;
+only the upright and bold shapes will be affected.
+To change the font used for the mathematical symbols, see either the
+\pkg{mathspec} package or the \pkg{unicode-math} package.
+
+Note that you may find that loading some maths packages won't be as smooth as
+you expect since \pkg{fontspec} (and \XeTeX\ in general) breaks many of the
+assumptions of \TeX\ as to where maths characters and accents can be found.
+Contact me if you have troubles, but I can't guarantee to be able to fix any
+incompatibilities. The Lucida and Euler maths fonts should be fine; for all
+others keep an eye out for problems.
+
+\cmdbox{
+  \cmd{\setmathrm}\marg{font name}\oarg{font features} \\
+  \cmd{\setmathsf}\marg{font name}\oarg{font features} \\
+  \cmd{\setmathtt}\marg{font name}\oarg{font features} \\
+  \cmd{\setboldmathrm}\marg{font name}\oarg{font features}
+}
+
+However, the default text fonts may not necessarily be the ones you
+wish to use when typesetting maths (especially with the use of fancy
+ligatures and so on). For this reason, you may optionally use the
+commands above (in the same way as our other
+\cmd\fontspec-like commands) to explicitly state which fonts to use
+inside such commands as \cmd\mathrm. Additionally, the
+\cmd\setboldmathrm\ command allows you define the font used for
+\cmd\mathrm\ when in bold maths mode (which is activated with, among
+others, \cmd\boldmath).
+
+For example, if you were using Optima with the Euler maths font, you
+might have this in your preamble:
+\begin{Verbatim}
+  \usepackage{mathpazo}
+  \usepackage{fontspec}
+  \setmainfont{Optima}
+  \setmathrm{Optima}
+  \setboldmathrm[BoldFont={Optima ExtraBlack}]{Optima Bold}
+\end{Verbatim}
+These commands are compatible with the \pkg{unicode-math} package.
+Having said that, \pkg{unicode-math} also defines a more general way of defining fonts to use in maths mode, so you can ignore this subsection if you're already using that package.
+
+
+\section{Miscellaneous font selecting details}
+
+\paragraph{The optional argument --- from v2.4}
+For the first decade of \pkg{fontspec}'s life, optional font features were selected with a bracketed argument before the font name, as in:
+\begin{Verbatim}
+  \setmainfont[
+    lots and lots ,
+    and more and more ,
+    an excessive number really ,
+    of font features could go here
+  ]{myfont.otf}
+\end{Verbatim}
+This always looked like ugly syntax to me, because the most important detail --- the name of the font --- was tucked away at the end.
+The order of these arguments has now been reversed:
+\begin{Verbatim}
+  \setmainfont{myfont.otf}[
+    lots and lots ,
+    and more and more ,
+    an excessive number really ,
+    of font features could go here
+  ]
+\end{Verbatim}
+I hope this doesn't cause any problems.
+\begin{enumerate}
+ \item Backwards compatibility has been preserved, so either input method works.
+ \item In fact, you can write
+ \begin{Verbatim}
+  \fontspec[Ligatures=Rare]{myfont.otf}[Color=red]
+ \end{Verbatim}
+ if you really felt like it and both sets of features would be applied.
+
+ \item
+ Following standard \pkg{xparse} behaviour, there must be no space before the opening bracket; writing
+ \begin{Verbatim*}
+\fontspec{myfont.otf} [Color=red]
+ \end{Verbatim*}
+ will result in |[Color=red]| not being recognised an argument and therefore it will be typeset as text. When breaking over lines, write either of:
+ \begin{Verbatim}
+   \fontspec{myfont.otf}%        \fontspec{myfont.otf}[
+     [Color=red]                    Color=Red]
+ \end{Verbatim}
+
+\end{enumerate}
+
+\paragraph{Spaces}
+\cmd\fontspec\ and \cmd\addfontfeatures\ ignore trailing spaces as
+if it were a `naked' control sequence; \eg, `|M. \fontspec{...} N|' and
+`|M. \fontspec{...}N|' are the same.
+
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.aux
new file mode 100644
index 00000000000..a504757f46c
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.aux
@@ -0,0 +1,56 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{I\hspace  {1em}Getting started}{6}{part.1}}
+\@writefile{toc}{\contentsline {section}{\numberline {1}History}{6}{section.1}}
+\@writefile{toc}{\contentsline {section}{\numberline {2}Introduction}{6}{section.2}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {2.1}Acknowledgements}{6}{subsection.2.1}}
+\@writefile{toc}{\contentsline {section}{\numberline {3}Package loading and options}{7}{section.3}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.1}Font encodings}{7}{subsection.3.1}}
+\newlabel{1@xvr}{{}{7}{Font encodings}{subsection.3.1}{}}
+\newlabel{1@vr}{{}{7}{Font encodings}{subsection.3.1}{}}
+\newlabel{2@xvr}{{}{7}{Font encodings}{subsection.3.1}{}}
+\newlabel{2@vr}{{}{7}{Font encodings}{subsection.3.1}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.2}Maths fonts adjustments}{7}{subsection.3.2}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.3}Configuration}{7}{subsection.3.3}}
+\newlabel{sec:config}{{Section\nobreakspace  {}3.3}{7}{Configuration}{subsection.3.3}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.4}Warnings}{8}{subsection.3.4}}
+\newlabel{sec:quiet-warnings}{{Section\nobreakspace  {}3.4}{8}{Warnings}{subsection.3.4}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {4}Interaction with \LaTeXe  \ and other packages}{8}{section.4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.1}Verbatim}{8}{subsection.4.1}}
+\newlabel{sec:verb}{{Section\nobreakspace  {}4.1}{8}{Verbatim}{subsection.4.1}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.2}Discretionary hyphenation: \cs  {\char 45\relax }}{8}{subsection.4.2}}
+\newlabel{sec:hyphen}{{Section\nobreakspace  {}4.2}{8}{Discretionary hyphenation: \cmd \-}{subsection.4.2}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.3}Commands for old-style and lining numbers}{8}{subsection.4.3}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.4}Italic small caps}{8}{subsection.4.4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.5}Emphasis and nested emphasis}{9}{subsection.4.5}}
+\@setckpt{fontspec-doc-intro}{
+\setcounter{page}{10}
+\setcounter{equation}{0}
+\setcounter{enumi}{2}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{0}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{1}
+\setcounter{section}{4}
+\setcounter{subsection}{5}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{0}
+\setcounter{table}{0}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{3}
+\setcounter{vrcnt}{2}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{2}
+\setcounter{Hfootnote}{0}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{15}
+\setcounter{example}{0}
+\setcounter{argument}{0}
+\setcounter{section@level}{2}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.tex
new file mode 100644
index 00000000000..560a68e003b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-intro.tex
@@ -0,0 +1,202 @@
+
+\part{Getting started}
+
+\section{History}
+
+This package began life as a \LaTeX\ interface to select system-installed
+\MacOSX\ fonts in \name{Jonathan Kew}'s \XeTeX, the first widely-used
+Unicode extension to \TeX. Over time, \XeTeX\ was extended to support OpenType
+fonts and then was ported into a cross-platform program to run also on Windows
+and Linux.
+
+More recently, \LuaTeX\ is fast becoming the \TeX\ engine of the day; it
+supports Unicode encodings and OpenType fonts and opens up the internals of
+\TeX\ via the Lua programming language. Hans Hagen's Con\TeX t Mk.\,IV is a
+re-write of his powerful typesetting system, taking full advantage of
+\LuaTeX's features including font support; a kernel of his work in this area
+has been extracted to be useful for other \TeX\ macro systems as well, and
+this has enabled \pkg{fontspec} to be adapted for \LaTeX\ when run with the
+\LuaTeX\ engine.
+
+
+
+\section{Introduction}
+
+The \pkg{fontspec} package allows users of either \XeTeX\ or \LuaTeX\ to
+load OpenType fonts in a \LaTeX\ document. No font installation is necessary,
+and font features can be selected and used as desired throughout the document.
+
+Without \pkg{fontspec}, it is necessary to write cumbersome font definition
+files for \LaTeX, since \LaTeX's font selection scheme (known as the
+`\textsc{nfss}') has a lot going on behind the scenes to allow easy
+commands like \cmd\emph\ or \cmd\bfseries. With an uncountable number of
+fonts now available for use, however, it becomes less desirable to have to
+write these font definition (|.fd|) files for every font one wishes to use.
+
+Because \pkg{fontspec} is designed to work in a variety of modes, this
+user documentation is split into separate sections that are designed to be
+relatively independent. Nonetheless, the basic functionality all behaves in
+the same way, so previous users of \pkg{fontspec} under \XeTeX\ should have
+little or no difficulty switching over to \LuaTeX.
+
+This manual can get rather in-depth, as there are a lot of details
+to cover. See the documents \path{fontspec-example.tex} for a complete minimal example
+to get started quickly.
+
+
+\subsection{Acknowledgements}
+
+This package could not have been possible without the early and continued support
+the author of \XeTeX, Jonathan Kew. When I started this package, he steered
+me many times in the right direction.
+
+I've had great
+feedback over the years on feature requests, documentation queries, bug reports, font suggestions, and so on from lots of people all around the world.
+Many thanks to you all.
+
+Thanks to David Perry and Markus B\"ohning for numerous documentation
+improvements and David Perry again for contributing the text for one of the
+sections of this manual.
+
+Special thanks to Khaled Hosny, who was the driving force behind the support for \LuaLaTeX, ultimately leading to version 2.0 of the package.
+
+
+
+\section{Package loading and options}
+
+For basic use, no package options are required:
+\begin{Verbatim}
+  \usepackage{fontspec}
+\end{Verbatim}
+Package options will be introduced below; some preliminary details are discussed first.
+
+
+\subsection{Font encodings}
+The 2016 release of \pkg{fontspec} initiated some changes for font encodings and the loading of \pkg{xunicode}.
+The 2017 release rolls out those changes as default.
+
+The now-default \texttt{tuenc} package option switches the \textsc{nfss} font encoding to \texttt{TU}.
+\texttt{TU} is a new Unicode font encoding, intended for both \XeTeX\ and \LuaTeX\ engines, and automatically contains support for symbols covered by \LaTeX's traditional \texttt{T1} and \texttt{TS1} font encodings (for example, |\%|, |\textbullet|, |\"u|, and so on).
+As a result, with this package option, Ross Moore's \pkg{xunicode} package is \textbf{not} loaded.
+Some new, experimental, features are now provided to customise some encoding details; see Part~\vref{part:enc} for further details.
+
+Pre-2017 behaviour can be achieved with the \texttt{euenc} package option.
+This selects the \texttt{EU1} or \texttt{EU2} encoding (\XeTeX/\LuaTeX, resp.) and loads the \pkg{xunicode} package.
+Package authors and users who have referred explicitly to the encoding names \texttt{EU1} or \texttt{EU2} should update their code or documents.
+(See internal variable names described in \vref{sec:api} for how to do this properly.)
+
+
+\subsection{Maths fonts adjustments}
+By default, \pkg{fontspec} adjusts \LaTeX's default maths setup in order to maintain the correct Computer Modern symbols when the roman font changes.
+However, it will attempt to avoid doing this if another maths font package is loaded (such as \pkg{mathpazo} or the \pkg{unicode-math} package).
+
+If you find that \pkg{fontspec} is incorrectly changing the maths font when it shouldn't be, apply the |no-math| package option to manually suppress its behaviour here.
+
+
+\subsection{Configuration}
+\label{sec:config}
+
+If you wish to customise any part of the
+\pkg{fontspec} interface, this should be done by creating your own
+\texttt{fontspec.cfg} file,
+which will be automatically loaded if it is found by \XeTeX\ or \LuaTeX.
+A |fontspec.cfg| file is distributed with \pkg{fontspec} with a small number of defaults set up within it.
+
+To customise \pkg{fontspec} to your liking, use the standard |.cfg| file as a starting point or write your own from scratch, then either place it in the same folder as the main document for isolated cases, or in a location
+that \XeTeX\ or \LuaTeX\ searches by default; \eg\ in Mac\TeX: \path{~/Library/texmf/tex/latex/}.
+
+The package option |no-config| will suppress the loading of the |fontspec.cfg| file under all circumstances.
+
+
+\subsection{Warnings}
+\label{sec:quiet-warnings}
+
+This package can give some warnings that can be harmless if you know what
+you're doing. Use the |quiet| package option to write these warnings to the
+transcript (\texttt{.log}) file instead.
+
+Use the |silent| package option to completely suppress these warnings if you
+don't even want the |.log| file cluttered up.
+
+
+
+\section{Interaction with \LaTeXe\ and other packages}
+
+This section documents some areas of adjustment that \pkg{fontspec} makes
+to improve default behaviour with \LaTeXe\ and third-party packages.
+
+
+\subsection{Verbatim}
+\label{sec:verb}
+
+Many verbatim mechanisms assume the existence of a `visible space' character that exists in the \textsc{ascii} space slot of the typewriter font. This character is known in Unicode as \unichar{2423}{box open}, which looks like this: `\verb*| |'.
+
+When a Unicode typewriter font is used, \LaTeX\ no longer prints visible spaces for the |verbatim*| environment and |\verb*| command.
+This problem is fixed by using the correct Unicode glyph, and the following packages are patched to do the same:
+\pkg{listings}, \pkg{fancyvrb}, \pkg{moreverb}, and \pkg{verbatim}.
+
+In the case that the typewriter font does not contain `\verb*| |', the Latin Modern Mono font is used as a fallback.
+
+
+\subsection{Discretionary hyphenation: \cmd\-}
+\label{sec:hyphen}
+
+\DescribeMacro{\-}
+\LaTeX\ defines the macro \cmd\-\ to insert discretionary hyphenation points.
+However, it is hard-coded in \LaTeX\ to use the hyphen |-| character.
+Since \pkg{fontspec} provides features to change the hyphenation character on
+a per font basis, the definition of \cmd\-\ is changed to adapt accordingly.
+
+
+\subsection{Commands for old-style and lining numbers}
+
+\DescribeMacro{\oldstylenums}
+\DescribeMacro{\liningnums}
+\LaTeX's definition of \cs{oldstylenums} relies on strange font encodings.
+We provide a \pkg{fontspec}-compatible alternative and while we're at it
+also throw in the reverse option as well. Use \cs{oldstylenums}\marg{text}
+to explicitly use old-style (or lowercase) numbers in \meta{text}, and
+the reverse for \cs{liningnums}\marg{text}.
+
+
+\subsection{Italic small caps}
+
+\DescribeMacro{\itshape}
+\DescribeMacro{\slshape}
+\DescribeMacro{\scshape}
+Note that this package redefines the \cs{itshape}, \cs{slshape}, and \cs{scshape} commands in order to allow them to select italic small caps in conjunction.
+With these changes, writing |\itshape\scshape| will lead to italic small caps, and |\upshape| subsequently then moves back to small caps only. |\upshape| again returns from small caps to upright regular.
+(And similarly for for |\slshape|. In addition, once italic small caps are selected then |\slshape| will switch to slanted small caps, and vice versa.)
+
+
+\subsection{Emphasis and nested emphasis}
+
+\DescribeMacro{\eminnershape}
+\LaTeXe\ allows you to specify the behaviour of \cs{emph} nested within \cs{emph} by setting the \cs{eminnershape} command.
+For example,
+\begin{Verbatim}
+  \renewcommand\eminnershape{\upshape\scshape}
+\end{Verbatim}
+will produce small caps within |\emph{\emph{...}}|.
+
+\DescribeMacro{\emfontdeclare}
+The \pkg{fontspec} package takes this idea one step further to allow arbitrary font changes (e.g., boldness) and arbitrary levels of nesting within emphasis.
+This is performed using the |\emfontdeclare| command, which takes a comma-separated list of font switches corresponding to increasing levels of emphasis.
+Two examples:
+\begin{enumerate}
+\item |\emfontdeclare{\itshape,\upshape\scshape,\itshape}| will lead to `italics', `small caps', then `italic small caps' as the level of emphasis increases, as long as italic small caps are defined for the font.
+  Note that |\upshape| is required because the font changes are cascading.
+\item |\emfontdeclare{\bfseries,\fontseries{h}\selectfont,\fontseries{x}\selectfont}| could lead to (if fonts are set up correctly) `bold', `heavy', and `extra bold'.
+\end{enumerate}
+The implementation of these feature tries to be `smart' and guess what level of emphasis to use in the case of manual font changing.
+This is reliable only if you use series- and/or shape- changing commands in \cs{emfontdeclare}.
+For example:
+\begin{Verbatim}
+    \emfontdeclare{\itshape,\upshape\scshape,\itshape}
+    ...
+    \scshape small caps \emph{hello}
+\end{Verbatim}
+Here, the emphasised text `hello' will be printed in italic small caps since |\emph| can detect that the current font shape is already in the second `mode' of emphasis.
+
+\DescribeMacro{\emreset}
+Finally, if you have so much nested emphasis that |\emfontdeclare| runs out of options, it will insert |\emreset| (by default just |\upshape|) and start again from the beginning.
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.aux
new file mode 100644
index 00000000000..ec0d9e76999
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.aux
@@ -0,0 +1,38 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{VI\hspace  {1em}\hologoRobust {LuaTeX}-only font features}{57}{part.6}}
+\newlabel{sec:luatex-features}{{VI}{57}{\LuaTeX -only font features}{part.6}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {20}Custom font features}{57}{section.20}}
+\@writefile{lof}{\contentsline {figure}{\numberline {1}{\ignorespaces An example of custom font features.\relax }}{58}{figure.caption.63}}
+\newlabel{fig:featurefile}{{1}{58}{An example of custom font features.\relax }{figure.caption.63}{}}
+\@setckpt{fontspec-doc-luatex}{
+\setcounter{page}{59}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{11}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{6}
+\setcounter{section}{20}
+\setcounter{subsection}{0}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{1}
+\setcounter{table}{17}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{18}
+\setcounter{vrcnt}{32}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{11}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{63}
+\setcounter{example}{40}
+\setcounter{argument}{0}
+\setcounter{section@level}{1}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex
new file mode 100644
index 00000000000..c2ae7daf5ad
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-luatex.tex
@@ -0,0 +1,43 @@
+
+
+\part{\LuaTeX-only font features}
+\label{sec:luatex-features}
+
+\section{Custom font features}
+
+Pre-2016, it was possible to load an OpenType font feature file to define new OpenType features for a selected font. This facility was particularly useful to implement custom substitutions, for example.  As of \TeX{}Live~2016, \LuaTeX/\pkg{luaotfload} no longer supports this feature, but provides its own internal mechanisms for an equivalent interface.
+
+Any documents using `feature file' options will need to transition to the new interface.
+Figure~\ref{fig:featurefile} shows an example.
+Please refer to the \LuaTeX/\pkg{luaotfload} documentation for more details.
+
+\begin{figure}
+\caption{An example of custom font features.}
+\label{fig:featurefile}
+\hrule
+\begin{Verbatim}
+\documentclass{article}
+\usepackage{fontspec}
+\directlua{
+    fonts.handlers.otf.addfeature {
+        name = "oneb",
+        {
+            type = "substitution",
+            data = {
+                ["1"] = "one.ss01",
+            },
+        },
+        "feature oneb for vollkorn font",
+    }
+}
+\setmainfont{Vollkorn-Regular.otf}[RawFeature=+oneb]
+\begin{document}
+1234567890
+\end{document}
+\end{Verbatim}
+\hrule
+\end{figure}
+
+
+
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.aux
new file mode 100644
index 00000000000..65ce0d72338
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.aux
@@ -0,0 +1,151 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{IV\hspace  {1em}OpenType}{32}{part.4}}
+\newlabel{sec:opentype-features}{{IV}{32}{OpenType}{part.4}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {15}Introduction}{32}{section.15}}
+\newlabel{sec:opentype-features-intro}{{Section\nobreakspace  {}15}{32}{Introduction}{section.15}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {15.1}How to select font features}{32}{subsection.15.1}}
+\newlabel{19@xvr}{{}{32}{How to select font features}{subsection.15.1}{}}
+\newlabel{19@vr}{{}{32}{How to select font features}{subsection.15.1}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {15.2}How do I know what font features are supported by my fonts?}{33}{subsection.15.2}}
+\@writefile{toc}{\contentsline {paragraph}{otfinfo}{33}{section*.24}}
+\@writefile{toc}{\contentsline {section}{\numberline {16}OpenType font features}{34}{section.16}}
+\newlabel{sec:ot-feat}{{Section\nobreakspace  {}16}{34}{OpenType font features}{section.16}{}}
+\newlabel{20@xvr}{{}{34}{OpenType font features}{section.16}{}}
+\newlabel{20@vr}{{}{34}{OpenType font features}{section.16}{}}
+\newlabel{21@xvr}{{}{34}{OpenType font features}{section.16}{}}
+\newlabel{21@vr}{{}{34}{OpenType font features}{section.16}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.1}Tag-based features}{34}{subsection.16.1}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.1.1}Ligatures}{34}{subsubsection.16.1.1}}
+\newlabel{sec:ot-feat-liga}{{16.1.1}{34}{Ligatures}{subsubsection.16.1.1}{}}
+\newlabel{22@xvr}{{}{34}{Ligatures}{subsubsection.16.1.1}{}}
+\newlabel{22@vr}{{}{34}{Ligatures}{subsubsection.16.1.1}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.2}Letters}{34}{subsection.16.2}}
+\newlabel{sec:letters}{{Section\nobreakspace  {}16.2}{34}{Letters}{subsection.16.2}{}}
+\newlabel{ex:lig}{{19}{34}{Letters}{example.19}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {2}{\ignorespaces Summary of OpenType features in \textsf  {fontspec}, alphabetic by feature tag.\relax }}{35}{table.caption.25}}
+\newlabel{tab:all-ot}{{Table\nobreakspace  {}2}{35}{Summary of OpenType features in \textsf {fontspec}, alphabetic by feature tag.\relax }{table.caption.25}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {3}{\ignorespaces List of \emph  {unsupported} OpenType features.\relax }}{36}{table.caption.26}}
+\newlabel{tab:none-ot}{{Table\nobreakspace  {}3}{36}{List of \emph {unsupported} OpenType features.\relax }{table.caption.26}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {4}{\ignorespaces Options for the OpenType font feature `Ligatures'.\relax }}{36}{table.caption.27}}
+\newlabel{feat:Ligatures}{{Table\nobreakspace  {}4}{36}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.27}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {5}{\ignorespaces Options for the OpenType font feature `Letters'.\relax }}{37}{table.caption.29}}
+\newlabel{feat:Letters}{{Table\nobreakspace  {}5}{37}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.29}{}}
+\newlabel{ex:caps}{{20}{38}{Letters}{example.20}{}}
+\newlabel{ex:letters-uppercase}{{21}{38}{Letters}{example.21}{}}
+\newlabel{23@xvr}{{}{38}{Letters}{figure.caption.31}{}}
+\newlabel{23@vr}{{}{38}{Letters}{figure.caption.31}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.2.1}Numbers}{38}{subsubsection.16.2.1}}
+\newlabel{24@xvr}{{}{38}{Numbers}{table.caption.32}{}}
+\newlabel{24@vr}{{}{38}{Numbers}{table.caption.32}{}}
+\newlabel{ex:slashzero}{{22}{38}{Numbers}{example.22}{}}
+\newlabel{25@xvr}{{}{38}{Numbers}{figure.caption.33}{}}
+\newlabel{25@vr}{{}{38}{Numbers}{figure.caption.33}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.2.2}Contextuals}{38}{subsubsection.16.2.2}}
+\@writefile{lot}{\contentsline {table}{\numberline {6}{\ignorespaces Options for the OpenType font feature `Numbers'.\relax }}{39}{table.caption.32}}
+\newlabel{feat:Numbers}{{Table\nobreakspace  {}6}{39}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.32}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {7}{\ignorespaces Options for the OpenType font feature `Contextuals'.\relax }}{39}{table.caption.34}}
+\newlabel{feat:Contextuals}{{Table\nobreakspace  {}7}{39}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.34}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {8}{\ignorespaces Options for the OpenType font feature `VerticalPosition'.\relax }}{40}{table.caption.35}}
+\newlabel{feat:VerticalPosition}{{Table\nobreakspace  {}8}{40}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.35}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.2.3}Vertical Position}{40}{subsubsection.16.2.3}}
+\newlabel{ex:vertpos}{{23}{40}{Vertical Position}{example.23}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.2.4}Fractions}{40}{subsubsection.16.2.4}}
+\newlabel{ex:ot-frac}{{24}{40}{Fractions}{example.24}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {9}{\ignorespaces Options for the OpenType font feature `Fractions'.\relax }}{41}{table.caption.37}}
+\newlabel{feat:Fractions}{{Table\nobreakspace  {}9}{41}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.37}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.3}Style}{41}{subsection.16.3}}
+\newlabel{sec:ot-feat-style}{{Section\nobreakspace  {}16.3}{41}{Style}{subsection.16.3}{}}
+\newlabel{ex:style-alt}{{25}{41}{Style}{example.25}{}}
+\newlabel{ex:style-hist}{{26}{41}{Style}{example.26}{}}
+\newlabel{ex:style-titl}{{27}{41}{Style}{example.27}{}}
+\newlabel{ex:style-itrub}{{28}{41}{Style}{example.28}{}}
+\newlabel{ex:style-hvkana}{{29}{41}{Style}{example.29}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {10}{\ignorespaces Options for the OpenType font feature `Style'.\relax }}{42}{table.caption.39}}
+\newlabel{feat:Style}{{Table\nobreakspace  {}10}{42}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.39}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.4}Diacritics}{43}{subsection.16.4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.5}Kerning}{43}{subsection.16.5}}
+\newlabel{sec:kerning}{{Section\nobreakspace  {}16.5}{43}{Kerning}{subsection.16.5}{}}
+\newlabel{26@xvr}{{}{43}{Kerning}{table.caption.46}{}}
+\newlabel{26@vr}{{}{43}{Kerning}{table.caption.46}{}}
+\newlabel{ex:kernup}{{30}{43}{Kerning}{example.30}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.6}Character width}{43}{subsection.16.6}}
+\newlabel{sec:CharacterWidth}{{Section\nobreakspace  {}16.6}{43}{Character width}{subsection.16.6}{}}
+\newlabel{ex:charwdprop}{{31}{43}{Character width}{example.31}{}}
+\newlabel{ex:charwd}{{32}{43}{Character width}{example.32}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {11}{\ignorespaces Options for the OpenType font feature `Diacritics'.\relax }}{43}{table.caption.45}}
+\newlabel{feat:Diacritics}{{Table\nobreakspace  {}11}{43}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.45}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {12}{\ignorespaces Options for the OpenType font feature `Kerning'.\relax }}{44}{table.caption.46}}
+\newlabel{feat:Kerning}{{Table\nobreakspace  {}12}{44}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.46}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {13}{\ignorespaces Options for the OpenType font feature `CharacterWidth'.\relax }}{44}{table.caption.48}}
+\newlabel{feat:CharacterWidth}{{Table\nobreakspace  {}13}{44}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.48}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {14}{\ignorespaces Options for the OpenType font feature `CJKShape'.\relax }}{45}{table.caption.51}}
+\newlabel{feat:CJKShape}{{Table\nobreakspace  {}14}{45}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.51}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.6.1}CJK shape}{46}{subsubsection.16.6.1}}
+\newlabel{ex:ot-cjk-shape}{{33}{46}{CJK shape}{example.33}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.7}Vertical typesetting}{46}{subsection.16.7}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.8}Numeric features}{46}{subsection.16.8}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.8.1}Stylistic Set variations --- \texttt  {ssNN}}{46}{subsubsection.16.8.1}}
+\newlabel{ex:ss}{{34}{46}{Stylistic Set variations --- \texttt {ssNN}}{example.34}{}}
+\newlabel{ex:ss2}{{35}{46}{Stylistic Set variations --- \texttt {ssNN}}{example.35}{}}
+\newlabel{27@xvr}{{}{46}{Stylistic Set variations --- \texttt {ssNN}}{figure.caption.55}{}}
+\newlabel{27@vr}{{}{46}{Stylistic Set variations --- \texttt {ssNN}}{figure.caption.55}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.8.2}Character Variants --- \texttt  {cvNN}}{46}{subsubsection.16.8.2}}
+\@writefile{lot}{\contentsline {table}{\numberline {15}{\ignorespaces Options for the OpenType font feature `Vertical'.\relax }}{47}{table.caption.53}}
+\newlabel{feat:Vertical}{{Table\nobreakspace  {}15}{47}{Options for the OpenType font feature `\thisfeatname '.\relax }{table.caption.53}{}}
+\newlabel{ex:cv}{{36}{48}{Character Variants --- \texttt {cvNN}}{example.36}{}}
+\newlabel{ex:cv2}{{37}{48}{Character Variants --- \texttt {cvNN}}{example.37}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.8.3}Alternates --- \texttt  {salt}}{48}{subsubsection.16.8.3}}
+\newlabel{ex:salt}{{38}{48}{Alternates --- \texttt {salt}}{example.38}{}}
+\newlabel{28@xvr}{{}{48}{Alternates --- \texttt {salt}}{figure.caption.58}{}}
+\newlabel{28@vr}{{}{48}{Alternates --- \texttt {salt}}{figure.caption.58}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.8.4}Annotation --- \texttt  {nalt} }{48}{subsubsection.16.8.4}}
+\newlabel{ex:ot-annot}{{39}{48}{Annotation --- \texttt {nalt}}{example.39}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.8.5}Ornament --- \texttt  {ornm}}{48}{subsubsection.16.8.5}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {16.9}OpenType scripts and languages}{48}{subsection.16.9}}
+\newlabel{sec:ot}{{Section\nobreakspace  {}16.9}{48}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{29@xvr}{{}{48}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{29@vr}{{}{48}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{30@xvr}{{}{48}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{30@vr}{{}{48}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{31@xvr}{{}{50}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{31@vr}{{}{50}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{32@xvr}{{}{50}{OpenType scripts and languages}{subsection.16.9}{}}
+\newlabel{32@vr}{{}{50}{OpenType scripts and languages}{subsection.16.9}{}}
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {16.9.1}\texttt  {Script} and \texttt  {Language} examples}{50}{subsubsection.16.9.1}}
+\newlabel{ex:script-lang}{{40}{50}{\feat {Script} and \feat {Language} examples}{example.40}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {16}{\ignorespaces Defined \texttt  {Script}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily  \leavevmode {\color  {red}\P  }}).\relax }}{51}{table.caption.61}}
+\newlabel{tab:ot-scpt}{{Table\nobreakspace  {}16}{51}{Defined \opt {Script}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily \textcolor {red}{\P }}).\relax }{table.caption.61}{}}
+\@writefile{lot}{\contentsline {table}{\numberline {17}{\ignorespaces Defined \texttt  {Language}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily  \leavevmode {\color  {red}\P  }}).\relax }}{52}{table.caption.62}}
+\newlabel{tab:ot-lang}{{Table\nobreakspace  {}17}{52}{Defined \opt {Language}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily \textcolor {red}{\P }}).\relax }{table.caption.62}{}}
+\@setckpt{fontspec-doc-opentype}{
+\setcounter{page}{53}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{11}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{4}
+\setcounter{section}{16}
+\setcounter{subsection}{9}
+\setcounter{subsubsection}{1}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{0}
+\setcounter{table}{17}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{23}
+\setcounter{vrcnt}{32}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{11}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{57}
+\setcounter{example}{40}
+\setcounter{argument}{0}
+\setcounter{section@level}{3}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
new file mode 100644
index 00000000000..cd4ac0b5724
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-opentype.tex
@@ -0,0 +1,911 @@
+
+
+\part{OpenType}
+\label{sec:opentype-features}
+
+\section{Introduction}
+\label{sec:opentype-features-intro}
+
+OpenType fonts (and other `smart' font technologies such as AAT and Graphite) can change the appearance of text in many different ways.
+These changes are referred to as font features.
+When the user applies a feature~--- for example, small capitals~--- to a run of text, the code inside the font makes appropriate substitutions and small capitals appear in place of lowercase letters.
+However, the use of such features does not affect the underlying text.
+In our small caps example, the lowercase letters are still stored in the document; only the appearance has been changed by the OpenType feature.
+This makes it possible to search and copy text without difficulty.
+If the user selected a different font that does not support small caps, the `plain' lowercase letters would appear instead.
+
+Some OpenType features are required to support particular scripts, and these features are often applied automatically.
+The Indic scripts, for example, often require that characters be reshaped and reordered after they are typed by the user, in order to display them in the traditional ways that readers expect.
+Other features can be applied to support a particular language.
+The Junicode font for medievalists uses by default the Old English shape of the letter thorn, while in modern Icelandic thorn has a more rounded shape.
+If a user tags some text as being in Icelandic, Junicode will automatically change to the Icelandic shape through an OpenType feature that localises the shapes of letters.
+
+There are a large group of OpenType features, designed to support high quality typography a multitude of languages and writing scripts.
+Examples of some font features have already been shown in previous sections; the complete set of OpenType font features supported by \pkg{fontspec} is described below in \ref{sec:ot-feat}.
+
+The OpenType specification provides four-letter codes (e.g., \texttt{smcp} for small capitals) for each feature.  The four-letter codes are given below along with the \pkg{fontspec} names for various features, for the benefit of people who are already familiar with OpenType.  You can ignore the codes if they don't mean anything to you.
+
+
+\subsection{How to select font features}
+
+Font features are selected by a series of \meta{feature}=\meta{option}
+selections. Features are (usually) grouped logically; for example, all
+font features relating to ligatures are accessed by writing \verb|Ligatures={...}| with the appropriate argument(s), which could be \texttt{TeX}, \texttt{Rare}, etc., as shown below in \ref{sec:ot-feat-liga}.
+
+Multiple options may be given to
+any feature that accepts non-numerical input, although doing so will
+not always work. Some options will override others in generally
+obvious ways; \Verb|Numbers={OldStyle,Lining}| doesn't make much
+sense because the two options are mutually exclusive, and \XeTeX\
+will simply use the last option that is specified (in this case
+using \opt{Lining} over \opt{OldStyle}).
+
+If a feature or an option is requested that the font does not have,
+a warning is given in the console output. As mentioned in \vref{sec:quiet-warnings}
+these warnings can be suppressed by selecting the \texttt{[quiet]} package option.
+
+\subsection{How do I know what font features are supported by my fonts?}
+
+Although I've long desired to have a feature within \pkg{fontspec} to display the OpenType features within a font, it's never been high on my priority list.
+One reason for that is the existence of the document |opentype-info.tex|, which is available on \textsc{ctan} or typing |kpsewhich opentype-info.tex| in a Terminal window.
+Make a copy of this file and place it somewhere convenient.
+Then open it in your regular \TeX\ editor and change the font name to the font you'd like to query; after running through plain \XeTeX, the output \textsc{pdf} will look something like this:
+
+\begin{framed}
+\def\myfontname{[Asana-Math.otf]}
+%
+%%% OpenType-info.tex %%%
+
+\font\testfont="\myfontname/ICU" at 12pt
+
+\rightskip=0pt plus 1fil
+
+\font\titlefont=ec-lmssbx10 at 12pt
+\font\tenrm=ec-lmss10 at 9pt \tenrm
+\font\tentt=ec-lmtt10 at 9pt
+
+\def\fourcharcode#1{\begingroup
+ \count0=#1\count1=\count0
+ \ifnum\count0=0
+  $\langle$default$\rangle$%
+ \else
+  \tentt
+  '%
+  \divide\count0 by "1000000
+  \char\count0
+  \multiply\count0 by "1000000
+  \advance\count1 by -\count0
+  \count0=\count1
+  \divide\count0 by "10000
+  \char\count0
+  \multiply\count0 by "10000
+  \advance\count1 by -\count0
+  \count0=\count1
+  \divide\count0 by "100
+  \char\count0
+  \multiply\count0 by "100
+  \advance\count1 by -\count0
+  \ifnum\count1=32 \ \else \char\count1 \fi
+  '%
+ \fi
+ \endgroup
+}
+
+\newcount\scriptcount
+\newcount\scriptindex
+\newcount\scripttag
+\newcount\langcount
+\newcount\langindex
+\newcount\langtag
+\newcount\featurecount
+\newcount\featureindex
+\newcount\featuretag
+
+\leftline{\titlefont OpenType Layout features found in `\myfontname'}
+\nobreak
+
+\scriptcount=\XeTeXOTcountscripts\testfont
+\ifnum\scriptcount=0 \noindent None\par\fi
+
+\loop
+ \ifnum\scriptindex<\scriptcount
+  \smallskip
+  \scripttag=\XeTeXOTscripttag\testfont\scriptindex
+  \noindent script = \fourcharcode{\scripttag}\endgraf\nobreak
+  \langcount=\XeTeXOTcountlanguages\testfont\scripttag
+  \advance\langcount by 1 % one extra to get the default language system
+  {\loop
+    \langtag=\XeTeXOTlanguagetag\testfont\scripttag\langindex
+    \indent language = \fourcharcode{\langtag}\endgraf\nobreak
+    \featurecount=\XeTeXOTcountfeatures\testfont\scripttag\langtag
+    {\indent\indent \hangindent=3\parindent \hangafter=1 features = \loop
+      \featuretag=\XeTeXOTfeaturetag\testfont\scripttag\langtag\featureindex
+      \fourcharcode{\featuretag}
+      \advance\featureindex by 1
+      \ifnum\featureindex<\featurecount \repeat\endgraf}
+    \advance\langindex by 1
+  \ifnum\langindex<\langcount \medskip \repeat}
+  \advance\scriptindex by 1
+\repeat
+\end{framed}
+
+\noindent I intentionally picked a font that by design needs few font features; `regular' text fonts such as Latin Modern Roman contain many more, and I didn't want to clutter up the document too much.
+You'll then need to cross-check the OpenType feature tags with the `logical' names used by \pkg{fontspec}.
+
+\paragraph{otfinfo}
+Alternatively, and more simply, you can use the command line tool |otfinfo|, which is distributed with \TeX{}Live.
+Simply type in a Terminal window, say:
+\begin{Verbatim}
+  otfinfo -f `kpsewhich lmromandunh10-oblique.otf`
+\end{Verbatim}
+which results in:
+\begin{Verbatim}[frame=single]
+aalt	Access All Alternates
+cpsp	Capital Spacing
+dlig	Discretionary Ligatures
+frac	Fractions
+kern	Kerning
+liga	Standard Ligatures
+lnum	Lining Figures
+onum	Oldstyle Figures
+pnum	Proportional Figures
+size	Optical Size
+tnum	Tabular Figures
+zero	Slashed Zero
+\end{Verbatim}
+
+\section{OpenType font features}
+\label{sec:ot-feat}
+
+There are a finite set of OpenType font features, and \pkg{fontspec} provides an
+interface to around half of them.
+Full documentation will be presented in the following sections, including how to
+enable and disable individual features, and how they interact.
+
+A brief reference is provided (\vref*{tab:all-ot}) but note that this is an incomplete
+listing --- only the `enable' keys are shown, and where alternative interfaces are
+provided for convenience only the first is shown.
+(E.g., |Numbers=OldStyle| is the same as |Numbers=Lowercase|.)
+
+For completeness, the complete list of OpenType features \emph{not} provided with
+a \pkg{fontspec} interface is shown in \vref{tab:none-ot}.
+Features omitted are partially by design and partially by oversight;
+for example, the |aalt| feature is largely useless in \TeX\ since it is designed
+for providing a textsc{gui} interface for selecting `all alternates' of a glyph.
+Others, such as optical bounds for example, simply haven't yet been considered
+due to a lack of fonts available for testing.
+Suggestions welcome for how/where to add these missing features to the package.
+
+\ExplSyntaxOn
+\def\allOTfeat{
+  \prop_map_inline:Nn \g__fontspec_all_opentype_feature_names_prop
+    { \opentypefeature{##1}{##2} }
+}
+\newcommand\opentypefeature[2]{
+  \prop_get:NnNT \g__fontspec_OT_features_prop {#1} \tmpa
+      {
+        \raggedright
+        \hangindent=5.2cm
+        \makebox[1cm][l]{\textsc{#1}}
+        \makebox[4.2cm][l]{
+          \int_compare:nT { \tl_count:N \tmpa > 25 } {\ttcondensed} {\ttfamily}
+          \tmpa
+        }
+        \textit{#2}
+        \par
+        \vspace{2pt}
+     }
+}
+\ExplSyntaxOff
+
+\begin{table}
+\caption{Summary of OpenType features in \textsf{fontspec}, alphabetic by feature tag.}
+\label{tab:all-ot}
+\centerline{%
+\begin{minipage}{18cm}
+\small
+\hrule\smallskip
+\begin{multicols}{2}
+\parindent =0pt
+\allOTfeat
+\end{multicols}
+\vspace*{-\smallskipamount}
+\hrule
+\end{minipage}}
+\end{table}
+
+\ExplSyntaxOn
+\renewcommand\opentypefeature[2]{
+  \prop_get:NnNF \g__fontspec_OT_features_prop {#1} \tmpa
+      {
+        \raggedright
+        \hangindent=0.9cm
+        \makebox[0.9cm][l]{\textsc{#1}}%
+        \textit{#2}
+        \par
+     }
+}
+\ExplSyntaxOff
+
+\begin{table}
+\caption{List of \emph{unsupported} OpenType features.}
+\label{tab:none-ot}
+\bigskip
+\centerline{%
+\begin{minipage}{15cm}
+\hrule\smallskip
+\begin{multicols}{3}
+\parindent =0pt
+\allOTfeat
+\end{multicols}
+\vspace*{-\smallskipamount}
+\hrule
+\end{minipage}}
+\end{table}
+
+\subsection{Tag-based features}
+
+\subsubsection{Ligatures}
+\label{sec:ot-feat-liga}
+
+\feat{Ligatures} refer to the replacement of two separate characters
+with a specially drawn glyph for functional or \ae sthetic reasons.
+The list of options, of which multiple may be selected at one time,
+is shown in \ref{feat:Ligatures}.
+A demonstration with the Linux Libertine fonts\note{\url{http://www.linuxlibertine.org/}} is shown in \exref{lig}.
+
+Note the additional features accessed with \verb|Ligatures=TeX|. These are
+not actually real OpenType features, but additions provided by \pkg{luaotfload} (i.e., \LuaTeX\ only) to emulate \TeX's behaviour for \textsc{ascii} input of curly quotes and punctuation. In \XeTeX\ this is achieved with the \feat{Mapping} feature (see \vref{sec:mapping}) but for consistency \verb|Ligatures=TeX| will perform the same function as \verb|Mapping=tex-text|.
+
+\subsection{Letters} \label{sec:letters}
+The \opt{Letters} feature specifies how the letters in the current font
+will look. OpenType fonts may contain the following options:
+\opt{Uppercase}, \opt{SmallCaps}, \opt{PetiteCaps},
+\opt{UppercaseSmallCaps}, \opt{UppercasePetiteCaps}, and
+\opt{Unicase}.
+
+
+\begin{features}{Ligatures}
+\otf*{Required}{rlig}
+\otf*{Common}{liga}
+\otf*{Contextual}{clig}
+\otf*{Rare/Discretionary}{dlig}
+\otf*{Historic}{hlig}
+\otf*{TeX}{tlig}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+\begin{Lexample}[firstline=2]{lig}{An example of the \feat{Ligatures} feature.}
+   \Huge\centering
+   \def\test#1#2{%
+     #2 $\to$ {\addfontfeature{#1} #2}\\}
+   \fontspec{Linux Libertine O}
+   \test{Ligatures=Historic}{strict}
+   \test{Ligatures=Rare}{wurtzite}
+   \test{Ligatures=NoCommon}{firefly}
+\end{Lexample}
+
+\begin{features}{Letters}
+\otf*{Uppercase}{case}
+\otf*{SmallCaps}{smcp}
+\otf*{PetiteCaps}{pcap}
+\otf*{UppercaseSmallCaps}{c2sc}
+\otf*{UppercasePetiteCaps}{c2pc}
+\otf*{Unicase}{unic}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+Petite caps are smaller than small caps.
+\opt{SmallCaps} and \opt{PetiteCaps}
+turn lowercase letters into the smaller caps letters,
+whereas the \opt{Uppercase...} options turn the \emph{capital} letters into
+the smaller
+caps (good, \eg, for applying to already uppercase acronyms like
+`NASA').
+This difference is shown in \exref{caps}.
+`Unicase' is a weird hybrid of upper and lower case letters.
+
+\begin{Lexample}{caps}{Small caps from lowercase or uppercase letters.}
+  \fontspec{texgyreadventor-regular.otf}[Letters=SmallCaps]
+   THIS SENTENCE no verb                \\
+  \fontspec{texgyreadventor-regular.otf}[Letters=UppercaseSmallCaps]
+   THIS SENTENCE no verb
+\end{Lexample}
+
+Note that the \opt{Uppercase} option will (probably)
+not actually map letters to uppercase.
+ \note{If you want automatic uppercase letters, look to \LaTeX's
+      \cmd\MakeUppercase\ command.}
+It is designed to select various
+uppercase forms for glyphs such as accents and dashes, such as shown
+in \exref{letters-uppercase}; note the raised position of the hyphen
+to better match the surrounding letters.
+
+\begin{Lexample}{letters-uppercase}{An example of the \opt{Uppercase} option of the \feat{Letters} feature.}
+  \fontspec{Linux Libertine O}
+   UPPER-CASE example \\
+  \addfontfeature{Letters=Uppercase}
+   UPPER-CASE example
+\end{Lexample}
+
+The \feat{Kerning} feature also contains an \opt{Uppercase} option,
+which adds a small amount of spacing in between letters (see \vref{sec:kerning}).
+
+\subsubsection{Numbers}
+
+The \feat{Numbers} feature defines how numbers will look in the
+selected font, accepting options shown in \ref{feat:Numbers}.
+
+\begin{features}{Numbers}
+\otf*{Uppercase}{lnum}
+\otf*{Lowercase}{onum}
+\otf*{Lining}{lnum}
+\otf*{OldStyle}{onum}
+\otf*{Proportional}{pnum}
+\otf*{Monospaced}{tnum}
+\otf*{SlashedZero}{zero}
+\otf*{Arabic}{anum}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+The synonyms
+\opt{Uppercase} and \opt{Lowercase} are equivalent to \opt{Lining} and
+\opt{OldStyle}, respectively.
+The differences have been shown previously
+in \vref{sec:addfontfeatures}.
+The \opt{Monospaced} option is useful for tabular material when digits need
+to be vertically aligned.
+
+The \opt{SlashedZero} option
+replaces the default zero with a slashed version to prevent
+confusion with an uppercase `O', shown in \exref{slashzero}.
+
+\begin{Lexample}{slashzero}{The effect of the \opt{SlashedZero} option.}
+  \fontspec[Numbers=Lining]{texgyrebonum-regular.otf}
+   0123456789
+  \fontspec[Numbers=SlashedZero]{texgyrebonum-regular.otf}
+   0123456789
+\end{Lexample}
+
+The \opt{Arabic} option (with tag \verb|anum|) maps regular numerals to their Arabic script or Persian equivalents
+based on the current \opt{Language} setting (see \vref{sec:ot}).
+This option is based on a \LuaTeX\ feature of the \pkg{luaotfload} package,
+not an OpenType feature. (Thus, this feature is unavailable in \XeTeX.)
+
+\subsubsection{Contextuals}
+This feature refers to substitutions of glyphs that vary `contextually' by their relative position in a word or string of characters;
+features such as contextual swashes are accessed via the options shown in \ref{feat:Contextuals}.
+
+\begin{features}{Contextuals}
+\otf*{Swash}{cswh}
+\otf*{Alternate}{calt}
+\otf*{WordInitial}{init}
+\otf*{WordFinal}{fina}
+\otf*{LineFinal}{falt}
+\otf*{Inner}{medi}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+Historic forms are accessed in OpenType
+fonts via the feature \feat{Style=Historic}; this is generally \emph{not}
+contextual in OpenType, which is why it is not included in this feature.
+
+\subsubsection{Vertical Position}
+
+\begin{features}{VerticalPosition}
+\otf*{Superior}{sups}
+\otf*{Inferior}{subs}
+\otf*{Numerator}{numr}
+\otf*{Denominator}{dnom}
+\otf*{ScientificInferior}{sinf}
+\otf*{Ordinal}{ordn}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+The \feat{VerticalPosition} feature is used to access things like
+subscript (\opt{Inferior}) and superscript (\opt{Superior}) numbers and
+letters (and a small amount of punctuation, sometimes).
+The \opt{Ordinal} option will only raise characters that are used
+in some languages directly after a number.
+The \opt{ScientificInferior} feature will move glyphs
+further below the baseline than the \opt{Inferior} feature.
+These are shown in \exref{vertpos}
+
+\opt{Numerator} and \opt{Denominator} should only be used for creating
+arbitrary fractions (see next section).
+
+\begin{Lexample}{vertpos}{The \feat{VerticalPosition} feature.}
+  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=Superior]
+   Superior: 1234567890                                   \\
+  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=Numerator]
+   Numerator: 12345                                       \\
+  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=Denominator]
+   Denominator: 12345                                     \\
+  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=ScientificInferior]
+   Scientific Inferior: 12345
+\end{Lexample}
+
+The \pkg{realscripts} package
+(which is also loaded by \pkg{xltxtra} for \XeTeX)
+redefines the \cmd\textsubscript\ and
+\cmd\textsuperscript\ commands to use the above font features automatically,
+including for use in footnote labels.
+If this is the only feature of \pkg{xltxtra} you wish to use, consider
+loading \pkg{realscripts} on its own instead.
+
+
+\subsubsection{Fractions}
+
+\begin{features}{Fractions}
+\otf{On}{+frac}
+\otf{Off}{-frac}
+\otf{Reset}{}
+\cmidrule{2-4}
+\otf*{Alternate}{afrc}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+For OpenType fonts use a regular text slash to create fractions, but
+the \feat{Fraction} feature must be explicitly activated.
+Some (Asian fonts predominantly) also provide for the
+\opt{Alternate} feature. These are both shown in \exref{ot-frac}.
+
+\begin{Xexample}{ot-frac}{The \feat{Fractions} feature.}
+  \fontspec{Hiragino Maru Gothic Pro W4}
+   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
+  \addfontfeature{Fractions=On}
+   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
+  \addfontfeature{Fractions=Alternate}
+   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
+\end{Xexample}
+
+\subsection{Style}
+\label{sec:ot-feat-style}
+
+\begin{features}{Style}
+\otf*{Alternate}{salt}
+\otf*{Italic}{ital}
+\otf*{Ruby}{ruby}
+\otf*{Swash}{swsh}
+\otf*{Cursive}{curs}
+\otf*{Historic}{hist}
+\otf*{TitlingCaps}{titl}
+\otf*{HorizontalKana}{hkna}
+\otf*{VerticalKana}{vkna}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+`Ruby' refers to a small optical size, used in
+Japanese typography for annotations.
+For fonts with multiple |salt| OpenType features,
+use the fontspec \feat{Alternate} feature instead.
+
+\Exref{style-alt} and \exref{style-hist} both contain glyph
+substitutions with similar characteristics.
+Note the occasional inconsistency with which font features are labelled; a long-tailed `Q' could turn up anywhere!
+
+ \begin{Xexample}[firstline=2]{style-alt}{Example of the \opt{Alternate} option of the \feat{Style} feature.}
+  \Large
+  \fontspec{Quattrocento Roman}
+   M Q W                      \\
+  \addfontfeature{Style=Alternate}
+   M Q W
+\end{Xexample}
+
+\begin{Xexample}[firstline=2]{style-hist}{Example of the \opt{Historic} option of the \feat{Style} feature.}
+  \Large
+  \fontspec{Adobe Jenson Pro}
+   M Q Z                      \\
+  \addfontfeature{Style=Historic}
+   M Q Z
+\end{Xexample}
+
+In other features, larger breadths of changes can be seen, covering
+the style of an entire alphabet. See \exref{style-titl} and \exref{style-itrub}; in the latter, the \opt{Italic} option affects the Latin text and the \opt{Ruby} option the Japanese.
+
+\begin{Xexample}[firstline=2]{style-titl}{Example of the \opt{TitlingCaps} option of the \feat{Style} feature.}
+  \Large
+  \fontspec{Adobe Garamond Pro}
+   TITLING CAPS                       \\
+  \addfontfeature{Style=TitlingCaps}
+   TITLING CAPS
+\end{Xexample}
+
+\begin{Xexample}[firstline=2]{style-itrub}{Example of the \opt{Italic} and \opt{Ruby} options of the \feat{Style} feature.}
+  \Large \def\kana{ようこそ ワカヨタレソ}
+  \fontspec{Hiragino Mincho Pro}
+   Latin \kana        \\
+  \addfontfeature{Style={Italic, Ruby}}
+   Latin \kana
+\end{Xexample}
+
+Note the difference here between the default and the horizontal style kana
+in \exref{style-hvkana}: the horizontal style is slightly wider.
+
+\begin{Xexample}[firstline=2]{style-hvkana}{Example of the \opt{HorizontalKana} and \opt{VerticalKana} options of the \feat{Style} feature.}
+  \Large \def\kana{ようこそ ワカヨタレソ}
+   \fontspec{Hiragino Mincho Pro}
+    \kana   \\
+  {\addfontfeature{Style=HorizontalKana}
+    \kana } \\
+  {\addfontfeature{Style=VerticalKana}
+    \kana }
+\end{Xexample}
+
+\subsection{Diacritics}
+Specifies how combining diacritics should be placed.
+These will usually be controlled automatically
+according to the Script setting.
+
+\begin{features}{Diacritics}
+\otf*{MarkToBase}{mark}
+\otf*{MarkToMark}{mkmk}
+\otf*{AboveBase}{abvm}
+\otf*{BelowBase}{blwm}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+\subsection{Kerning}\label{sec:kerning}
+Specifies how inter-glyph spacing should behave.
+Well-made fonts include information for how differing
+amounts of space should be inserted between separate character pairs.
+This kerning space is inserted automatically but in rare
+circumstances you may wish to turn it off.
+
+\begin{features}{Kerning}
+\otf{On}{+kern}
+\otf{Off}{-kern}
+\otf{Reset}{}
+\cmidrule{2-4}
+\otf*{Uppercase}{cpsp}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+As briefly mentioned previously at the end of \vref{sec:letters},
+the \opt{Uppercase} option will add a small amount of tracking between
+uppercase letters, seen in \exref{kernup}, which uses the Romande
+fonts\note{\url{http://arkandis.tuxfamily.org/adffonts.html}}
+(thanks to Clea F. Rees for the suggestion).
+The \opt{Uppercase} option acts separately to the regular kerning
+controlled by the \opt{On}/\opt{Off} options.
+
+\begin{Xexample}[firstline=2]{kernup}{Adding extra kerning for uppercase letters. (The difference is usually very small.)}
+  \large
+  \fontspec{Romande ADF Std Bold}
+   UPPERCASE EXAMPLE \\
+  \addfontfeature{Kerning=Uppercase}
+   UPPERCASE EXAMPLE
+\end{Xexample}
+
+
+\subsection{Character width}\label{sec:CharacterWidth}
+Many Asian fonts are equipped with variously spaced characters for
+shoe-horning into their generally monospaced text.
+These are
+accessed through the \feat{CharacterWidth} feature.
+
+\begin{features}{CharacterWidth}
+\otf*{Proportional}{pwid}
+\otf*{Full}        {fwid}
+\otf*{Half}        {hwid}
+\otf*{Third}       {twid}
+\otf*{Quarter}     {qwid}
+\otf*{AlternateProportional}{palt}
+\otf*{AlternateHalf}{halt}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+Japanese alphabetic glyphs (in Hiragana or Katakana) may be typeset
+proportionally, to better fit horizontal measures, or monospaced, to
+fit into the rigid grid imposed by ideographic typesetting. In this
+latter case, there are also half-width forms for squeezing more kana
+glyphs (which are less complex than the kanji they are amongst) into
+a given block of space. The same features are given to roman letters
+in Japanese fonts, for typesetting foreign words in the same style
+as the surrounding text.
+
+\begin{Xexample}[firstline=2]{charwdprop}{Proportional or fixed width forms.}
+  \def\texta{ようこそ}\def\textb{ワカヨタレソ}
+  \def\test{\makebox[2cm][l]{\texta}%
+            \makebox[2.5cm][l]{\textb}%
+            \makebox[2.5cm][l]{abcdef}}
+  \fontspec{Hiragino Mincho Pro}
+  {\addfontfeature{CharacterWidth=Proportional}\test}\\
+  {\addfontfeature{CharacterWidth=Full}\test}\\
+  {\addfontfeature{CharacterWidth=Half}\test}
+\end{Xexample}
+
+The same situation occurs with numbers, which are provided in
+increasingly illegible compressed forms seen in \exref{charwd}.
+
+\begin{Xexample}[firstline=2]{charwd}{Numbers can be compressed significantly.}
+  \centering
+  \fontspec[Renderer=AAT]{Hiragino Mincho Pro}
+  {\addfontfeature{CharacterWidth=Full}
+   ---12321---}\\
+  {\addfontfeature{CharacterWidth=Half}
+   ---1234554321---}\\
+  {\addfontfeature{CharacterWidth=Third}
+   ---123456787654321---}\\
+  {\addfontfeature{CharacterWidth=Quarter}
+   ---12345678900987654321---}
+\end{Xexample}
+
+
+\subsubsection{CJK shape}
+
+\begin{features}{CJKShape}
+\otf{Traditional}{trad}
+\otf{Simplified} {smpl}
+\otf{JIS1978}    {jp78}
+\otf{JIS1983}    {jp83}
+\otf{JIS1990}    {jp90}
+\otf{Expert}     {expt}
+\otf{NLC}        {nlck}
+\end{features}
+
+There have been many standards for how CJK ideographic
+glyphs are `supposed' to look. Some fonts will contain many alternate
+glyphs available in order to be able to display these gylphs
+correctly in whichever form is appropriate. Both \AAT\ and OpenType
+fonts support the following \feat{CJKShape} options:
+\opt{Traditional}, \opt{Simplified}, \opt{JIS1978}, \opt{JIS1983},
+\opt{JIS1990}, and \opt{Expert}. OpenType also supports the \opt{NLC} option.
+
+\begin{Xexample}[firstline=2]{ot-cjk-shape}{Different standards for CJK ideograph presentation.}
+  \LARGE\def\text{ 唖噛躯 妍并訝}
+  \fontspec{Hiragino Mincho Pro}
+  {\addfontfeature{CJKShape=Traditional}
+  \text }                          \\
+  {\addfontfeature{CJKShape=NLC}
+  \text }                          \\
+  {\addfontfeature{CJKShape=Expert}
+  \text }
+\end{Xexample}
+
+
+\subsection{Vertical typesetting}
+
+\begin{features}{Vertical}
+\otf*{RotatedGlyphs}         {vrt2}
+\otf*{AlternatesForRotation} {vrtr}
+\otf*{Alternates}            {vert}
+\otf*{KanaAlternates}        {vkna}
+\otf*{Kerning}               {vkrn}
+\otf*{AlternateMetrics}      {valt}
+\otf*{HalfMetrics}           {vhal}
+\otf*{ProportionalMetrics}   {vpal}
+\cmidrule{2-4}
+\otf{ResetAll}{}
+\end{features}
+
+OpenType provides a plethora of features for accommodating the varieties of possibilities
+needed for vertical typesetting (CJK and others).
+No capabilities for achieving such vertical typesetting are provided by \pkg{fontspec},
+however; please get in touch if there are improvements that could be made.
+
+
+\subsection{Numeric features}
+
+\subsubsection{Stylistic Set variations --- \texttt{ssNN}}
+
+This feature selects a `Stylistic Set' variation,
+which usually corresponds to an alternate glyph style for a range of
+characters (usually an alphabet or subset thereof).
+This feature is specified numerically. These correspond to OpenType
+features |ss01|, |ss02|, etc.
+
+Two demonstrations from the Junicode
+font\note{\url{http://junicode.sf.net}}
+are shown in \exref{ss} and \exref{ss2}; thanks to Adam
+Buchbinder for the suggestion.
+
+\begin{Lexample}{ss}{Insular letterforms, as used in medieval Northern Europe, for the Junicode font accessed with the \feat{StylisticSet} feature.}
+  \fontspec{Junicode}
+   Insular forms. \\
+  \addfontfeature{StylisticSet=2}
+   Insular forms. \\
+\end{Lexample}
+
+\begin{Lexample}{ss2}{Enlarged minuscules (capital letters remain unchanged) for the Junicode font, accessed with the \feat{StylisticSet} feature.}
+  \fontspec{Junicode}
+   ENLARGED Minuscules. \\
+  \addfontfeature{StylisticSet=6}
+   ENLARGED Minuscules. \\
+\end{Lexample}
+
+Multiple stylistic sets may be selected simultaneously by writing, e.g.,
+|StylisticSet={1,2,3}|.
+
+The |StylisticSet| feature is a synonym of the \feat{Variant} feature for \AAT\ fonts.
+See \vref{sec:newfeatures} for a way to assign names to stylistic sets, which should be done on a per-font basis.
+
+\subsubsection{Character Variants --- \texttt{cvNN}}
+
+Similar to the `Stylistic Sets' above, `Character Variations' are selected
+numerically to adjust the output of (usually) a single character for the
+particular font. These correspond to the OpenType features |cv01| to |cv99|.
+
+For each character that can be varied, it is possible to select among
+possible options for that particular glyph.
+For example, in \exref{cv} a variety of glyphs for the character `v' are
+selected, in which |5| corresponds to the character `v' for this font feature,
+and the trailing |:|\meta{n} corresponds to which variety to choose.
+Georg Duffner's open source Garamond revival font\footnote{\url{http://www.georgduffner.at/ebgaramond/}} is used in this example.
+Character variants are specifically designed not to conflict with each
+other, so you can enable them individually per character as shown in
+\exref{cv2}. (Unlike stylistic alternates, say.)
+
+Note that the indexing starts from zero.
+
+\begin{Lexample}[firstline=2]{cv}{The \feat{CharacterVariant} feature showing off Georg Duffner's open source Garamond revival font.}
+  \huge
+  \fontspec{EB Garamond 12 Italic}                       very \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5]   very \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:0] very \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:1] very \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:2] very \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:3] very
+\end{Lexample}
+
+\begin{Lexample}[firstline=2]{cv2}{The \feat{CharacterVariant} feature selecting multiple variants simultaneously.}
+  \huge
+  \fontspec{EB Garamond 12 Italic}                           \& violet \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant={4}]     \& violet \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant={5:2}]   \& violet \\
+  \fontspec{EB Garamond 12 Italic}[CharacterVariant={4,5:2}] \& violet
+\end{Lexample}
+
+\subsubsection{Alternates --- \texttt{salt}}
+
+The \feat{Alternate} feature, alias \feat{StylisticAlternates}, is used to access alternate font glyphs when variations exist in the font, such as in \exref{salt}.
+It uses a numerical selection, starting from zero, that will be different for each font.
+Note that the \texttt{Style=Alternate} option is equivalent
+to \texttt{Alternate=0} to access the default case.
+
+\begin{Xexample}[firstline=2]{salt}{The \feat{Alternate} feature.}
+  \huge
+  \fontspec{Linux Libertine O}
+  \textsc{a} \& h \\
+  \addfontfeature{Alternate=0}
+  \textsc{a} \& h
+\end{Xexample}
+
+Note that the indexing starts from zero.
+With the \LuaTeX\ engine, |Alternate=Random| selects a random alternate.
+
+See \vref{sec:newfeatures} for a way to assign names to alternates if desired.
+
+
+\subsubsection{Annotation --- \texttt{nalt} }
+Some fonts are equipped with an extensive range of
+numbers and numerals in different forms. These are accessed with the
+\feat{Annotation} feature (OpenType feature |nalt|), selected numerically as shown in
+\exref{ot-annot}. Note that the indexing starts from zero.
+
+\begin{Xexample}{ot-annot}{Annotation forms for OpenType fonts.}
+  \fontspec{Hiragino Maru Gothic Pro}
+   1 2 3 4 5 6 7 8 9
+  \def\x#1{\\{\addfontfeature{Annotation=#1}
+            1 2 3 4 5 6 7 8 9 }}
+  \x0\x1\x2\x3\x4\x5\x6\x7\x7\x8\x9
+\end{Xexample}
+
+
+\subsubsection{Ornament --- \texttt{ornm}}
+Ornaments are selected with the \feat{Ornament} feature (OpenType feature |ornm|), selected numerically such as for the \feat{Annotation} feature.
+If you know of an Open Source font that supports this feature, let me know and I'll add an example.
+
+
+
+
+\subsection{OpenType scripts and languages}\label{sec:ot}
+
+Fonts that include glyphs for various scripts and languages may contain different font features for the different character sets and languages they support, and different font features may behave differently depending on the script or language chosen.
+When multilingual fonts are used, it is important to select which language
+they are being used for, and more importantly what script is being used.
+
+The `script' refers to the alphabet in use; for example, both English
+and French use the Latin script. Similarly, the Arabic script can be used
+to write in both the Arabic and Persian languages.
+
+The
+\feat{Script} and \feat{Language} features are used to designate this information. The possible options are
+tabulated in \vref{tab:ot-scpt} and \vref{tab:ot-lang},
+respectively. When a script or language is requested that is not
+supported by the current font, a warning is printed in the console output.
+
+Because these font features can
+change which features are able to be selected for the font, they 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}.
+
+See \vref{sec:newscriptlang} for methods to create new \feat{Script} or \feat{Language}
+options if required.
+
+\subsubsection{\feat{Script} and \feat{Language} examples}
+
+In the examples shown in \exref{script-lang},
+the Code2000 font\note{\url{http://www.code2000.net/}}
+is used to typeset various input texts with and without the OpenType Script
+applied for various alphabets.
+The text is only rendered correctly in the second case;
+many examples of incorrect diacritic spacing as
+well as a lack of contextual ligatures and rearrangement can be
+seen.
+Thanks to \name{Jonathan Kew}, \name{Yves Codet} and
+\name{Gildas Hamel} for their contributions towards these examples.
+
+\begin{Xexample}[firstline=14,lastline=23]{script-lang}{An example of various Scripts and Languages.}
+\def\testfeature#1#2{%^^A
+  \fontspec{\examplefont}#2 & \fontspec[#1]{\examplefont}#2\\[1ex]}
+\def \examplefont{Code2000}
+\def \arabictext{العربي}
+\def \devanagaritext{हिन्दी}
+\def \bengalitext{লেখ}
+\def \gujaratitext{મર્યાદા-સૂચક નિવેદન}
+\def \malayalamtext{നമ്മുടെ പാരബര്യ}
+\def \gurmukhitext{ਆਦਿ ਸਚੁ ਜੁਗਾਦਿ ਸਚੁ}
+\def \tamiltext{தமிழ் தேடி}
+\def \hebrewtext{רִדְתָּֽהּ}
+\def \vietnamesetext{cấp số mỗi}
+\begin{tabular}{r@{\quad}l}
+  \testfeature{Script=Arabic}{\arabictext}
+  \testfeature{Script=Devanagari}{\devanagaritext}
+  \testfeature{Script=Bengali}{\bengalitext}
+  \testfeature{Script=Gujarati}{\gujaratitext}
+  \testfeature{Script=Malayalam}{\malayalamtext}
+  \testfeature{Script=Gurmukhi}{\gurmukhitext}
+  \testfeature{Script=Tamil}{\tamiltext}
+  \testfeature{Script=Hebrew}{\hebrewtext}
+  \def\examplefont{Doulos SIL}
+  \testfeature{Language=Vietnamese}{\vietnamesetext}
+\end{tabular}
+\end{Xexample}
+
+
+
+\begin{table}[!hbp]
+  \caption{Defined \opt{Script}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily\textcolor{red}{\P}}).}
+  \label{tab:ot-scpt}
+\def\dup{\makebox[0pt][r]{\textcolor{red}{\P}}}
+\setlength\columnseprule{0pt}
+  \hrule
+  \begin{multicols}{4}\setlength\parindent{0pt}
+    \sffamily\scriptsize
+    Arabic \par Armenian \par Balinese \par Bengali \par Bopomofo \par Braille \par Buginese \par Buhid \par Byzantine Music \par Canadian Syllabics \par Cherokee \par \dup CJK \par \dup CJK Ideographic \par Coptic \par Cypriot Syllabary \par Cyrillic \par Default \par Deseret \par Devanagari \par Ethiopic \par Georgian \par Glagolitic \par Gothic \par Greek \par Gujarati \par Gurmukhi \par Hangul Jamo \par Hangul \par Hanunoo \par Hebrew \par \dup Hiragana and Katakana \par \dup Kana \par Javanese \par Kannada \par Kharosthi \par Khmer \par Lao \par Latin \par Limbu \par Linear B \par Malayalam \par \dup Math \par \dup Maths \par Mongolian \par Musical Symbols \par Myanmar \par N'ko \par Ogham \par Old Italic \par Old Persian Cuneiform \par Oriya \par Osmanya \par Phags-pa \par Phoenician \par Runic \par Shavian \par Sinhala \par Sumero-Akkadian Cuneiform \par Syloti Nagri \par Syriac \par Tagalog \par Tagbanwa \par Tai Le \par Tai Lu \par Tamil \par Telugu \par Thaana \par Thai \par Tibetan \par Tifinagh \par Ugaritic Cuneiform \par Yi
+  \end{multicols}
+  \hrule
+\end{table}
+
+\begin{table}[p]
+  \vspace*{-3cm}
+  \hspace{-3cm}
+  \def\dup{\makebox[0pt][r]{\textcolor{red}{\P}}}
+  \begin{minipage}{\linewidth+4cm}
+  \caption{Defined \opt{Language}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily\textcolor{red}{\P}}).}
+  \label{tab:ot-lang}
+  \setlength\columnseprule{0pt}
+  \hrule
+  \begin{multicols}{6}
+    \everypar{\setlength\parindent{0pt}\setlength\hangindent{2em}}
+    \sffamily\footnotesize\raggedright
+    Abaza \par Abkhazian \par Adyghe \par Afrikaans \par Afar \par Agaw \par Altai \par Amharic \par Arabic \par Aari \par Arakanese \par Assamese \par Athapaskan \par Avar \par Awadhi \par Aymara \par Azeri \par Badaga \par Baghelkhandi \par Balkar \par Baule \par Berber \par Bench \par Bible Cree \par Belarussian \par Bemba \par Bengali \par Bulgarian \par Bhili \par Bhojpuri \par Bikol \par Bilen \par Blackfoot \par Balochi \par Balante \par Balti \par Bambara \par Bamileke \par Breton \par Brahui \par Braj Bhasha \par Burmese \par Bashkir \par Beti \par Catalan \par Cebuano \par Chechen \par Chaha Gurage \par Chattisgarhi \par Chichewa \par Chukchi \par Chipewyan \par Cherokee \par Chuvash \par Comorian \par Coptic \par Cree \par Carrier \par Crimean Tatar \par Church Slavonic \par Czech \par Danish \par Dargwa \par Woods Cree \par German \par Default \par Dogri \par Divehi \par Djerma \par Dangme \par Dinka \par Dungan \par Dzongkha \par Ebira \par Eastern Cree \par Edo \par Efik \par Greek \par English \par Erzya \par Spanish \par Estonian \par Basque \par Evenki \par Even \par Ewe \par French Antillean \par \dup Farsi \par \dup Parsi \par \dup Persian \par Finnish \par Fijian \par Flemish \par Forest Nenets \par Fon \par Faroese \par French \par Frisian \par Friulian \par Futa \par Fulani \par Ga \par Gaelic \par Gagauz \par Galician \par Garshuni \par Garhwali \par Ge'ez \par Gilyak \par Gumuz \par Gondi \par Greenlandic \par Garo \par Guarani \par Gujarati \par Haitian \par Halam \par Harauti \par Hausa \par Hawaiin \par Hammer-Banna \par Hiligaynon \par Hindi \par High Mari \par Hindko \par Ho \par Harari \par Croatian \par Hungarian \par Armenian \par Igbo \par Ijo \par Ilokano \par Indonesian \par Ingush \par Inuktitut \par Irish \par Irish Traditional \par Icelandic \par Inari Sami \par Italian \par Hebrew \par Javanese \par Yiddish \par Japanese \par Judezmo \par Jula \par Kabardian \par Kachchi \par Kalenjin \par Kannada \par Karachay \par Georgian \par Kazakh \par Kebena \par Khutsuri Georgian \par Khakass \par Khanty-Kazim \par Khmer \par Khanty-Shurishkar \par Khanty-Vakhi \par Khowar \par Kikuyu \par Kirghiz \par Kisii \par Kokni \par Kalmyk \par Kamba \par Kumaoni \par Komo \par Komso \par Kanuri \par Kodagu \par Korean Old Hangul \par Konkani \par Kikongo \par Komi-Permyak \par Korean \par Komi-Zyrian \par Kpelle \par Krio \par Karakalpak \par Karelian \par Karaim \par Karen \par Koorete \par Kashmiri \par Khasi \par Kildin Sami \par Kui \par Kulvi \par Kumyk \par Kurdish \par Kurukh \par Kuy \par Koryak \par Ladin \par Lahuli \par Lak \par Lambani \par Lao \par Latin \par Laz \par L-Cree \par Ladakhi \par Lezgi \par Lingala \par Low Mari \par Limbu \par Lomwe \par Lower Sorbian \par Lule Sami \par Lithuanian \par Luba \par Luganda \par Luhya \par Luo \par Latvian \par Majang \par Makua \par Malayalam Traditional \par Mansi \par Marathi \par Marwari \par Mbundu \par Manchu \par Moose Cree \par Mende \par Me'en \par Mizo \par Macedonian \par Male \par Malagasy \par Malinke \par Malayalam Reformed \par Malay \par Mandinka \par Mongolian \par Manipuri \par Maninka \par Manx Gaelic \par Moksha \par Moldavian \par Mon \par Moroccan \par Maori \par Maithili \par Maltese \par Mundari \par Naga-Assamese \par Nanai \par Naskapi \par N-Cree \par Ndebele \par Ndonga \par Nepali \par Newari \par Nagari \par Norway House Cree \par Nisi \par Niuean \par Nkole \par N'ko \par Dutch \par Nogai \par Norwegian \par Northern Sami \par Northern Tai \par Esperanto \par Nynorsk \par Oji-Cree \par Ojibway \par Oriya \par Oromo \par Ossetian \par Palestinian Aramaic \par Pali \par Punjabi \par Palpa \par Pashto \par Polytonic Greek \par Pilipino \par Palaung \par Polish \par Provencal \par Portuguese \par Chin \par Rajasthani \par R-Cree \par Russian Buriat \par Riang \par Rhaeto-Romanic \par Romanian \par Romany \par Rusyn \par Ruanda \par Russian \par Sadri \par Sanskrit \par Santali \par Sayisi \par Sekota \par Selkup \par Sango \par Shan \par Sibe \par Sidamo \par Silte Gurage \par Skolt Sami \par Slovak \par Slavey \par Slovenian \par Somali \par Samoan \par Sena \par Sindhi \par Sinhalese \par Soninke \par Sodo Gurage \par Sotho \par Albanian \par Serbian \par Saraiki \par Serer \par South Slavey \par Southern Sami \par Suri \par Svan \par Swedish \par Swadaya Aramaic \par Swahili \par Swazi \par Sutu \par Syriac \par Tabasaran \par Tajiki \par Tamil \par Tatar \par TH-Cree \par Telugu \par Tongan \par Tigre \par Tigrinya \par Thai \par Tahitian \par Tibetan \par Turkmen \par Temne \par Tswana \par Tundra Nenets \par Tonga \par Todo \par Turkish \par Tsonga \par Turoyo Aramaic \par Tulu \par Tuvin \par Twi \par Udmurt \par Ukrainian \par Urdu \par Upper Sorbian \par Uyghur \par Uzbek \par Venda \par Vietnamese \par Wa \par Wagdi \par West-Cree \par Welsh \par Wolof \par Tai Lue \par Xhosa \par Yakut \par Yoruba \par Y-Cree \par Yi Classic \par Yi Modern \par Chinese Hong Kong \par Chinese Phonetic \par Chinese Simplified \par Chinese Traditional \par Zande \par Zulu
+  \end{multicols}
+  \hspace{4pt}
+  \hrule
+ \end{minipage}
+\end{table}
+
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-patches.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-patches.aux
new file mode 100644
index 00000000000..0781fadf43a
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-patches.aux
@@ -0,0 +1,40 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{VIII\hspace  {1em}The `improvement' of \LaTeXe  \ and other packages}{55}{part.8}}
+\newlabel{sec:patching}{{VIII}{55}{The `improvement' of \LaTeXe \ and other packages}{part.8}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {20}Verbatim}{55}{section.20}}
+\newlabel{sec:verb}{{Section\nobreakspace  {}20}{55}{Verbatim}{section.20}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {21}Discretionary hyphenation: \cs  {\char 45\relax }}{55}{section.21}}
+\newlabel{sec:hyphen}{{Section\nobreakspace  {}21}{55}{Discretionary hyphenation: \cmd \-}{section.21}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {22}Commands for old-style and lining numbers}{55}{section.22}}
+\@setckpt{fontspec-doc-patches}{
+\setcounter{page}{56}
+\setcounter{equation}{0}
+\setcounter{enumi}{2}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{12}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{8}
+\setcounter{section}{22}
+\setcounter{subsection}{0}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{1}
+\setcounter{table}{16}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{4}
+\setcounter{vrcnt}{32}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{12}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{72}
+\setcounter{example}{39}
+\setcounter{argument}{0}
+\setcounter{section@level}{1}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.aux
new file mode 100644
index 00000000000..4aecd1cdc0b
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.aux
@@ -0,0 +1,81 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\@writefile{toc}{\contentsline {part}{VII\hspace  {1em}Fonts and features with \hologoRobust {XeTeX}}{59}{part.7}}
+\newlabel{sec:xetex-features}{{VII}{59}{Fonts and features with \XeTeX }{part.7}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {21}\hologoRobust {XeTeX}-only font features}{59}{section.21}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {21.1}Mapping}{59}{subsection.21.1}}
+\newlabel{sec:mapping}{{Section\nobreakspace  {}21.1}{59}{Mapping}{subsection.21.1}{}}
+\newlabel{ex:mapping}{{41}{59}{Mapping}{example.41}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {21.2}Different font technologies: \textsc  {aat}\ and OpenType}{59}{subsection.21.2}}
+\newlabel{sec:renderer}{{Section\nobreakspace  {}21.2}{59}{Different font technologies: \AAT \ and OpenType}{subsection.21.2}{}}
+\newlabel{33@xvr}{{}{59}{Different font technologies: \AAT \ and OpenType}{subsection.21.2}{}}
+\newlabel{33@vr}{{}{59}{Different font technologies: \AAT \ and OpenType}{subsection.21.2}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {21.3}Optical font sizes}{59}{subsection.21.3}}
+\newlabel{sec:aat-opticalsize}{{Section\nobreakspace  {}21.3}{59}{Optical font sizes}{subsection.21.3}{}}
+\newlabel{34@xvr}{{}{59}{Optical font sizes}{subsection.21.3}{}}
+\newlabel{34@vr}{{}{59}{Optical font sizes}{subsection.21.3}{}}
+\@writefile{toc}{\contentsline {section}{\numberline {22}Mac\nobreakspace  {}OS\nobreakspace  {}X's \textsc  {aat}\ fonts}{60}{section.22}}
+\newlabel{sec:aat-features}{{Section\nobreakspace  {}22}{60}{\MacOSX 's \AAT \ fonts}{section.22}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.1}Ligatures}{60}{subsection.22.1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.2}Letters}{60}{subsection.22.2}}
+\newlabel{sec:aat-letters}{{Section\nobreakspace  {}22.2}{60}{Letters}{subsection.22.2}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.3}Numbers}{60}{subsection.22.3}}
+\newlabel{35@xvr}{{}{61}{Numbers}{subsection.22.3}{}}
+\newlabel{35@vr}{{}{61}{Numbers}{subsection.22.3}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.4}Contextuals}{61}{subsection.22.4}}
+\newlabel{sec:contextuals}{{Section\nobreakspace  {}22.4}{61}{Contextuals}{subsection.22.4}{}}
+\newlabel{ex:wordcx}{{42}{61}{Contextuals}{example.42}{}}
+\newlabel{ex:longsaat}{{43}{61}{Contextuals}{example.43}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.5}Vertical position}{61}{subsection.22.5}}
+\newlabel{ex:aat-supp}{{44}{61}{Vertical position}{example.44}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.6}Fractions}{61}{subsection.22.6}}
+\newlabel{ex:aat-frac}{{45}{61}{Fractions}{example.45}{}}
+\newlabel{ex:frac-alt}{{46}{61}{Fractions}{example.46}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.7}Variants}{61}{subsection.22.7}}
+\newlabel{ex:aat-var}{{47}{61}{Variants}{example.47}{}}
+\newlabel{36@xvr}{{}{63}{Variants}{figure.caption.70}{}}
+\newlabel{36@vr}{{}{63}{Variants}{figure.caption.70}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.8}Alternates}{63}{subsection.22.8}}
+\newlabel{37@xvr}{{}{63}{Alternates}{subsection.22.8}{}}
+\newlabel{37@vr}{{}{63}{Alternates}{subsection.22.8}{}}
+\newlabel{ex:aat-alt}{{48}{63}{Alternates}{example.48}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.9}Style}{63}{subsection.22.9}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.10}CJK shape}{63}{subsection.22.10}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.11}Character width}{64}{subsection.22.11}}
+\newlabel{38@xvr}{{}{64}{Character width}{subsection.22.11}{}}
+\newlabel{38@vr}{{}{64}{Character width}{subsection.22.11}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.12}Vertical typesetting}{64}{subsection.22.12}}
+\newlabel{ex:vert}{{49}{64}{Vertical typesetting}{example.49}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.13}Diacritics}{64}{subsection.22.13}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {22.14}Annotation}{64}{subsection.22.14}}
+\@setckpt{fontspec-doc-xetex}{
+\setcounter{page}{65}
+\setcounter{equation}{0}
+\setcounter{enumi}{3}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{13}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{7}
+\setcounter{section}{22}
+\setcounter{subsection}{14}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{1}
+\setcounter{table}{17}
+\setcounter{StandardModuleDepth}{1}
+\setcounter{ContinuedFloat}{0}
+\setcounter{FancyVerbLine}{6}
+\setcounter{vrcnt}{38}
+\setcounter{lofdepth}{1}
+\setcounter{lotdepth}{1}
+\setcounter{Item}{5}
+\setcounter{Hfootnote}{13}
+\setcounter{Hy@AnnotLevel}{0}
+\setcounter{bookmark@seq@number}{83}
+\setcounter{example}{49}
+\setcounter{argument}{0}
+\setcounter{section@level}{2}
+}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex
new file mode 100644
index 00000000000..c4684d8c915
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc-xetex.tex
@@ -0,0 +1,334 @@
+
+
+\part{Fonts and features with \XeTeX}
+\label{sec:xetex-features}
+
+\section{\XeTeX-only font features}
+
+The features described here are available for any font
+selected by \pkg{fontspec}.
+
+\subsection{Mapping}
+\label{sec:mapping}
+
+\feat{Mapping} enables a \XeTeX\ text-mapping scheme, shown in \exref{mapping}.
+
+\begin{Xexample}{mapping}{\XeTeX's \feat{Mapping} feature.}
+  \fontspec{Cochin}[Mapping=tex-text]
+  ``!`A small amount of---text!''
+\end{Xexample}
+
+Using the |tex-text| mapping is also equivalent to writing |Ligatures=TeX|.
+The use of the latter syntax is recommended for better compatibility with
+\LuaTeX\ documents.
+
+
+\subsection{Different font technologies: \AAT\ and OpenType}\label{sec:renderer}
+
+\XeTeX\ supports two rendering technologies for typesetting, selected with
+the \feat{Renderer} font feature. The first, \opt{AAT}, is
+that provided (only) by \MacOSX\ itself. The second, \opt{OpenType},
+is an open source OpenType interpreter.
+\note{v2.4: This was called `\texttt{ICU}' in previous versions of \XeTeX\ and \pkg{fontspec}.
+Backwards compatibility is preserved.}
+It provides greater support for
+OpenType features, notably contextual arrangement, over \opt{AAT}.
+
+In general, this feature will not need to be explicitly called: for OpenType
+fonts, the \opt{OpenType} renderer is used automatically, and for \AAT\ fonts,
+\opt{AAT} is chosen by default. Some fonts, however, will contain font tables
+for \emph{both} rendering technologies, such as the Hiragino Japanese fonts
+distributed with \MacOSX, and in these cases the choice may be required.
+
+Among some other font features only available through a specific renderer,
+\opt{OpenType} provides for the \feat{Script} and \feat{Language} features, which allow
+different font behaviour for different alphabets and languages; see \vref{sec:ot}
+for the description of these features. {\em Because these font features can
+change which features are able to be selected for the font instance, they are selected
+by \pkg{fontspec} before all others and will automatically and without warning
+select the \opt{OpenType} renderer.}
+
+
+\subsection{Optical font sizes} \label{sec:aat-opticalsize}
+
+Multiple Master fonts are parameterised over
+orthogonal font axes, allowing continuous selection along such
+features as weight, width, and optical size~(see \vref{sec:mm} for
+further details). Whereas an OpenType font will have only a few separate
+optical sizes, a Multiple Master font's optical size can be
+specified over a continuous range. Unfortunately, this flexibility makes
+it harder to create an automatic interface through \LaTeX, and the
+optical size for a Multiple Master font must always be specified
+explicitly.
+\begin{Verbatim}
+  \fontspec{Minion MM Roman}[OpticalSize=11]
+   MM optical size test                    \\
+  \fontspec{Minion MM Roman}[OpticalSize=47]
+   MM optical size test                    \\
+  \fontspec{Minion MM Roman}[OpticalSize=71]
+   MM optical size test                    \\
+\end{Verbatim}
+
+
+
+
+\section{\MacOSX's \AAT\ fonts}
+\label{sec:aat-features}
+
+\begin{quote}\itshape
+\textbf{Warning!}
+\XeTeX's implementation on \MacOSX\ is currently in a state of flux and the information contained below may well be wrong from 2013 onwards.
+There is a good chance that the features described in this section will not be available any more as \XeTeX's completes its transition to a cross-platform--only application.
+\end{quote}
+
+\MacOSX's font technology began life before the ubiquitous-OpenType era
+and revolved around the Apple-invented `\AAT' font format. This format
+had some advantages (and other disadvantages) but it never became widely
+popular in the font world.
+
+Nonetheless, this is the font format that was first supported by \XeTeX\
+(due to its pedigree on \MacOSX\ in the first place) and was the first
+font format supported by \pkg{fontspec}. A number of fonts distributed with
+\MacOSX\ are still in the \AAT\ format, such as `Skia'.
+
+\subsection{Ligatures}
+
+\feat{Ligatures} refer to the replacement of two separate characters
+with a specially drawn glyph for functional or \ae sthetic reasons.
+For \AAT\ fonts, you may choose from any combination of \opt{Required},
+\opt{Common}, \opt{Rare} (or \opt{Discretionary}), \opt{Logos}, \opt{Rebus},
+\opt{Diphthong}, \opt{Squared}, \opt{AbbrevSquared}, and \opt{Icelandic}.
+
+Some other Apple \AAT\ fonts have those `Rare' ligatures contained in
+the \opt{Icelandic} feature. Notice also that the old \TeX\ trick of
+splitting up a ligature with an empty brace pair does not work in
+\XeTeX; you must use a 0\,pt kern or \cs{hbox} (\eg, \cs{null}) to
+split the characters up if you do not want a ligature to be performed (the usual examples for when this might be desired are words like `shelf\null full').
+
+\subsection{Letters} \label{sec:aat-letters}
+The \opt{Letters} feature specifies how the letters in the current font
+will look. For \AAT\ fonts, you may choose from \opt{Normal},
+\opt{Uppercase}, \opt{Lowercase}, \opt{SmallCaps}, and
+\opt{InitialCaps}.
+
+
+\subsection{Numbers}
+The \feat{Numbers} feature defines how numbers will look in the
+selected font. For \AAT\ fonts, they may be a
+combination of \opt{Lining} or \opt{OldStyle} and \opt{Proportional} or
+\opt{Monospaced} (the latter is good for tabular material). The synonyms
+\opt{Uppercase} and \opt{Lowercase} are equivalent to \opt{Lining} and
+\opt{OldStyle}, respectively. The differences have been shown previously
+in \vref{sec:addfontfeatures}.
+
+\subsection{Contextuals} \label{sec:contextuals}
+This feature refers to glyph substitution that vary by their position;
+things like contextual swashes are implemented here.
+The options for \AAT\ fonts are
+\opt{WordInitial}, \opt{WordFinal} (\exref{wordcx}), \opt{LineInitial},
+\opt{LineFinal}, and \opt{Inner} (\exref{longsaat}, also called `non-final' sometimes). As
+non-exclusive selectors, like the ligatures, you can turn them off
+by prefixing their name with \opt{No}.
+
+\begin{Xexample}{wordcx}{Contextual glyph for the beginnings and ends of words.}
+  \newfontface\fancy{Hoefler Text Italic}[%
+    Contextuals={WordInitial,WordFinal}]
+  \fancy where is all the vegemite
+\end{Xexample}
+
+\begin{Xexample}{longsaat}{A contextual feature for the `long s' can be convenient as the character does not need to be marked up explicitly.}
+  \fontspec{Hoefler Text}[Contextuals=Inner]
+  `Inner' swashes can \emph{sometimes}    \\
+   contain the archaic long~s.
+\end{Xexample}
+
+
+
+\subsection{Vertical position}
+The \feat{VerticalPosition} feature is used to access things like
+subscript (\opt{Inferior}) and superscript (\opt{Superior}) numbers and
+letters (and a small amount of punctuation, sometimes).
+The \opt{Ordinal} option is (supposed to be)
+contextually sensitive to only raise characters that appear directly
+after a number.
+These are shown in \exref{aat-supp}.
+
+\begin{Xexample}{aat-supp}{Vertical position for AAT fonts.}
+  \fontspec{Skia}
+   Normal
+  \fontspec{Skia}[VerticalPosition=Superior]
+   Superior
+  \fontspec{Skia}[VerticalPosition=Inferior]
+   Inferior                \\
+  \fontspec{Skia}[VerticalPosition=Ordinal]
+   1st 2nd 3rd 4th 0th 8abcde
+\end{Xexample}
+
+The \pkg{realscripts} package
+(also loaded by \pkg{xltxtra})
+redefines the \cmd\textsubscript\ and
+\cmd\textsuperscript\ commands to use the above font features,
+including for use in footnote labels.
+
+\subsection{Fractions}
+Many fonts come with the capability to typeset various forms of
+fractional material. This is accessed in \pkg{fontspec} with the
+\feat{Fractions} feature, which may be turned \opt{On} or \opt{Off}
+in both \AAT\ and OpenType fonts.
+
+In \AAT\ fonts, the `fraction slash' or solidus character, is
+to be used to create fractions. When \feat{Fractions} are turned
+\opt{On}, then only pre-drawn fractions will be used.
+See \exref{aat-frac}.
+
+Using the \opt{Diagonal} option (\AAT\ only), the font will attempt
+to create the fraction from superscript and subscript
+characters.
+
+\edef\caretcc{\the\catcode`\^}
+\catcode`\^=12\relax
+\begin{Xexample}{aat-frac}{Fractions in AAT fonts. The \texttt{\relax^^^^2044} glyph is the `fraction slash' that may be typed in \MacOSX\ with \textsc{opt+shift+1}; not shown literally here due to font contraints.}
+  \fontspec[Fractions=On]{Skia}
+   1{^^^^2044}2 \quad 5{^^^^2044}6 \\ % fraction slash
+   1/2 \quad 5/6    % regular  slash
+
+  \fontspec[Fractions=Diagonal]{Skia}
+         13579{^^^^2044}24680 \\ % fraction slash
+   \quad 13579/24680    % regular  slash
+\end{Xexample}
+\catcode`\^=\caretcc\relax
+
+Some (Asian fonts predominantly) also provide for the
+\opt{Alternate} feature shown in \exref{frac-alt}.
+
+\begin{Xexample}{frac-alt}{Alternate design of pre-composed fractions.}
+  \fontspec{Hiragino Maru Gothic Pro}
+   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
+  \addfontfeature{Fractions=Alternate}
+   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680
+\end{Xexample}
+
+
+\subsection{Variants}
+The \feat{Variant} feature takes a single numerical input for
+choosing different alphabetic shapes. Don't mind my fancy \exref{aat-var}
+\texttt{:)} I'm just looping through the nine~(\,!\,) variants of
+Zapfino.
+
+\begin{Xexample}[firstline=2,lastline=9]{aat-var}{Nine variants of Zapfino.}
+  \Huge \rule{0pt}{2cm}
+  \newcounter{var}
+  \whiledo{\value{var}<9}{%
+    \edef\1{%
+    \noexpand\fontspec[Variant=\thevar,
+      Color=0099\thevar\thevar]{Zapfino}}\1%
+    \makebox[0.75\width]{d}%
+    \stepcounter{var}}
+  \hspace*{2cm}
+\end{Xexample}
+
+See \vref{sec:newfeatures} for a way to assign names to variants,
+which should be done on a per-font basis.
+
+\subsection{Alternates}
+
+Selection of \feat{Alternate}s \emph{again}
+must be done numerically; see \exref{aat-alt}.
+See \vref{sec:newfeatures} for a way to assign names to alternates,
+which should be done on a per-font basis.
+
+\begin{Xexample}{aat-alt}{Alternate shape selection must be numerical.}
+  \fontspec{Hoefler Text Italic}[Alternate=0]
+   Sphinx Of Black Quartz, {\scshape Judge My Vow} \\
+  \fontspec{Hoefler Text Italic}[Alternate=1]
+   Sphinx Of Black Quartz, {\scshape Judge My Vow}
+\end{Xexample}
+
+
+\subsection{Style}
+
+The options of the \feat{Style} feature
+are defined in \AAT\ as one of the following: \opt{Display},
+\opt{Engraved}, \opt{IlluminatedCaps}, \opt{Italic},
+\opt{Ruby},\footnotemark\ \opt{TallCaps}, or \opt{TitlingCaps}.
+\footnotetext{`Ruby' refers to a small optical size, used in
+Japanese typography for annotations.}
+
+Typical examples for these features are shown in \ref{sec:ot-feat-style}.
+
+
+
+
+
+
+\subsection{CJK shape}
+There have been many standards for how CJK ideographic
+glyphs are `supposed' to look. Some fonts will contain many alternate
+glyphs in order to be able to display these gylphs
+correctly in whichever form is appropriate. Both \AAT\ and OpenType
+fonts support the following \feat{CJKShape} options:
+\opt{Traditional}, \opt{Simplified}, \opt{JIS1978}, \opt{JIS1983},
+\opt{JIS1990}, and \opt{Expert}. OpenType also supports the \opt{NLC} option.
+
+\subsection{Character width}
+See \vref{sec:CharacterWidth} for relevant examples; the features are
+the same between OpenType and \AAT\ fonts.
+\AAT\ also allows \feat{CharacterWidth}|=|\opt{Default} to return to
+the original font settings.
+
+
+
+
+
+
+
+\subsection{Vertical typesetting}
+
+\XeTeX\ provides for vertical typesetting simply with the ability to rotate
+the individual glyphs as a font is used for typesetting, as shown in
+\exref{vert}.
+
+\begin{Xexample}[firstline=2]{vert}{Vertical typesetting.}
+  \def\verttext{共産主義者は}
+  \fontspec{Hiragino Mincho Pro}
+  \verttext
+
+  \fontspec{Hiragino Mincho Pro}[Renderer=AAT,Vertical=RotatedGlyphs]
+  \rotatebox{-90}{\verttext}% requires the graphicx package
+\end{Xexample}
+
+No actual provision is made for typesetting top-to-bottom
+languages; for an example of how to do this, see the vertical Chinese
+example provided in the \XeTeX\ documentation.
+
+
+
+
+\subsection{Diacritics}
+Diacritics are marks, such as the acute accent or the tilde, applied to letters; they usually indicate a change in pronunciation.
+In Arabic scripts, diacritics are used to indicate vowels.
+You may either choose
+to \opt{Show}, \opt{Hide} or \opt{Decompose} them in \AAT\ fonts.
+The \opt{Hide} option is for scripts such as Arabic which may be
+displayed either with or without vowel markings. E.g.,
+\verb|\fontspec[Diacritics=Hide]{...}|
+
+Some older fonts distributed with \MacOSX\ included `|O/|' \etc\ as shorthand for writing `\O' under the label of the \feat{Diacritics} feature. If you come across such fonts, you'll
+want to turn this feature off (imagine typing |hello/goodbye| and
+getting `hell\o goodbye' instead!) by decomposing the two characters
+in the diacritic into the ones you actually
+want. I recommend using
+the proper \LaTeX\ input conventions for obtaining such characters
+instead.
+
+
+
+\subsection{Annotation}
+Various Asian fonts are equipped with a more extensive range of
+numbers and numerals in different forms. These are accessed through
+the \feat{Annotation} feature with the following
+options: \opt{Off},
+\opt{Box}, \opt{RoundedBox}, \opt{Circle}, \opt{BlackCircle},
+\opt{Parenthesis}, \opt{Period}, \opt{RomanNumerals}, \opt{Diamond},
+\opt{BlackSquare}, \opt{BlackRoundSquare}, and \opt{DoubleCircle}.
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.aux b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.aux
new file mode 100644
index 00000000000..31f917078a2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.aux
@@ -0,0 +1,27 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\providecommand\HyperFirstAtBeginDocument{\AtBeginDocument}
+\HyperFirstAtBeginDocument{\ifx\hyper@anchor\@undefined
+\global\let\oldcontentsline\contentsline
+\gdef\contentsline#1#2#3#4{\oldcontentsline{#1}{#2}{#3}}
+\global\let\oldnewlabel\newlabel
+\gdef\newlabel#1#2{\newlabelxx{#1}#2}
+\gdef\newlabelxx#1#2#3#4#5#6{\oldnewlabel{#1}{{#2}{#3}}}
+\AtEndDocument{\ifx\hyper@anchor\@undefined
+\let\contentsline\oldcontentsline
+\let\newlabel\oldnewlabel
+\fi}
+\fi}
+\global\let\hyper@last\relax 
+\gdef\HyperFirstAtBeginDocument#1{#1}
+\providecommand*\HyPL@Entry[1]{}
+\HyPL@Entry{0<</S/D>>}
+\@input{fontspec-doc-intro.aux}
+\@input{fontspec-doc-fontsel.aux}
+\@input{fontspec-doc-featsel.aux}
+\@input{fontspec-doc-opentype.aux}
+\@input{fontspec-doc-enc.aux}
+\@input{fontspec-doc-luatex.aux}
+\@input{fontspec-doc-xetex.aux}
+\@input{fontspec-doc-api.aux}
+\@input{fontspec-doc-patches.aux}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.glo b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.glo
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.glo
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.idx b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.idx
new file mode 100644
index 00000000000..ef486cdbd00
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.idx
@@ -0,0 +1,28 @@
+\indexentry{newfontfamily=\verb!*+\newfontfamily+|usage|hyperpage}{10}
+\indexentry{newfontface=\verb!*+\newfontface+|usage|hyperpage}{10}
+\indexentry{newAATfeature=\verb!*+\newAATfeature+|usage|hyperpage}{49}
+\indexentry{newopentypefeature=\verb!*+\newopentypefeature+|usage|hyperpage}{49}
+\indexentry{newfontfeature=\verb!*+\newfontfeature+|usage|hyperpage}{49}
+\indexentry{newfontscript=\verb!*+\newfontscript+|usage|hyperpage}{50}
+\indexentry{newfontlanguage=\verb!*+\newfontlanguage+|usage|hyperpage}{50}
+\indexentry{aliasfontfeature=\verb!*+\aliasfontfeature+|usage|hyperpage}{50}
+\indexentry{aliasfontfeatureoption=\verb!*+\aliasfontfeatureoption+|usage|hyperpage}{50}
+\indexentry{fontspec_set_family:Nnn=\verb!*+\fontspec_set_family:Nnn+|main}{1}
+\indexentry{l_fontspec_family_tl=\verb!*+\l_fontspec_family_tl+|usage|hyperpage}{51}
+\indexentry{l_fontspec_font=\verb!*+\l_fontspec_font+|usage|hyperpage}{51}
+\indexentry{g_fontspec_encoding_tl=\verb!*+\g_fontspec_encoding_tl+|usage|hyperpage}{51}
+\indexentry{fontspec_set_fontface:NNnn=\verb!*+\fontspec_set_fontface:NNnn+|main}{1}
+\indexentry{fontspec_font_if_exist:nTF=\verb!*+\fontspec_font_if_exist:nTF+|main}{1}
+\indexentry{fontspec_if_fontspec_font:TF=\verb!*+\fontspec_if_fontspec_font:TF+|main}{1}
+\indexentry{fontspec_if_opentype:TF=\verb!*+\fontspec_if_opentype:TF+|main}{1}
+\indexentry{fontspec_if_aat_feature:nnTF=\verb!*+\fontspec_if_aat_feature:nnTF+|main}{1}
+\indexentry{fontspec_if_feature:nTF=\verb!*+\fontspec_if_feature:nTF+|main}{1}
+\indexentry{fontspec_if_feature:nnnTF=\verb!*+\fontspec_if_feature:nnnTF+|main}{1}
+\indexentry{fontspec_if_script:nTF=\verb!*+\fontspec_if_script:nTF+|main}{1}
+\indexentry{fontspec_if_language:nTF=\verb!*+\fontspec_if_language:nTF+|main}{1}
+\indexentry{fontspec_if_language:nnTF=\verb!*+\fontspec_if_language:nnTF+|main}{1}
+\indexentry{fontspec_if_current_feature:nTF=\verb!*+\fontspec_if_current_feature:nTF+|main}{1}
+\indexentry{fontspec_if_current_script:nTF=\verb!*+\fontspec_if_current_script:nTF+|main}{1}
+\indexentry{fontspec_if_current_language:nTF=\verb!*+\fontspec_if_current_language:nTF+|main}{1}
+\indexentry{oldstylenums=\verb!*+\oldstylenums+|usage|hyperpage}{54}
+\indexentry{liningnums=\verb!*+\liningnums+|usage|hyperpage}{54}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.log b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.log
new file mode 100644
index 00000000000..fc1a26ec151
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.log
@@ -0,0 +1,3750 @@
+This is XeTeX, Version 3.14159265-2.6-0.99996 (TeX Live 2016) (preloaded format=xelatex 2016.5.14)  18 JAN 2017 22:27
+entering extended mode
+ \write18 enabled.
+ file:line:error style messages enabled.
+ %&-line parsing enabled.
+**fontspec-doc.tex
+(./fontspec-doc.tex
+LaTeX2e <2016/03/31>
+Babel <3.9r> and hyphenation patterns for 81 language(s) loaded.
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/ltxdoc.cls
+Document Class: ltxdoc 2015/03/26 v2.0w Standard LaTeX documentation class
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/article.cls
+Document Class: article 2014/09/29 v1.4h Standard LaTeX document class
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/size10.clo
+File: size10.clo 2014/09/29 v1.4h Standard LaTeX file (size option)
+)
+\c@part=\count79
+\c@section=\count80
+\c@subsection=\count81
+\c@subsubsection=\count82
+\c@paragraph=\count83
+\c@subparagraph=\count84
+\c@figure=\count85
+\c@table=\count86
+\abovecaptionskip=\skip41
+\belowcaptionskip=\skip42
+\bibindent=\dimen102
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/doc.sty
+Package: doc 2016/02/15 v2.1g Standard LaTeX documentation package (FMi)
+\c@StandardModuleDepth=\count87
+\guard@level=\count88
+\MacrocodeTopsep=\skip43
+\MacroIndent=\dimen103
+\macro@cnt=\count89
+\MacroTopsep=\skip44
+\index@excludelist=\toks14
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tools/multicol.sty
+Package: multicol 2016/02/08 v1.8o multicolumn formatting (FMi)
+\c@tracingmulticols=\count90
+\mult@box=\box26
+\multicol@leftmargin=\dimen104
+\c@unbalance=\count91
+\c@collectmore=\count92
+\doublecol@number=\count93
+\multicoltolerance=\count94
+\multicolpretolerance=\count95
+\full@width=\dimen105
+\page@free=\dimen106
+\premulticols=\dimen107
+\postmulticols=\dimen108
+\multicolsep=\skip45
+\multicolbaselineskip=\skip46
+\partial@page=\box27
+\last@line=\box28
+\maxbalancingoverflow=\dimen109
+\mult@rightbox=\box29
+\mult@grightbox=\box30
+\mult@gfirstbox=\box31
+\mult@firstbox=\box32
+\@tempa=\box33
+\@tempa=\box34
+\@tempa=\box35
+\@tempa=\box36
+\@tempa=\box37
+\@tempa=\box38
+\@tempa=\box39
+\@tempa=\box40
+\@tempa=\box41
+\@tempa=\box42
+\@tempa=\box43
+\@tempa=\box44
+\@tempa=\box45
+\@tempa=\box46
+\@tempa=\box47
+\@tempa=\box48
+\@tempa=\box49
+\c@columnbadness=\count96
+\c@finalcolumnbadness=\count97
+\last@try=\dimen110
+\multicolovershoot=\dimen111
+\multicolundershoot=\dimen112
+\mult@nat@firstbox=\box50
+\colbreak@box=\box51
+\mc@col@check@num=\count98
+)
+\IndexMin=\dimen113
+\c@IndexColumns=\count99
+\GlossaryMin=\dimen114
+\c@GlossaryColumns=\count100
+\check@sum=\count101
+\bslash@cnt=\count102
+\wrong@table=\toks15
+\c@CodelineNo=\count103
+))
+(./fontspec-doc-style.sty
+Package: fontspec-doc-style 
+ (./fontspec.sty
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3kernel/expl3.sty
+Package: expl3 2016/11/21 v6760 L3 programming layer (loader) 
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+Package: expl3 2016/11/21 v6760 L3 programming layer (code)
+L3 Module: l3bootstrap 2016/06/13 v6596 L3 Bootstrap code
+L3 Module: l3names 2016/10/13 v6722 L3 Namespace for primitives
+L3 Module: l3basics 2016/09/01 v6696 L3 Basic definitions
+L3 Module: l3expan 2016/08/19 v6684 L3 Argument expansion
+L3 Module: l3tl 2016/08/19 v6692 L3 Token lists
+L3 Module: l3str 2016/08/19 v6692 L3 Strings
+L3 Module: l3seq 2016/08/19 v6685 L3 Sequences and stacks
+L3 Module: l3int 2016/09/07 v6700 L3 Integers
+\c_max_int=\count104
+\l_tmpa_int=\count105
+\l_tmpb_int=\count106
+\g_tmpa_int=\count107
+\g_tmpb_int=\count108
+L3 Module: l3quark 2016/08/19 v6685 L3 Quarks
+L3 Module: l3prg 2016/08/18 v6679 L3 Control structures
+\g__prg_map_int=\count109
+L3 Module: l3clist 2016/08/19 v6685 L3 Comma separated lists
+L3 Module: l3token 2016/09/01 v6695 L3 Experimental token manipulation
+L3 Module: l3prop 2016/08/19 v6685 L3 Property lists
+L3 Module: l3msg 2016/08/19 v6691 L3 Messages
+L3 Module: l3file 2016/08/19 v6685 L3 File and I/O operations
+\l_iow_line_count_int=\count110
+\l__iow_target_count_int=\count111
+\l__iow_current_line_int=\count112
+\l__iow_current_word_int=\count113
+\l__iow_current_indentation_int=\count114
+L3 Module: l3skip 2016/08/19 v6692 L3 Dimensions and skips
+\c_zero_dim=\dimen115
+\c_max_dim=\dimen116
+\l_tmpa_dim=\dimen117
+\l_tmpb_dim=\dimen118
+\g_tmpa_dim=\dimen119
+\g_tmpb_dim=\dimen120
+\c_zero_skip=\skip47
+\c_max_skip=\skip48
+\l_tmpa_skip=\skip49
+\l_tmpb_skip=\skip50
+\g_tmpa_skip=\skip51
+\g_tmpb_skip=\skip52
+\c_zero_muskip=\muskip10
+\c_max_muskip=\muskip11
+\l_tmpa_muskip=\muskip12
+\l_tmpb_muskip=\muskip13
+\g_tmpa_muskip=\muskip14
+\g_tmpb_muskip=\muskip15
+L3 Module: l3keys 2016/09/21 v6711 L3 Key-value interfaces
+\l_keys_choice_int=\count115
+L3 Module: l3fp 2016/11/21 v6761 L3 Floating points
+\c__fp_leading_shift_int=\count116
+\c__fp_middle_shift_int=\count117
+\c__fp_trailing_shift_int=\count118
+\c__fp_big_leading_shift_int=\count119
+\c__fp_big_middle_shift_int=\count120
+\c__fp_big_trailing_shift_int=\count121
+\c__fp_Bigg_leading_shift_int=\count122
+\c__fp_Bigg_middle_shift_int=\count123
+\c__fp_Bigg_trailing_shift_int=\count124
+L3 Module: l3box 2016/08/19 v6685 L3 Experimental boxes
+\c_empty_box=\box52
+\l_tmpa_box=\box53
+\l_tmpb_box=\box54
+\g_tmpa_box=\box55
+\g_tmpb_box=\box56
+L3 Module: l3coffins 2016/08/19 v6685 L3 Coffin code layer
+\l__coffin_internal_box=\box57
+\l__coffin_internal_dim=\dimen121
+\l__coffin_offset_x_dim=\dimen122
+\l__coffin_offset_y_dim=\dimen123
+\l__coffin_x_dim=\dimen124
+\l__coffin_y_dim=\dimen125
+\l__coffin_x_prime_dim=\dimen126
+\l__coffin_y_prime_dim=\dimen127
+\c_empty_coffin=\box58
+\l__coffin_aligned_coffin=\box59
+\l__coffin_aligned_internal_coffin=\box60
+\l_tmpa_coffin=\box61
+\l_tmpb_coffin=\box62
+\l__coffin_display_coffin=\box63
+\l__coffin_display_coord_coffin=\box64
+\l__coffin_display_pole_coffin=\box65
+\l__coffin_display_offset_dim=\dimen128
+\l__coffin_display_x_dim=\dimen129
+\l__coffin_display_y_dim=\dimen130
+L3 Module: l3color 2016/06/13 v6596 L3 Experimental color support
+L3 Module: l3sys 2015/09/25 v6087 L3 Experimental system/runtime functions
+L3 Module: l3candidates 2016/08/19 v6688 L3 Experimental additions to l3kernel
+\l__box_top_dim=\dimen131
+\l__box_bottom_dim=\dimen132
+\l__box_left_dim=\dimen133
+\l__box_right_dim=\dimen134
+\l__box_top_new_dim=\dimen135
+\l__box_bottom_new_dim=\dimen136
+\l__box_left_new_dim=\dimen137
+\l__box_right_new_dim=\dimen138
+\l__box_internal_box=\box66
+\l__coffin_bounding_shift_dim=\dimen139
+\l__coffin_left_corner_dim=\dimen140
+\l__coffin_right_corner_dim=\dimen141
+\l__coffin_bottom_corner_dim=\dimen142
+\l__coffin_top_corner_dim=\dimen143
+\l__coffin_scaled_total_height_dim=\dimen144
+\l__coffin_scaled_width_dim=\dimen145
+L3 Module: l3luatex 2016/08/18 v6679 L3 Experimental LuaTeX-specific functions
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def
+File: l3xdvidpfmx.def 2016/08/18 v6679 L3 Experimental driver: xdvipdfmx
+\l__driver_tmp_box=\box67
+))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+Package: xparse 2016/11/21 v6760 L3 Experimental document command parser
+\l__xparse_current_arg_int=\count125
+\l__xparse_m_args_int=\count126
+\l__xparse_mandatory_args_int=\count127
+\l__xparse_processor_int=\count128
+\l__xparse_v_nesting_int=\count129
+)
+Package: fontspec 2017/01/02 v2.5c Font selection for XeLaTeX and LuaLaTeX
+
+(./fontspec-xetex.sty
+Package: fontspec-xetex 2017/01/02 v2.5c Font selection for XeLaTeX and LuaLaTe
+X
+\l__fontspec_script_int=\count130
+\l__fontspec_language_int=\count131
+\l__fontspec_strnum_int=\count132
+\l__fontspec_tmp_int=\count133
+\l__fontspec_em_int=\count134
+\l__fontspec_emdef_int=\count135
+\l__fontspec_tmpa_dim=\dimen146
+\l__fontspec_tmpb_dim=\dimen147
+\l__fontspec_tmpc_dim=\dimen148
+\g__file_internal_ior=\read1
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/fontenc.sty
+Package: fontenc 2005/09/27 v1.99g Standard LaTeX package
+ (./tuenc.def
+File: tuenc.def 2016/12/11 v2.0a Standard LaTeX file
+)
+LaTeX Font Info:    Try loading font information for TU+cmr on input line 105.
+LaTeX Font Info:    No file TUcmr.fd. on input line 105.
+
+
+LaTeX Font Warning: Font shape `TU/cmr/m/n' undefined
+(Font)              using `TU/cmr/m/n' instead on input line 105.
+
+/usr/local/texlive/2016/texmf-dist/tex/latex/base/fontenc.sty:105: Corrupted NF
+SS tables.
+wrong@fontshape ...message {Corrupted NFSS tables}
+                                                  error@fontshape else let f...
+l.105 \fontencoding\encodingdefault\selectfont
+                                              
+? 
+
+LaTeX Font Warning: Font shape `TU/cmr/m/n' undefined
+(Font)              using `OT1/cmr/m/n' instead on input line 105.
+
+)
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \fontspec with sig. 'O{}mO{}' on line 434.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmainfont with sig. 'O{}mO{}' on line 450.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setsansfont with sig. 'O{}mO{}' on line 466.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmonofont with sig. 'O{}mO{}' on line 482.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmathrm with sig. 'O{}mO{}' on line 487.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setboldmathrm with sig. 'O{}mO{}' on line 492.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmathsf with sig. 'O{}mO{}' on line 497.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \setmathtt with sig. 'O{}mO{}' on line 502.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontfamily with sig. 'mO{}mO{}' on line 522.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontface with sig. 'mO{}mO{}' on line 526.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \defaultfontfeatures with sig. 't+om' on line 533.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \addfontfeatures with sig. 'm' on line 584.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontfeature with sig. 'mm' on line 595.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newAATfeature with sig. 'mmmm' on line 603.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newopentypefeature with sig. 'mmm' on line 611.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \aliasfontfeature with sig. 'mm' on line 632.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \aliasfontfeatureoption with sig. 'mmm' on line 649.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontscript with sig. 'mm' on line 653.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \newfontlanguage with sig. 'mm' on line 657.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \DeclareFontsExtensions with sig. 'm' on line 662.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \IfFontFeatureActiveTF with sig. 'mmm' on line 670.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \EncodingCommand with sig. 'mO{}m' on line 3329.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \DeclareUnicodeEncoding with sig. 'mm' on line 3371.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \ImportEncoding with sig. 'm' on line 3380.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \UndeclareSymbol with sig. 'm' on line 3384.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \UndeclareComposite with sig. 'mm' on line 3390.
+.................................................
+ (./fontspec.cfg)
+LaTeX Info: Redefining \itshape on input line 3571.
+LaTeX Info: Redefining \slshape on input line 3576.
+LaTeX Info: Redefining \scshape on input line 3581.
+LaTeX Info: Redefining \upshape on input line 3586.
+LaTeX Info: Redefining \em on input line 3606.
+LaTeX Info: Redefining \emph on input line 3623.
+LaTeX Font Info:    Try loading font information for TU+lmr on input line 3627.
+
+ (./tulmr.fd
+File: tulmr.fd 2009/10/30 v1.6 Font defs for Latin Modern
+)
+LaTeX Info: Redefining \- on input line 3630.
+.................................................
+. LaTeX info: "xparse/redefine-command"
+. 
+. Redefining command \oldstylenums with sig. 'm' on line 3725.
+.................................................
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \liningnums with sig. 'm' on line 3729.
+.................................................
+))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/booktabs/booktabs.sty
+Package: booktabs 2016/04/27 v1.618033 publication quality tables
+\heavyrulewidth=\dimen149
+\lightrulewidth=\dimen150
+\cmidrulewidth=\dimen151
+\belowrulesep=\dimen152
+\belowbottomsep=\dimen153
+\aboverulesep=\dimen154
+\abovetopsep=\dimen155
+\cmidrulesep=\dimen156
+\cmidrulekern=\dimen157
+\defaultaddspace=\dimen158
+\@cmidla=\count136
+\@cmidlb=\count137
+\@aboverulesep=\dimen159
+\@belowrulesep=\dimen160
+\@thisruleclass=\count138
+\@lastruleclass=\count139
+\@thisrulewidth=\dimen161
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tools/calc.sty
+Package: calc 2014/10/28 v4.3 Infix arithmetic (KKT,FJ)
+\calc@Acount=\count140
+\calc@Bcount=\count141
+\calc@Adimen=\dimen162
+\calc@Bdimen=\dimen163
+\calc@Askip=\skip53
+\calc@Bskip=\skip54
+LaTeX Info: Redefining \setlength on input line 80.
+LaTeX Info: Redefining \addtolength on input line 81.
+\calc@Ccount=\count142
+\calc@Cskip=\skip55
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/caption/caption.sty
+Package: caption 2016/02/21 v3.3-144 Customizing captions (AR)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/caption/caption3.sty
+Package: caption3 2016/02/04 v1.7-139 caption3 kernel (AR)
+Package caption3 Info: TeX engine: e-TeX on input line 67.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/keyval.sty
+Package: keyval 2014/10/28 v1.15 key=value parser (DPC)
+\KV@toks@=\toks16
+)
+\captionmargin=\dimen164
+\captionmargin@=\dimen165
+\captionwidth=\dimen166
+\caption@tempdima=\dimen167
+\caption@indent=\dimen168
+\caption@parindent=\dimen169
+\caption@hangindent=\dimen170
+)
+\c@ContinuedFloat=\count143
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/color.sty
+Package: color 2016/01/03 v1.1b Standard LaTeX Color (DPC)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics-cfg/color.cfg
+File: color.cfg 2016/01/02 v1.6 sample color configuration
+)
+Package color Info: Driver file: xetex.def on input line 143.
+
+(/usr/local/texlive/2016/texmf-dist/tex/xelatex/xetex-def/xetex.def
+File: xetex.def 2016/04/06 v4.08 LaTeX color/graphics driver for XeTeX (TeX Liv
+e/RRM/JK)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+Package: infwarerr 2010/04/08 v1.3 Providing info/warning/error messages (HO)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)
+)))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/enumitem/enumitem.sty
+Package: enumitem 2011/09/28 v3.5.2 Customized lists
+\labelindent=\skip56
+\enit@outerparindent=\dimen171
+\enit@toks=\toks17
+\enit@inbox=\box68
+\enitdp@description=\count144
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/fancyvrb/fancyvrb.sty
+Package: fancyvrb 2008/02/07
+
+Style option: `fancyvrb' v2.7a, with DG/SPQR fixes, and firstline=lastline fix 
+<2008/02/07> (tvz)
+\FV@CodeLineNo=\count145
+\FV@InFile=\read2
+\FV@TabBox=\box69
+\c@FancyVerbLine=\count146
+\FV@StepNumber=\count147
+\FV@OutFile=\write3
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/hologo.sty
+Package: hologo 2012/04/26 v1.10 A logo collection with bookmark support (HO)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/kvsetkeys.sty
+Package: kvsetkeys 2012/04/25 v1.16 Key value parser (HO)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/etexcmds.sty
+Package: etexcmds 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/ifluatex.sty
+Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)
+Package ifluatex Info: LuaTeX not detected.
+)
+Package etexcmds Info: Could not find \expanded.
+(etexcmds)             That can mean that you are not using pdfTeX 1.50 or
+(etexcmds)             that some package has redefined \expanded.
+(etexcmds)             In the latter case, load this package earlier.
+))
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/kvdefinekeys.sty
+Package: kvdefinekeys 2011/04/07 v1.3 Define keys (HO)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty
+Package: pdftexcmds 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO
+)
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/ifpdf/ifpdf.sty
+Package: ifpdf 2016/04/04 v3.0 Provides the ifpdf switch
+)
+Package pdftexcmds Info: LuaTeX not detected.
+Package pdftexcmds Info: pdfTeX >= 1.30 not detected.
+Package pdftexcmds Info: \pdf@primitive is available.
+Package pdftexcmds Info: \pdf@ifprimitive is available.
+Package pdftexcmds Info: \pdfdraftmode not found.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
+)
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+Package: ifvtex 2010/03/01 v1.5 Detect VTeX and its facilities (HO)
+Package ifvtex Info: VTeX not detected.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+Package: kvoptions 2011/06/30 v3.11 Key value format for package options (HO)
+)
+Package hologo Info: Using driver `xetex'.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/graphicx.sty
+Package: graphicx 2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/graphics.sty
+Package: graphics 2016/01/03 v1.0q Standard LaTeX Graphics (DPC,SPQR)
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics/trig.sty
+Package: trig 2016/01/03 v1.10 sin cos tan (DPC)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
+File: graphics.cfg 2016/01/02 v1.10 sample graphics configuration
+)
+Package graphics Info: Driver file: xetex.def on input line 95.
+)
+\Gin@req@height=\dimen172
+\Gin@req@width=\dimen173
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/base/ifthen.sty
+Package: ifthen 2014/09/29 v1.1c Standard LaTeX ifthen package (DPC)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/url/url.sty
+\Urlmuskip=\muskip16
+Package: url 2013/09/16  ver 3.4  Verb mode for urls, etc.
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tools/varioref.sty
+Package: varioref 2016/02/16 v1.5c package for extended references (FMi)
+\c@vrcnt=\count148
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/varwidth/varwidth.sty
+Package: varwidth 2009/03/30 ver 0.92;  Variable-width minipages
+\@vwid@box=\box70
+\sift@deathcycles=\count149
+\@vwid@loff=\dimen174
+\@vwid@roff=\dimen175
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/microtype.sty
+Package: microtype 2016/05/01 v2.6 Micro-typographical refinements (RS)
+\MT@toks=\toks18
+\MT@count=\count150
+LaTeX Info: Redefining \textls on input line 774.
+\MT@outer@kern=\dimen176
+LaTeX Info: Redefining \textmicrotypecontext on input line 1310.
+\MT@listname@count=\count151
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/microtype-xetex.def
+File: microtype-xetex.def 2016/05/01 v2.6 Definitions specific to xetex (RS)
+LaTeX Info: Redefining \lsstyle on input line 255.
+)
+Package microtype Info: Loading configuration file microtype.cfg.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/microtype.cfg
+File: microtype.cfg 2016/05/01 v2.6 microtype main configuration file (RS)
+))
+(/usr/local/texlive/2016/texmf-dist/tex/latex/tocloft/tocloft.sty
+Package: tocloft 2013/05/02 v2.3f parameterised ToC, etc., typesetting
+Package tocloft Info: The document has section divisions on input line 44.
+\cftparskip=\skip57
+\cftbeforetoctitleskip=\skip58
+\cftaftertoctitleskip=\skip59
+\cftbeforepartskip=\skip60
+\cftpartnumwidth=\skip61
+\cftpartindent=\skip62
+\cftbeforesecskip=\skip63
+\cftsecindent=\skip64
+\cftsecnumwidth=\skip65
+\cftbeforesubsecskip=\skip66
+\cftsubsecindent=\skip67
+\cftsubsecnumwidth=\skip68
+\cftbeforesubsubsecskip=\skip69
+\cftsubsubsecindent=\skip70
+\cftsubsubsecnumwidth=\skip71
+\cftbeforeparaskip=\skip72
+\cftparaindent=\skip73
+\cftparanumwidth=\skip74
+\cftbeforesubparaskip=\skip75
+\cftsubparaindent=\skip76
+\cftsubparanumwidth=\skip77
+\cftbeforeloftitleskip=\skip78
+\cftafterloftitleskip=\skip79
+\cftbeforefigskip=\skip80
+\cftfigindent=\skip81
+\cftfignumwidth=\skip82
+\c@lofdepth=\count152
+\c@lotdepth=\count153
+\cftbeforelottitleskip=\skip83
+\cftafterlottitleskip=\skip84
+\cftbeforetabskip=\skip85
+\cfttabindent=\skip86
+\cfttabnumwidth=\skip87
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/framed/framed.sty
+Package: framed 2011/10/22 v 0.96: framed or shaded text with page breaks
+\OuterFrameSep=\skip88
+\fb@frw=\dimen177
+\fb@frh=\dimen178
+\FrameRule=\dimen179
+\FrameSep=\dimen180
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/docmute/docmute.sty
+Package: docmute 2012/03/22 v1.4 Input stand-alone documents
+)
+::__fontspec_init:
+::__fontspec_if_detect_external:n{AldusNovaPro-Book.otf}
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,} {aldus-nova}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{aldus-nova}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {aldus-nova}
+(/Users/will/Dropbox/texmf/tex/latex/willfonts/aldus-nova.fontspec)
+::__fontspec_extract_all_features:n{,}
+fontid:aldus-nova-:-Numbers=OldStyle,Ligatures=TeX,Extension = .otf,UprightFont
+ = AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont = PalatinoNo
+vaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle,Ligatures=TeX,Exte
+nsion = .otf,UprightFont = AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItal
+ic,BoldFont = PalatinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt}
+
+Setting bold font "PalatinoNovaPro-Medium" with series "bx"
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[AldusNovaPro-Book.otf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[AldusNovaPro-Book.otf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+save family: aldus-nova
+==fontid_tl:"aldus-nova-:-Numbers=OldStyle,Ligatures=TeX,Extension = .otf,Uprig
+htFont = AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont = Pala
+tinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt".
+\g__fontspec_family_aldus-nova_int=\count154
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{AldusNovaPro-Book}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+Book}
+= declare_shape: {AldusNovaPro-Book} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{AldusNovaPro-Book}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+Book}
+==== Setup NFSS shape: <-> AldusNovaPro-Book
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: AldusNovaPro-Book
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> AldusNovaPro-Book
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{n}...
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{sc}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoNovaPro-Medium}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-Medium}
+= declare_shape: {PalatinoNovaPro-Medium} {bx} {n}
+== size: -
+::__fontspec_load_fontname:n{PalatinoNovaPro-Medium}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-Medium}
+==== Setup NFSS shape: <-> PalatinoNovaPro-Medium
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: PalatinoNovaPro-Medium
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> PalatinoNovaPro-Medium
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{n}...
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{sc}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{AldusNovaPro-BookItalic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+BookItalic}
+= declare_shape: {AldusNovaPro-BookItalic} {m} {it}
+== size: -
+::__fontspec_load_fontname:n{AldusNovaPro-BookItalic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {AldusNovaPro-
+BookItalic}
+==== Setup NFSS shape: <-> AldusNovaPro-BookItalic
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: AldusNovaPro-BookItalic
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> AldusNovaPro-BookItalic
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{it}...
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{itsc}...
+DeclareFontShape: {TU}{aldus-nova(0)}{m}{sl}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoNovaPro-MediumIt}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-MediumIt}
+= declare_shape: {PalatinoNovaPro-MediumIt} {bx} {it}
+== size: -
+::__fontspec_load_fontname:n{PalatinoNovaPro-MediumIt}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoNovaP
+ro-MediumIt}
+==== Setup NFSS shape: <-> PalatinoNovaPro-MediumIt
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: PalatinoNovaPro-MediumIt
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> PalatinoNovaPro-MediumIt
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{it}...
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{itsc}...
+DeclareFontShape: {TU}{aldus-nova(0)}{bx}{sl}...
+.................................................
+. fontspec info: "defining-font"
+. 
+. Font family 'aldus-nova(0)' created for font 'aldus-nova' with options
+. [Numbers=OldStyle,Ligatures=TeX,Extension = .otf,UprightFont =
+. AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont =
+. PalatinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[AldusNovaPro-Book.otf]/OT:script=latn;language=DFLT;+onum;mapping=tex-te
+xt;"
+. - 'small caps'  (m/sc) with NFSS spec.:
+. <->"[AldusNovaPro-Book.otf]/OT:script=latn;language=DFLT;+onum;mapping=tex-te
+xt;+smcp;"
+. - 'bold' (bx/n) with NFSS spec.:
+. <->"[PalatinoNovaPro-Medium.otf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;"
+. - 'bold small caps'  (bx/sc) with NFSS spec.:
+. <->"[PalatinoNovaPro-Medium.otf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;+smcp;"
+. - 'italic' (m/it) with NFSS spec.:
+. <->"[AldusNovaPro-BookItalic.otf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;"
+. - 'italic small caps'  (m/itsc) with NFSS spec.:
+. <->"[AldusNovaPro-BookItalic.otf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;+smcp;"
+. - 'bold italic' (bx/it) with NFSS spec.:
+. <->"[PalatinoNovaPro-MediumIt.otf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;"
+. - 'bold italic small caps'  (bx/itsc) with NFSS spec.:
+. <->"[PalatinoNovaPro-MediumIt.otf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;+smcp;"
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+* Font family 'aldus-nova(0)' created for font 'aldus-nova' with options
+* [Numbers=OldStyle,Ligatures=TeX,Extension = .otf,UprightFont =
+* AldusNovaPro-Book,ItalicFont = AldusNovaPro-BookItalic,BoldFont =
+* PalatinoNovaPro-Medium,BoldItalicFont = PalatinoNovaPro-MediumIt].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[AldusNovaPro-Book.otf]/OT:script=latn;language=DFLT;+onum;mapping=tex-te
+xt;"
+* - 'small caps'  (m/sc) with NFSS spec.:
+* <->"[AldusNovaPro-Book.otf]/OT:script=latn;language=DFLT;+onum;mapping=tex-te
+xt;+smcp;"
+* - 'bold' (bx/n) with NFSS spec.:
+* <->"[PalatinoNovaPro-Medium.otf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;"
+* - 'bold small caps'  (bx/sc) with NFSS spec.:
+* <->"[PalatinoNovaPro-Medium.otf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;+smcp;"
+* - 'italic' (m/it) with NFSS spec.:
+* <->"[AldusNovaPro-BookItalic.otf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;"
+* - 'italic small caps'  (m/itsc) with NFSS spec.:
+* <->"[AldusNovaPro-BookItalic.otf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;+smcp;"
+* - 'bold italic' (bx/it) with NFSS spec.:
+* <->"[PalatinoNovaPro-MediumIt.otf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;"
+* - 'bold italic small caps'  (bx/itsc) with NFSS spec.:
+* <->"[PalatinoNovaPro-MediumIt.otf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;+smcp;"
+*************************************************
+LaTeX Info: Redefining \rmfamily on input line 65.
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,} {palatino-sans-light}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{palatino-sans-light}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {palatino-sans
+-light}
+(/Users/will/Dropbox/texmf/tex/latex/willfonts/palatino-sans-light.fontspec)
+::__fontspec_extract_all_features:n{,}
+fontid:palatino-sans-light-:-Numbers=OldStyle,Ligatures=TeX,Extension = .ttf,Up
+rightFont = PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,BoldFon
+t = PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle,Ligatures=TeX,Exte
+nsion = .ttf,UprightFont = PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-L
+ightIta,BoldFont = PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Ita
+lic}
+Setting bold font "PalatinoSansCom-Regular" with series "bx"
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[PalatinoSansCom-Light.ttf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[PalatinoSansCom-Light.ttf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+save family: palatino-sans-light
+==fontid_tl:"palatino-sans-light-:-Numbers=OldStyle,Ligatures=TeX,Extension = .
+ttf,UprightFont = PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,B
+oldFont = PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic".
+\g__fontspec_family_palatino-sans-light_int=\count155
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-Light}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Light}
+= declare_shape: {PalatinoSansCom-Light} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-Light}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Light}
+==== Setup NFSS shape: <-> PalatinoSansCom-Light
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: PalatinoSansCom-Light
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> PalatinoSansCom-Light
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{n}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{sc}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-Regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Regular}
+= declare_shape: {PalatinoSansCom-Regular} {bx} {n}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-Regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Regular}
+==== Setup NFSS shape: <-> PalatinoSansCom-Regular
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: PalatinoSansCom-Regular
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> PalatinoSansCom-Regular
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{n}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{sc}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-LightIta}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-LightIta}
+= declare_shape: {PalatinoSansCom-LightIta} {m} {it}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-LightIta}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-LightIta}
+==== Setup NFSS shape: <-> PalatinoSansCom-LightIta
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: PalatinoSansCom-LightIta
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> PalatinoSansCom-LightIta
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{it}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{itsc}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{m}{sl}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{PalatinoSansCom-Italic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Italic}
+= declare_shape: {PalatinoSansCom-Italic} {bx} {it}
+== size: -
+::__fontspec_load_fontname:n{PalatinoSansCom-Italic}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {PalatinoSansC
+om-Italic}
+==== Setup NFSS shape: <-> PalatinoSansCom-Italic
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;
+=== sized font: PalatinoSansCom-Italic
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps found.
+==== Setup NFSS shape: <-> PalatinoSansCom-Italic
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,\l__fontspec_fontfeat_curr_clist }
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},Ligatures={TeX},,,,Letter
+s=SmallCaps}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+::::Keys set: {fontspec} {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps
+}}
+::::Leftover: {Numbers={OldStyle},Ligatures={TeX},Letters={SmallCaps}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle},Ligatures={TeX}
+,Letters={SmallCaps}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{}{mapping=tex-text}{}
+::::__fontspec_remove_clashing_featstr:n{mapping=tex-text,ng=tex-text,}
+:::: Removing feature "mapping=tex-text;"
+:::: Removing feature "ng=tex-text;"
+::::__fontspec_update_featstr:n{mapping=tex-text}
+:::: Adding feature.
+::__fontspec_make_OT_feature:nnn{smcp}{+smcp}{+pcap,+unic,+rand}
+:: fontspec_check_ot_feat:n {smcp}
+::::__fontspec_remove_clashing_featstr:n{+smcp,-smcp,+pcap,+unic,+rand}
+:::: Removing feature "+smcp;"
+:::: Removing feature "-smcp;"
+:::: Removing feature "+pcap;"
+:::: Removing feature "+unic;"
+:::: Removing feature "+rand;"
+::::__fontspec_update_featstr:n{+smcp}
+:::: Adding feature.
+==== Gathered features: +onum;mapping=tex-text;+smcp;
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{it}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{itsc}...
+DeclareFontShape: {TU}{palatino-sans-light(0)}{bx}{sl}...
+.................................................
+. fontspec info: "defining-font"
+. 
+. Font family 'palatino-sans-light(0)' created for font 'palatino-sans-light'
+. with options [Numbers=OldStyle,Ligatures=TeX,Extension = .ttf,UprightFont =
+. PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,BoldFont =
+. PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[PalatinoSansCom-Light.ttf]/OT:script=latn;language=DFLT;+onum;mapping=te
+x-text;"
+. - 'small caps'  (m/sc) with NFSS spec.:
+. <->"[PalatinoSansCom-Light.ttf]/OT:script=latn;language=DFLT;+onum;mapping=te
+x-text;+smcp;"
+. - 'bold' (bx/n) with NFSS spec.:
+. <->"[PalatinoSansCom-Regular.ttf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;"
+. - 'bold small caps'  (bx/sc) with NFSS spec.:
+. <->"[PalatinoSansCom-Regular.ttf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;+smcp;"
+. - 'italic' (m/it) with NFSS spec.:
+. <->"[PalatinoSansCom-LightIta.ttf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;"
+. - 'italic small caps'  (m/itsc) with NFSS spec.:
+. <->"[PalatinoSansCom-LightIta.ttf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;+smcp;"
+. - 'bold italic' (bx/it) with NFSS spec.:
+. <->"[PalatinoSansCom-Italic.ttf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;"
+. - 'bold italic small caps'  (bx/itsc) with NFSS spec.:
+. <->"[PalatinoSansCom-Italic.ttf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;+smcp;"
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+* Font family 'palatino-sans-light(0)' created for font 'palatino-sans-light'
+* with options [Numbers=OldStyle,Ligatures=TeX,Extension = .ttf,UprightFont =
+* PalatinoSansCom-Light,ItalicFont = PalatinoSansCom-LightIta,BoldFont =
+* PalatinoSansCom-Regular,BoldItalicFont = PalatinoSansCom-Italic].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[PalatinoSansCom-Light.ttf]/OT:script=latn;language=DFLT;+onum;mapping=te
+x-text;"
+* - 'small caps'  (m/sc) with NFSS spec.:
+* <->"[PalatinoSansCom-Light.ttf]/OT:script=latn;language=DFLT;+onum;mapping=te
+x-text;+smcp;"
+* - 'bold' (bx/n) with NFSS spec.:
+* <->"[PalatinoSansCom-Regular.ttf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;"
+* - 'bold small caps'  (bx/sc) with NFSS spec.:
+* <->"[PalatinoSansCom-Regular.ttf]/OT:script=latn;language=DFLT;+onum;mapping=
+tex-text;+smcp;"
+* - 'italic' (m/it) with NFSS spec.:
+* <->"[PalatinoSansCom-LightIta.ttf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;"
+* - 'italic small caps'  (m/itsc) with NFSS spec.:
+* <->"[PalatinoSansCom-LightIta.ttf]/OT:script=latn;language=DFLT;+onum;mapping
+=tex-text;+smcp;"
+* - 'bold italic' (bx/it) with NFSS spec.:
+* <->"[PalatinoSansCom-Italic.ttf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;"
+* - 'bold italic small caps'  (bx/itsc) with NFSS spec.:
+* <->"[PalatinoSansCom-Italic.ttf]/OT:script=latn;language=DFLT;+onum;mapping=t
+ex-text;+smcp;"
+*************************************************
+LaTeX Info: Redefining \sffamily on input line 65.
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,BoldFont=lmmonolt10-bold.otf} {lmmonolt10-regular.otf}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{lmmonolt10-regular.otf}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-re
+gular.otf}
+::__fontspec_extract_all_features:n{,BoldFont=lmmonolt10-bold.otf}
+fontid:lmmonolt10-regular-:-Numbers=OldStyle,WordSpace={1,0,0},PunctuationSpace
+=WordSpace,BoldFont=lmmonolt10-bold.otf
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle,WordSpace={1,0,0},
+PunctuationSpace=WordSpace,BoldFont=lmmonolt10-bold.otf}
+Setting bold font "lmmonolt10-bold.otf" with series "bx"
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace}}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace}}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[lmmonolt10-regular.otf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[lmmonolt10-regular.otf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace},}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec} {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace
+={WordSpace}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+save family: lmmonolt10-regular.otf
+==fontid_tl:"lmmonolt10-regular-:-Numbers=OldStyle,WordSpace={1,0,0},Punctuatio
+nSpace=WordSpace,BoldFont=lmmonolt10-bold.otf".
+\g__fontspec_family_lmmonolt10-regular.otf_int=\count156
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{lmmonolt10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-re
+gular}
+= declare_shape: {lmmonolt10-regular} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{lmmonolt10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-re
+gular}
+==== Setup NFSS shape: <-> lmmonolt10-regular
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace},,,,}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec} {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace
+={WordSpace}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+==== Gathered features: +onum;
+=== sized font: lmmonolt10-regular
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{lmmonolt10-regular.otf(0)}{m}{n}...
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{lmmonolt10-bold.otf}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-bo
+ld.otf}
+= declare_shape: {lmmonolt10-bold} {bx} {n}
+== size: -
+::__fontspec_load_fontname:n{lmmonolt10-bold}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonolt10-bo
+ld}
+==== Setup NFSS shape: <-> lmmonolt10-bold
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},WordSpace={1,0,0},Punctua
+tionSpace={WordSpace},,,,}
+::::Leftover: {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace={WordSpace
+}}
+::::Keys set: {fontspec} {Numbers={OldStyle},WordSpace={1,0,0},PunctuationSpace
+={WordSpace}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+==== Gathered features: +onum;
+=== sized font: lmmonolt10-bold
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{lmmonolt10-regular.otf(0)}{bx}{n}...
+.................................................
+. fontspec info: "defining-font"
+. 
+. Font family 'lmmonolt10-regular.otf(0)' created for font
+. 'lmmonolt10-regular.otf' with options
+. [Numbers=OldStyle,WordSpace={1,0,0},PunctuationSpace=WordSpace,BoldFont=lmmon
+olt10-bold.otf].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[lmmonolt10-regular.otf]/OT:script=latn;language=DFLT;+onum;"
+. - 'small caps'  (m/sc) with NFSS spec.: 
+. and font adjustment code:
+. \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+. \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+. - 'bold' (bx/n) with NFSS spec.:
+. <->"[lmmonolt10-bold.otf]/OT:script=latn;language=DFLT;+onum;"
+. - 'bold small caps'  (bx/sc) with NFSS spec.: 
+. and font adjustment code:
+. \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+. \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+* Font family 'lmmonolt10-regular.otf(0)' created for font
+* 'lmmonolt10-regular.otf' with options
+* [Numbers=OldStyle,WordSpace={1,0,0},PunctuationSpace=WordSpace,BoldFont=lmmon
+olt10-bold.otf].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[lmmonolt10-regular.otf]/OT:script=latn;language=DFLT;+onum;"
+* - 'small caps'  (m/sc) with NFSS spec.: 
+* and font adjustment code:
+* \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+* \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+* - 'bold' (bx/n) with NFSS spec.:
+* <->"[lmmonolt10-bold.otf]/OT:script=latn;language=DFLT;+onum;"
+* - 'bold small caps'  (bx/sc) with NFSS spec.: 
+* and font adjustment code:
+* \fontdimen 2\font =1\fontdimen 2\font \fontdimen 3\font =0\fontdimen 3\font
+* \fontdimen 4\font =0\fontdimen 4\font \fontdimen 7\font =0\fontdimen 2\font 
+*************************************************
+LaTeX Info: Redefining \ttfamily on input line 66.
+
+
+::::::::::::::::::::::::::::::
+::fontspec_select:nn {,} {lmmonoltcond10-regular.otf}
+::__fontspec_init:
+::__fontspec_if_detect_external:n{lmmonoltcond10-regular.otf}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonoltcond1
+0-regular.otf}
+::__fontspec_extract_all_features:n{,}
+fontid:lmmonoltcond10-regular-:-Numbers=OldStyle
+::__fontspec_preparse_features:
+::::Keys set: {fontspec-preparse-external} {Numbers=OldStyle}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec-preparse} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+::__fontspec_load_font
+Set base font for preliminary analysis:"[lmmonoltcond10-regular.otf]/OT"
+::__fontspec_set_font_type:
+Set base font properly:"[lmmonoltcond10-regular.otf]/OT"
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+save family: lmmonoltcond10-regular.otf
+==fontid_tl:"lmmonoltcond10-regular-:-Numbers=OldStyle".
+\g__fontspec_family_lmmonoltcond10-regular.otf_int=\count157
+::::Keys set: {fontspec-preparse-external} {}
+::::Leftover: {}
+::__fontspec_load_fontname:n{lmmonoltcond10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonoltcond1
+0-regular}
+= declare_shape: {lmmonoltcond10-regular} {m} {n}
+== size: -
+::__fontspec_load_fontname:n{lmmonoltcond10-regular}
+::__fontspec_load_external_fontoptions:Nn\l_fontspec_fontname_tl {lmmonoltcond1
+0-regular}
+==== Setup NFSS shape: <-> lmmonoltcond10-regular
+::__fontspec_get_features:Nn\l__fontspec_rawfeatures_sclist {,,\l__fontspec_siz
+ing_leftover_clist ,}
+::::Keys set: {fontspec-renderer} {Numbers={OldStyle},,,,}
+::::Leftover: {Numbers={OldStyle}}
+::::Keys set: {fontspec} {Numbers={OldStyle}}
+::::Leftover: {Numbers={OldStyle}}
+:::Setting keys for OpenType font features: "Numbers={OldStyle}"
+::__fontspec_make_OT_feature:nnn{onum}{+onum}{+lnum,-lnum}
+:: fontspec_check_ot_feat:n {onum}
+::::__fontspec_remove_clashing_featstr:n{+onum,-onum,+lnum,-lnum}
+:::: Removing feature "+onum;"
+:::: Removing feature "-onum;"
+:::: Removing feature "+lnum;"
+:::: Removing feature "-lnum;"
+::::__fontspec_update_featstr:n{+onum}
+:::: Adding feature.
+==== Gathered features: +onum;
+=== sized font: lmmonoltcond10-regular
+:: fontspec_check_ot_feat:n {smcp}
+==== Small caps not found.
+DeclareFontShape: {TU}{lmmonoltcond10-regular.otf(0)}{m}{n}...
+.................................................
+. fontspec info: "defining-font"
+. 
+. Font family 'lmmonoltcond10-regular.otf(0)' created for font
+. 'lmmonoltcond10-regular.otf' with options [Numbers=OldStyle].
+.  
+.  This font family consists of the following NFSS series/shapes:
+.  
+. - 'normal' (m/n) with NFSS spec.:
+. <->"[lmmonoltcond10-regular.otf]/OT:script=latn;language=DFLT;+onum;"
+. - 'small caps'  (m/sc) with NFSS spec.: 
+.................................................
+*************************************************
+* fontspec warning: "defining-font"
+* 
+* Font family 'lmmonoltcond10-regular.otf(0)' created for font
+* 'lmmonoltcond10-regular.otf' with options [Numbers=OldStyle].
+*  
+*  This font family consists of the following NFSS series/shapes:
+*  
+* - 'normal' (m/n) with NFSS spec.:
+* <->"[lmmonoltcond10-regular.otf]/OT:script=latn;language=DFLT;+onum;"
+* - 'small caps'  (m/sc) with NFSS spec.: 
+*************************************************
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/hyperref.sty
+Package: hyperref 2012/11/06 v6.83m Hypertext links for LaTeX
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
+Package: hobsub-hyperref 2012/05/28 v1.13 Bundle oberdiek, subset hyperref (HO)
+
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+Package: hobsub-generic 2012/05/28 v1.13 Bundle oberdiek, subset generic (HO)
+Package: hobsub 2012/05/28 v1.13 Construct package bundles (HO)
+Package hobsub Info: Skipping package `infwarerr' (already loaded).
+Package hobsub Info: Skipping package `ltxcmds' (already loaded).
+Package hobsub Info: Skipping package `ifluatex' (already loaded).
+Package hobsub Info: Skipping package `ifvtex' (already loaded).
+Package: intcalc 2007/09/27 v1.1 Expandable calculations with integers (HO)
+Package hobsub Info: Skipping package `ifpdf' (already loaded).
+Package hobsub Info: Skipping package `etexcmds' (already loaded).
+Package hobsub Info: Skipping package `kvsetkeys' (already loaded).
+Package hobsub Info: Skipping package `kvdefinekeys' (already loaded).
+Package hobsub Info: Skipping package `pdftexcmds' (already loaded).
+Package: pdfescape 2011/11/25 v1.13 Implements pdfTeX's escape features (HO)
+Package: bigintcalc 2012/04/08 v1.3 Expandable calculations on big integers (HO
+)
+Package: bitset 2011/01/30 v1.1 Handle bit-vector datatype (HO)
+Package: uniquecounter 2011/01/30 v1.2 Provide unlimited unique counter (HO)
+)
+Package hobsub Info: Skipping package `hobsub' (already loaded).
+Package: letltxmacro 2010/09/02 v1.4 Let assignment for LaTeX macros (HO)
+Package: hopatch 2012/05/28 v1.2 Wrapper for package hooks (HO)
+Package: xcolor-patch 2011/01/30 xcolor patch
+Package: atveryend 2011/06/30 v1.8 Hooks at the very end of document (HO)
+Package atveryend Info: \enddocument detected (standard20110627).
+Package atveryend Info: \docmute@enddocument detected (standard20110627).
+Package: atbegshi 2011/10/05 v1.16 At begin shipout hook (HO)
+Package: refcount 2011/10/16 v3.4 Data extraction from label references (HO)
+Package: hycolor 2011/01/30 v1.7 Color options for hyperref/bookmark (HO)
+)
+(/usr/local/texlive/2016/texmf-dist/tex/latex/oberdiek/auxhook.sty
+Package: auxhook 2011/03/04 v1.3 Hooks for auxiliary files (HO)
+
+
+Package auxhook Warning: Cannot patch \document,
+(auxhook)                using \AtBeginDocument instead.
+
+)
+\@linkdim=\dimen181
+\Hy@linkcounter=\count158
+\Hy@pagecounter=\count159
+ (/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/pd1enc.def
+File: pd1enc.def 2012/11/06 v6.83m Hyperref: PDFDocEncoding definition (HO)
+)
+\Hy@SavedSpaceFactor=\count160
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/latexconfig/hyperref.cfg
+File: hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive
+)
+Package hyperref Info: Option `bookmarks' set `true' on input line 4328.
+Package hyperref Info: Option `colorlinks' set `true' on input line 4328.
+
+
+Package hyperref Warning: XeTeX driver only supports unicode.
+(hyperref)                Enabling option `unicode'.
+
+Package hyperref Info: Option `unicode' set `true' on input line 4328.
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/puenc.def
+File: puenc.def 2012/11/06 v6.83m Hyperref: PDF Unicode definition (HO)
+)
+Package hyperref Info: Hyper figures OFF on input line 4452.
+Package hyperref Info: Link nesting OFF on input line 4457.
+Package hyperref Info: Hyper index ON on input line 4460.
+Package hyperref Info: Plain pages OFF on input line 4467.
+Package hyperref Info: Backreferencing OFF on input line 4472.
+Package hyperref Info: Implicit mode ON; LaTeX internals redefined.
+Package hyperref Info: Bookmarks ON on input line 4697.
+\c@Hy@tempcnt=\count161
+LaTeX Info: Redefining \url on input line 5051.
+\XeTeXLinkMargin=\dimen182
+\Fld@menulength=\count162
+\Field@Width=\dimen183
+\Fld@charsize=\dimen184
+Package hyperref Info: Hyper figures OFF on input line 6305.
+Package hyperref Info: Link nesting OFF on input line 6310.
+Package hyperref Info: Hyper index ON on input line 6313.
+Package hyperref Info: backreferencing OFF on input line 6320.
+Package hyperref Info: Link coloring ON on input line 6323.
+Package hyperref Info: Link coloring with OCG OFF on input line 6330.
+Package hyperref Info: PDF/A mode OFF on input line 6335.
+LaTeX Info: Redefining \ref on input line 6375.
+LaTeX Info: Redefining \pageref on input line 6379.
+\Hy@abspage=\count163
+\c@Item=\count164
+\c@Hfootnote=\count165
+)
+
+Package hyperref Message: Driver (autodetected): hxetex.
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/hxetex.def
+File: hxetex.def 2012/11/06 v6.83m Hyperref driver for XeTeX
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/stringenc.sty
+Package: stringenc 2011/12/02 v1.10 Convert strings between diff. encodings (HO
+)
+)
+\pdfm@box=\box71
+\c@Hy@AnnotLevel=\count166
+\HyField@AnnotCount=\count167
+\Fld@listcount=\count168
+\c@bookmark@seq@number=\count169
+
+(/usr/local/texlive/2016/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty
+Package: rerunfilecheck 2011/04/15 v1.7 Rerun checks for auxiliary files (HO)
+Package rerunfilecheck Info: Feature \pdfmdfivesum is not available
+(rerunfilecheck)             (e.g. pdfTeX or LuaTeX with package `pdftexcmds').
+
+(rerunfilecheck)             Therefore file contents cannot be checked efficien
+tly
+(rerunfilecheck)             and the loading of the package is aborted.
+)
+\Hy@SectionHShift=\skip89
+)
+\X=\box72
+\Y=\box73
+\c@example=\count170
+\c@argument=\count171
+.................................................
+. LaTeX info: "xparse/define-command"
+. 
+. Defining command \otf with sig. 'somm' on line 248.
+.................................................
+)
+\@indexfile=\write4
+\openout4 = `fontspec-doc.idx'.
+
+
+Writing index file fontspec-doc.idx
+\@glossaryfile=\write5
+\openout5 = `fontspec-doc.glo'.
+
+Writing glossary file fontspec-doc.glo 
+(./fontspec-doc.aux (./fontspec-doc-intro.aux) (./fontspec-doc-fontsel.aux)
+(./fontspec-doc-featsel.aux) (./fontspec-doc-opentype.aux)
+(./fontspec-doc-enc.aux) (./fontspec-doc-luatex.aux) (./fontspec-doc-xetex.aux)
+(./fontspec-doc-api.aux) (./fontspec-doc-patches.aux))
+\openout1 = `fontspec-doc.aux'.
+
+LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for OT1/cmr/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for OMS/cmsy/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for OMX/cmex/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for TU/cmr/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for PD1/pdf/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+LaTeX Font Info:    Checking defaults for PU/pdf/m/n on input line 15.
+LaTeX Font Info:    ... okay on input line 15.
+Package doc Info: Made | a short reference for \verb on input line 15.
+.................................................
+. fontspec info: "setup-math"
+. 
+. Adjusting the maths setup (use [no-math] to avoid this). 
+.................................................
+\symlegacymaths=\mathgroup4
+LaTeX Font Info:    Overwriting symbol font `legacymaths' in version `bold'
+(Font)                  OT1/cmr/m/n --> OT1/cmr/bx/n on input line 15.
+LaTeX Font Info:    Redeclaring math accent \acute on input line 15.
+LaTeX Font Info:    Redeclaring math accent \grave on input line 15.
+LaTeX Font Info:    Redeclaring math accent \ddot on input line 15.
+LaTeX Font Info:    Redeclaring math accent \tilde on input line 15.
+LaTeX Font Info:    Redeclaring math accent \bar on input line 15.
+LaTeX Font Info:    Redeclaring math accent \breve on input line 15.
+LaTeX Font Info:    Redeclaring math accent \check on input line 15.
+LaTeX Font Info:    Redeclaring math accent \hat on input line 15.
+LaTeX Font Info:    Redeclaring math accent \dot on input line 15.
+LaTeX Font Info:    Redeclaring math accent \mathring on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \colon on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Gamma on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Delta on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Theta on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Lambda on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Xi on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Pi on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Sigma on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Upsilon on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Phi on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Psi on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \Omega on input line 15.
+LaTeX Font Info:    Redeclaring math symbol \mathdollar on input line 15.
+LaTeX Font Info:    Redeclaring symbol font `operators' on input line 15.
+LaTeX Font Info:    Encoding `OT1' has changed to `TU' for symbol font
+(Font)              `operators' in the math version `normal' on input line 15.
+LaTeX Font Info:    Overwriting symbol font `operators' in version `normal'
+(Font)                  OT1/cmr/m/n --> TU/aldus-nova(0)/m/n on input line 15.
+LaTeX Font Info:    Encoding `OT1' has changed to `TU' for symbol font
+(Font)              `operators' in the math version `bold' on input line 15.
+LaTeX Font Info:    Overwriting symbol font `operators' in version `bold'
+(Font)                  OT1/cmr/bx/n --> TU/aldus-nova(0)/m/n on input line 15.
+
+LaTeX Font Info:    Overwriting symbol font `operators' in version `normal'
+(Font)                  TU/aldus-nova(0)/m/n --> TU/aldus-nova(0)/m/n on input 
+line 15.
+LaTeX Font Info:    Overwriting math alphabet `\mathit' in version `normal'
+(Font)                  OT1/cmr/m/it --> TU/aldus-nova(0)/m/it on input line 15
+.
+LaTeX Font Info:    Overwriting math alphabet `\mathbf' in version `normal'
+(Font)                  OT1/cmr/bx/n --> TU/aldus-nova(0)/bx/n on input line 15
+.
+LaTeX Font Info:    Overwriting math alphabet `\mathsf' in version `normal'
+(Font)                  OT1/cmss/m/n --> TU/palatino-sans-light(0)/m/n on input
+ line 15.
+LaTeX Font Info:    Overwriting math alphabet `\mathtt' in version `normal'
+(Font)                  OT1/cmtt/m/n --> TU/lmmonolt10-regular.otf(0)/m/n on in
+put line 15.
+LaTeX Font Info:    Overwriting symbol font `operators' in version `bold'
+(Font)                  TU/aldus-nova(0)/m/n --> TU/aldus-nova(0)/bx/n on input
+ line 15.
+LaTeX Font Info:    Overwriting math alphabet `\mathit' in version `bold'
+(Font)                  OT1/cmr/bx/it --> TU/aldus-nova(0)/bx/it on input line 
+15.
+LaTeX Font Info:    Overwriting math alphabet `\mathsf' in version `bold'
+(Font)                  OT1/cmss/bx/n --> TU/palatino-sans-light(0)/bx/n on inp
+ut line 15.
+LaTeX Font Info:    Overwriting math alphabet `\mathtt' in version `bold'
+(Font)                  OT1/cmtt/m/n --> TU/lmmonolt10-regular.otf(0)/bx/n on i
+nput line 15.
+Package caption Info: Begin \AtBeginDocument code.
+Package caption Info: hyperref package is loaded.
+Package caption Info: End \AtBeginDocument code.
+LaTeX Info: Redefining \microtypecontext on input line 15.
+Package microtype Info: Character protrusion enabled (level 2).
+Package microtype Info: Using default protrusion set `alltext'.
+Package microtype Info: No adjustment of tracking.
+Package microtype Info: No adjustment of spacing.
+Package microtype Info: No adjustment of kerning.
+Package microtype Info: Loading generic settings for font family
+(microtype)             `aldus-nova' (encoding: TU).
+(microtype)             For optimal results, create family-specific settings.
+(microtype)             See the microtype manual for details.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\`i'
+(microtype)                in font encoding `TU' in inheritance list
+(microtype)                `microtype.cfg/358(protrusion)'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\'i'
+(microtype)                in font encoding `TU' in inheritance list
+(microtype)                `microtype.cfg/358(protrusion)'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\^i'
+(microtype)                in font encoding `TU' in inheritance list
+(microtype)                `microtype.cfg/358(protrusion)'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\"i'
+(microtype)                in font encoding `TU' in inheritance list
+(microtype)                `microtype.cfg/358(protrusion)'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+\AtBeginShipoutBox=\box74
+Package hyperref Info: Link coloring ON on input line 15.
+(/usr/local/texlive/2016/texmf-dist/tex/latex/hyperref/nameref.sty
+Package: nameref 2012/10/27 v2.43 Cross-referencing by name of section
+
+(/usr/local/texlive/2016/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
+Package: gettitlestring 2010/12/03 v1.4 Cleanup title references (HO)
+)
+\c@section@level=\count172
+LaTeX Info: Redefining \Ref on input line 513.
+)
+LaTeX Info: Redefining \ref on input line 15.
+LaTeX Info: Redefining \pageref on input line 15.
+LaTeX Info: Redefining \nameref on input line 15.
+
+(./fontspec-doc.out) (./fontspec-doc.out)
+\@outlinefile=\write6
+\openout6 = `fontspec-doc.out'.
+
+LaTeX Info: Redefining \Ref on input line 15.
+\docmute@nestinglevel=\count173
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+Package microtype Info: Loading generic settings for font family
+(microtype)             `palatino-sans-light' (encoding: TU).
+(microtype)             For optimal results, create family-specific settings.
+(microtype)             See the microtype manual for details.
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <17.28> on input line 27.
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <12> on input line 27.
+(/usr/local/texlive/2016/texmf-dist/tex/latex/microtype/mt-cmr.cfg
+File: mt-cmr.cfg 2013/05/19 v2.2 microtype config. file: Computer Modern Roman 
+(RS)
+)
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <8> on input line 27.
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <6> on input line 27.
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+Package microtype Info: Loading generic settings for font family
+(microtype)             `lmmonolt10-regular.otf' (encoding: TU).
+(microtype)             For optimal results, create family-specific settings.
+(microtype)             See the microtype manual for details.
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+(./fontspec-doc.toc
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <7> on input line 2.
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <5> on input line 2.
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+[1
+
+]
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+[2]
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+)
+\tf@toc=\write7
+\openout7 = `fontspec-doc.toc'.
+
+ [3]
+\openout2 = `fontspec-doc-intro.aux'.
+
+ (./fontspec-doc-intro.tex
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+[4
+
+]
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+[5]) [6]
+\openout2 = `fontspec-doc-fontsel.aux'.
+
+ (./fontspec-doc-fontsel.tex
+
+LaTeX Warning: Hyper reference `sec:font-ind-features' on page 7 undefined on i
+nput line 21.
+
+
+LaTeX Warning: Reference `sec:font-ind-features' on page 7 undefined on input l
+ine 21.
+
+\openout3 = `zzz-1-L-fontload.tex'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+File: zzz-1-L-fontload.pdf Graphic file (type QTm)
+<use  "zzz-1-L-fontload.pdf" >
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+LaTeX Warning: Hyper reference `sec:defaults' on page 7 undefined on input line
+ 35.
+
+
+LaTeX Warning: Reference `sec:defaults' on page 7 undefined on input line 35.
+
+
+LaTeX Warning: Hyper reference `sec:font-ind-features' on page 7 undefined on i
+nput line 40.
+
+
+LaTeX Warning: Reference `sec:font-ind-features' on page 7 undefined on input l
+ine 40.
+
+[7
+
+
+] [8] [9]
+
+LaTeX Font Warning: Font shape `TU/lmmonolt10-regular.otf(0)/m/it' undefined
+(Font)              using `TU/lmmonolt10-regular.otf(0)/m/n' instead on input l
+ine 174.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+\openout3 = `zzz-2-L-nff.tex'.
+
+File: zzz-2-L-nff.pdf Graphic file (type QTm)
+<use  "zzz-2-L-nff.pdf" >
+\openout3 = `zzz-3-X-nfface.tex'.
+
+File: zzz-3-X-nfface.pdf Graphic file (type QTm)
+ <use  "zzz-3-X-nfface.pdf" > [10]
+\openout3 = `zzz-4-X-bff.tex'.
+
+File: zzz-4-X-bff.pdf Graphic file (type QTm)
+
+<use  "zzz-4-X-bff.pdf" > [11]
+
+LaTeX Warning: Reference `sec:bfit-feat' on page 12 undefined on input line 296
+.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+[12]
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+[13]
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+[14] [15]
+Overfull \hbox (74.25003pt too wide) in paragraph at lines 501--502
+[][]\TU/lmmonolt10-regular.otf(0)/m/it/10 \emfontdeclare{\bfseries,\fontseries{
+h}\selectfont,\fontseries{x}\selectfont}
+ []
+
+) [16]
+\openout2 = `fontspec-doc-featsel.aux'.
+
+
+No file fontspec-doc-featsel.tex.
+\openout2 = `fontspec-doc-opentype.aux'.
+
+(./fontspec-doc-opentype.tex [17
+
+
+
+
+]
+\scriptcount=\count174
+\scriptindex=\count175
+\scripttag=\count176
+\langcount=\count177
+\langindex=\count178
+\langtag=\count179
+\featurecount=\count180
+\featureindex=\count181
+\featuretag=\count182
+ [18]
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+Package microtype Info: Loading generic settings for font family
+(microtype)             `lmmonoltcond10-regular.otf' (encoding: TU).
+(microtype)             For optimal results, create family-specific settings.
+(microtype)             See the microtype manual for details.
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <9> on input line 214.
+\openout3 = `zzz-5-L-lig.tex'.
+
+File: zzz-5-L-lig.pdf Graphic file (type QTm)
+<use  "zzz-5-L-lig.pdf" > [19] [20] [21] [22]
+\openout3 = `zzz-6-L-caps.tex'.
+
+File: zzz-6-L-caps.pdf Graphic file (type QTm)
+ <use  "zzz-6-L-caps.pdf" >
+\openout3 = `zzz-7-L-letters-uppercase.tex'.
+
+File: zzz-7-L-letters-uppercase.pdf Graphic file (type QTm)
+
+<use  "zzz-7-L-letters-uppercase.pdf" >
+
+LaTeX Warning: Hyper reference `sec:addfontfeatures' on page 23 undefined on in
+put line 358.
+
+
+LaTeX Warning: Reference `sec:addfontfeatures' on page 23 undefined on input li
+ne 358.
+
+\openout3 = `zzz-8-L-slashzero.tex'.
+
+File: zzz-8-L-slashzero.pdf Graphic file (type QTm)
+<use  "zzz-8-L-slashzero.pdf" > [23]
+\openout3 = `zzz-9-L-vertpos.tex'.
+
+File: zzz-9-L-vertpos.pdf Graphic file (type QTm)
+ <use  "zzz-9-L-vertpos.pdf" >
+Overfull \hbox (8.82501pt too wide) in paragraph at lines 431--431
+[] [][] 
+ []
+
+[24] [25]
+\openout3 = `zzz-10-X-ot-frac.tex'.
+
+File: zzz-10-X-ot-frac.pdf Graphic file (type QTm)
+ <use  "zzz-10-X-ot-frac.pdf" >
+\openout3 = `zzz-11-X-style-alt.tex'.
+
+File: zzz-11-X-style-alt.pdf Graphic file (type QTm)
+ <use  "zzz-11-X-style-alt.pdf" >
+\openout3 = `zzz-12-X-style-hist.tex'.
+
+File: zzz-12-X-style-hist.pdf Graphic file (type QTm)
+
+<use  "zzz-12-X-style-hist.pdf" >
+\openout3 = `zzz-13-X-style-titl.tex'.
+
+File: zzz-13-X-style-titl.pdf Graphic file (type QTm)
+ <use  "zzz-13-X-style-titl.pdf" >
+\openout3 = `zzz-14-X-style-itrub.tex'.
+
+File: zzz-14-X-style-itrub.pdf Graphic file (type QTm)
+
+<use  "zzz-14-X-style-itrub.pdf" > [26] [27]
+\openout3 = `zzz-15-X-style-hvkana.tex'.
+
+File: zzz-15-X-style-hvkana.pdf Graphic file (type QTm)
+
+<use  "zzz-15-X-style-hvkana.pdf" >
+\openout3 = `zzz-16-X-kernup.tex'.
+
+File: zzz-16-X-kernup.pdf Graphic file (type QTm)
+ <use  "zzz-16-X-kernup.pdf" > [28] [29]
+\openout3 = `zzz-17-X-charwdprop.tex'.
+
+File: zzz-17-X-charwdprop.pdf Graphic file (type QTm)
+
+<use  "zzz-17-X-charwdprop.pdf" >
+\openout3 = `zzz-18-X-charwd.tex'.
+
+File: zzz-18-X-charwd.pdf Graphic file (type QTm)
+ <use  "zzz-18-X-charwd.pdf" >
+\openout3 = `zzz-19-X-ot-cjk-shape.tex'.
+
+File: zzz-19-X-ot-cjk-shape.pdf Graphic file (type QTm)
+
+<use  "zzz-19-X-ot-cjk-shape.pdf" > [30] [31]
+\openout3 = `zzz-20-L-ss.tex'.
+
+File: zzz-20-L-ss.pdf Graphic file (type QTm)
+ <use  "zzz-20-L-ss.pdf" >
+\openout3 = `zzz-21-L-ss2.tex'.
+
+File: zzz-21-L-ss2.pdf Graphic file (type QTm)
+
+<use  "zzz-21-L-ss2.pdf" >
+Overfull \hbox (53.08008pt too wide) in paragraph at lines 727--729
+[]\TU/aldus-nova(0)/m/n/10 Multiple stylistic sets may be selected simultaneous
+ly by writing, e.g., []\TU/lmmonolt10-regular.otf(0)/m/it/10 StylisticSet={1,2,
+3}\TU/aldus-nova(0)/m/n/10 . 
+ []
+
+\openout3 = `zzz-22-L-cv.tex'.
+
+File: zzz-22-L-cv.pdf Graphic file (type QTm)
+<use  "zzz-22-L-cv.pdf" >
+\openout3 = `zzz-23-L-cv2.tex'.
+
+File: zzz-23-L-cv2.pdf Graphic file (type QTm)
+ <use  "zzz-23-L-cv2.pdf" > [32] [33]
+\openout3 = `zzz-24-X-salt.tex'.
+
+File: zzz-24-X-salt.pdf Graphic file (type QTm)
+
+<use  "zzz-24-X-salt.pdf" >
+Overfull \hbox (8.16304pt too wide) in paragraph at lines 784--786
+[]\TU/aldus-nova(0)/m/n/10 Note that the indexing starts from zero. With the []
+ engine, []\TU/lmmonolt10-regular.otf(0)/m/it/10 Alternate=Random
+ []
+
+\openout3 = `zzz-25-X-ot-annot.tex'.
+
+File: zzz-25-X-ot-annot.pdf Graphic file (type QTm)
+<use  "zzz-25-X-ot-annot.pdf" > [34]
+\openout3 = `zzz-26-X-script-lang.tex'.
+
+File: zzz-26-X-script-lang.pdf Graphic file (type QTm)
+ <use  "zzz-26-X-script-lang.pdf" >
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Underfull \hbox (badness 10000) in paragraph at lines 887--887
+[]\TU/palatino-sans-light(0)/m/n/7 Sumero-Akkadian
+ []
+
+
+Overfull \hbox (31.65277pt too wide) in paragraph at lines 894--909
+[]   $[]$ 
+ []
+
+
+LaTeX Warning: Float too large for page by 37.64319pt on input line 909.
+
+) [35] [36] [37]
+\openout2 = `fontspec-doc-enc.aux'.
+
+ (./fontspec-doc-enc.tex [38
+
+
+] [39]
+Overfull \hbox (28.05908pt too wide) in paragraph at lines 175--175
+[]\TU/lmmonolt10-regular.otf(0)/m/it/10 \DeclareTextCommand{$\OMS/cmsy/m/n/10 h
+$[]\TU/aldus-nova(0)/m/it/10 command$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regula
+r.otf(0)/m/it/10 }{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 encoding$\OM
+S/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/it/10 }[$\OMS/cmsy/m/n/10 h$[
+]\TU/aldus-nova(0)/m/it/10 num$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(
+0)/m/it/10 ][$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 default$\OMS/cmsy/
+m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/it/10 ]{$\OMS/cmsy/m/n/10 h$[]\TU/al
+dus-nova(0)/m/it/10 code$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/i
+t/10 } 
+ []
+
+[40]
+Overfull \hbox (30.61127pt too wide) in paragraph at lines 179--179
+[]\TU/lmmonolt10-regular.otf(0)/m/it/10 \DeclareTextCompositeCommand{$\OMS/cmsy
+/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 command$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt
+10-regular.otf(0)/m/it/10 }{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 enc
+oding$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/it/10 }{$\OMS/cmsy/m
+/n/10 h$[]\TU/aldus-nova(0)/m/it/10 letter$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-
+regular.otf(0)/m/it/10 }{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 code$\
+OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/it/10 } 
+ []
+
+) [41]
+\openout2 = `fontspec-doc-luatex.aux'.
+
+ (./fontspec-doc-luatex.tex) [42
+
+
+]
+\openout2 = `fontspec-doc-xetex.aux'.
+
+ (./fontspec-doc-xetex.tex
+\openout3 = `zzz-27-X-mapping.tex'.
+
+File: zzz-27-X-mapping.pdf Graphic file (type QTm)
+
+<use  "zzz-27-X-mapping.pdf" >
+
+LaTeX Warning: Hyper reference `sec:mm' on page 43 undefined on input line 56.
+
+
+LaTeX Warning: Reference `sec:mm' on page 43 undefined on input line 56.
+
+[43
+
+
+]
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+LaTeX Warning: Hyper reference `sec:addfontfeatures' on page 44 undefined on in
+put line 122.
+
+
+LaTeX Warning: Reference `sec:addfontfeatures' on page 44 undefined on input li
+ne 122.
+
+[44]
+\openout3 = `zzz-28-X-wordcx.tex'.
+
+File: zzz-28-X-wordcx.pdf Graphic file (type QTm)
+ <use  "zzz-28-X-wordcx.pdf" >
+\openout3 = `zzz-29-X-longsaat.tex'.
+
+File: zzz-29-X-longsaat.pdf Graphic file (type QTm)
+ <use  "zzz-29-X-longsaat.pdf" >
+\openout3 = `zzz-30-X-aat-supp.tex'.
+
+File: zzz-30-X-aat-supp.pdf Graphic file (type QTm)
+
+<use  "zzz-30-X-aat-supp.pdf" > [45]
+\openout3 = `zzz-31-X-aat-frac.tex'.
+
+File: zzz-31-X-aat-frac.pdf Graphic file (type QTm)
+ <use  "zzz-31-X-aat-frac.pdf" >
+\openout3 = `zzz-32-X-frac-alt.tex'.
+
+File: zzz-32-X-frac-alt.pdf Graphic file (type QTm)
+
+<use  "zzz-32-X-frac-alt.pdf" >
+\openout3 = `zzz-33-X-aat-var.tex'.
+
+File: zzz-33-X-aat-var.pdf Graphic file (type QTm)
+ <use  "zzz-33-X-aat-var.pdf" >
+\openout3 = `zzz-34-X-aat-alt.tex'.
+
+File: zzz-34-X-aat-alt.pdf Graphic file (type QTm)
+
+<use  "zzz-34-X-aat-alt.pdf" > [46]
+\openout3 = `zzz-35-X-vert.tex'.
+
+File: zzz-35-X-vert.pdf Graphic file (type QTm)
+ <use  "zzz-35-X-vert.pdf" > [47]) [48]
+\openout2 = `fontspec-doc-api.aux'.
+
+
+(./fontspec-doc-api.tex
+\openout3 = `zzz-36-X-newAATfeat.tex'.
+
+File: zzz-36-X-newAATfeat.pdf Graphic file (type QTm)
+ <use  "zzz-36-X-newAATfeat.pdf" > [49
+
+
+]
+
+LaTeX Warning: Marginpar on page 50 moved.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+\openout3 = `zzz-37-X-raw.tex'.
+
+File: zzz-37-X-raw.pdf Graphic file (type QTm)
+<use  "zzz-37-X-raw.pdf" >
+\openout3 = `zzz-38-X-alias.tex'.
+
+File: zzz-38-X-alias.pdf Graphic file (type QTm)
+ <use  "zzz-38-X-alias.pdf" >
+Overfull \hbox (6.94453pt too wide) in paragraph at lines 122--126
+\TU/aldus-nova(0)/m/n/10 with the command \TU/lmmonolt10-regular.otf(0)/m/it/10
+ \aliasfontfeatureoption{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 font f
+eature$\OMS/cmsy/m/n/10 i$[]\TU/lmmonolt10-regular.otf(0)/m/it/10 }{$\OMS/cmsy/
+m/n/10 h$[]\TU/aldus-nova(0)/m/it/10 existing name$\OMS/cmsy/m/n/10 i$[]\TU/lmm
+onolt10-regular.otf(0)/m/it/10 }{$\OMS/cmsy/m/n/10 h$[]\TU/aldus-nova(0)/m/it/1
+0 new
+ []
+
+\openout3 = `zzz-39-L-aliasopt.tex'.
+
+File: zzz-39-L-aliasopt.pdf Graphic file (type QTm)
+<use  "zzz-39-L-aliasopt.pdf" > [50]
+Overfull \hbox (4.43005pt too wide) in paragraph at lines 158--166
+\TU/aldus-nova(0)/m/n/10 is. After a \TU/lmmonolt10-regular.otf(0)/m/it/10 \fon
+tspec\TU/aldus-nova(0)/m/n/10 -like command, this is stored inside the \TU/lmmo
+nolt10-regular.otf(0)/m/it/10 \l_fontspec_family_tl
+ []
+
+
+LaTeX Warning: Marginpar on page 51 moved.
+
+[51]
+Overfull \hbox (270.1301pt too wide) in paragraph at lines 249--252
+\TU/aldus-nova(0)/m/n/10 OpenType language tag []\TU/lmmonolt10-regular.otf(0)/
+m/it/10 #2 \TU/aldus-nova(0)/m/n/10 contains the raw OpenType feature tag []\TU
+/lmmonolt10-regular.otf(0)/m/it/10 #3\TU/aldus-nova(0)/m/n/10 . E.g.: []\TU/lmm
+onolt10-regular.otf(0)/m/it/10 \fontspec_if_feature:nnnTF {latn} {ROM} {pnum} {
+True} {False}\TU/aldus-nova(0)/m/n/10 .
+ []
+
+[52]) [53]
+\openout2 = `fontspec-doc-patches.aux'.
+
+ (./fontspec-doc-patches.tex
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <20.74> on input line 4.
+LaTeX Font Info:    External font `cmex10' loaded for size
+(Font)              <14.4> on input line 4.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbackslash '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceleft '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textbraceright '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textless '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package microtype Warning: Unknown slot number of character
+(microtype)                `\textgreater '
+(microtype)                in font encoding `TU' in protrusion list
+(microtype)                `T1-default'.
+
+
+Package hyperref Warning: Token not allowed in a PDF string (Unicode):
+(hyperref)                removing `\char' on input line 21.
+
+
+Package hyperref Warning: Token not allowed in a PDF string (Unicode):
+(hyperref)                removing `\\' on input line 21.
+
+
+Package hyperref Warning: Token not allowed in a PDF string (Unicode):
+(hyperref)                removing `\char' on input line 21.
+
+
+LaTeX Warning: Marginpar on page 54 moved.
+
+) [54
+
+
+]
+Package atveryend Info: Empty hook `BeforeClearDocument' on input line 41.
+Package atveryend Info: Empty hook `AfterLastShipout' on input line 41.
+ (./fontspec-doc.aux (./fontspec-doc-intro.aux)
+(./fontspec-doc-fontsel.aux) (./fontspec-doc-featsel.aux)
+(./fontspec-doc-opentype.aux) (./fontspec-doc-enc.aux)
+(./fontspec-doc-luatex.aux) (./fontspec-doc-xetex.aux) (./fontspec-doc-api.aux)
+(./fontspec-doc-patches.aux))
+Package atveryend Info: Empty hook `AtVeryEndDocument' on input line 41.
+Package atveryend Info: Empty hook `AtEndAfterFileList' on input line 41.
+
+
+LaTeX Font Warning: Some font shapes were not available, defaults substituted.
+
+
+LaTeX Warning: There were undefined references.
+
+Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 41.
+ ) 
+Here is how much of TeX's memory you used:
+ 22757 strings out of 493624
+ 448558 string characters out of 6144511
+ 560700 words of memory out of 5000000
+ 25805 multiletter control sequences out of 15000+600000
+ 21344 words of font info for 108 fonts, out of 8000000 for 9000
+ 1328 hyphenation exceptions out of 8191
+ 74i,9n,86p,10353b,500s stack positions out of 5000i,500n,10000p,200000b,80000s
+
+Output written on fontspec-doc.pdf (54 pages).
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.out b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.out
new file mode 100644
index 00000000000..d4d16a7b9e8
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.out
@@ -0,0 +1,72 @@
+\BOOKMARK [0][-]{part.1}{\376\377\000I\000\040\000G\000e\000t\000t\000i\000n\000g\000\040\000s\000t\000a\000r\000t\000e\000d}{}% 1
+\BOOKMARK [1][-]{section.1}{\376\377\000H\000i\000s\000t\000o\000r\000y}{part.1}% 2
+\BOOKMARK [1][-]{section.2}{\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n}{part.1}% 3
+\BOOKMARK [2][-]{subsection.2.1}{\376\377\000A\000c\000k\000n\000o\000w\000l\000e\000d\000g\000e\000m\000e\000n\000t\000s}{section.2}% 4
+\BOOKMARK [1][-]{section.3}{\376\377\000P\000a\000c\000k\000a\000g\000e\000\040\000l\000o\000a\000d\000i\000n\000g\000\040\000a\000n\000d\000\040\000o\000p\000t\000i\000o\000n\000s}{part.1}% 5
+\BOOKMARK [2][-]{subsection.3.1}{\376\377\000M\000a\000t\000h\000s\000\040\000f\000o\000n\000t\000s\000\040\000a\000d\000j\000u\000s\000t\000m\000e\000n\000t\000s}{section.3}% 6
+\BOOKMARK [2][-]{subsection.3.2}{\376\377\000C\000o\000n\000f\000i\000g\000u\000r\000a\000t\000i\000o\000n}{section.3}% 7
+\BOOKMARK [2][-]{subsection.3.3}{\376\377\000W\000a\000r\000n\000i\000n\000g\000s}{section.3}% 8
+\BOOKMARK [0][-]{part.2}{\376\377\000I\000I\000\040\000G\000e\000n\000e\000r\000a\000l\000\040\000f\000o\000n\000t\000\040\000s\000e\000l\000e\000c\000t\000i\000o\000n}{}% 9
+\BOOKMARK [1][-]{section.4}{\376\377\000F\000o\000n\000t\000\040\000s\000e\000l\000e\000c\000t\000i\000o\000n}{part.2}% 10
+\BOOKMARK [2][-]{subsection.4.1}{\376\377\000B\000y\000\040\000f\000o\000n\000t\000\040\000n\000a\000m\000e}{section.4}% 11
+\BOOKMARK [2][-]{subsection.4.2}{\376\377\000B\000y\000\040\000f\000i\000l\000e\000\040\000n\000a\000m\000e}{section.4}% 12
+\BOOKMARK [2][-]{subsection.4.3}{\376\377\000Q\000u\000e\000r\000y\000i\000n\000g\000\040\000w\000h\000e\000t\000h\000e\000r\000\040\000a\000\040\000f\000o\000n\000t\000\040\000`\000e\000x\000i\000s\000t\000s\000'}{section.4}% 13
+\BOOKMARK [1][-]{section.5}{\376\377\000C\000o\000m\000m\000a\000n\000d\000s\000\040\000t\000o\000\040\000s\000e\000l\000e\000c\000t\000\040\000f\000o\000n\000t\000\040\000f\000a\000m\000i\000l\000i\000e\000s}{part.2}% 14
+\BOOKMARK [2][-]{subsection.5.1}{\376\377\000M\000o\000r\000e\000\040\000c\000o\000n\000t\000r\000o\000l\000\040\000o\000v\000e\000r\000\040\000f\000o\000n\000t\000\040\000s\000h\000a\000p\000e\000\040\000s\000e\000l\000e\000c\000t\000i\000o\000n}{section.5}% 15
+\BOOKMARK [2][-]{subsection.5.2}{\376\377\000S\000p\000e\000c\000i\000f\000i\000c\000a\000l\000l\000y\000\040\000c\000h\000o\000o\000s\000i\000n\000g\000\040\000t\000h\000e\000\040\000n\000f\000s\000s\000\040\000f\000a\000m\000i\000l\000y}{section.5}% 16
+\BOOKMARK [2][-]{subsection.5.3}{\376\377\000C\000h\000o\000o\000s\000i\000n\000g\000\040\000a\000d\000d\000i\000t\000i\000o\000n\000a\000l\000\040\000n\000f\000s\000s\000\040\000f\000o\000n\000t\000\040\000f\000a\000c\000e\000s}{section.5}% 17
+\BOOKMARK [2][-]{subsection.5.4}{\376\377\000M\000a\000t\000h\000\050\000s\000\051\000\040\000f\000o\000n\000t\000s}{section.5}% 18
+\BOOKMARK [1][-]{section.6}{\376\377\000M\000i\000s\000c\000e\000l\000l\000a\000n\000e\000o\000u\000s\000\040\000f\000o\000n\000t\000\040\000s\000e\000l\000e\000c\000t\000i\000n\000g\000\040\000d\000e\000t\000a\000i\000l\000s}{part.2}% 19
+\BOOKMARK [0][-]{part.3}{\376\377\000I\000I\000I\000\040\000O\000p\000e\000n\000T\000y\000p\000e}{}% 20
+\BOOKMARK [1][-]{section.7}{\376\377\000I\000n\000t\000r\000o\000d\000u\000c\000t\000i\000o\000n}{part.3}% 21
+\BOOKMARK [2][-]{subsection.7.1}{\376\377\000H\000o\000w\000\040\000t\000o\000\040\000s\000e\000l\000e\000c\000t\000\040\000f\000o\000n\000t\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{section.7}% 22
+\BOOKMARK [2][-]{subsection.7.2}{\376\377\000H\000o\000w\000\040\000d\000o\000\040\000I\000\040\000k\000n\000o\000w\000\040\000w\000h\000a\000t\000\040\000f\000o\000n\000t\000\040\000f\000e\000a\000t\000u\000r\000e\000s\000\040\000a\000r\000e\000\040\000s\000u\000p\000p\000o\000r\000t\000e\000d\000\040\000b\000y\000\040\000m\000y\000\040\000f\000o\000n\000t\000s\000?}{section.7}% 23
+\BOOKMARK [1][-]{section.8}{\376\377\000O\000p\000e\000n\000T\000y\000p\000e\000\040\000f\000o\000n\000t\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{part.3}% 24
+\BOOKMARK [2][-]{subsection.8.1}{\376\377\000T\000a\000g\000-\000b\000a\000s\000e\000d\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{section.8}% 25
+\BOOKMARK [2][-]{subsection.8.2}{\376\377\000L\000e\000t\000t\000e\000r\000s}{section.8}% 26
+\BOOKMARK [2][-]{subsection.8.3}{\376\377\000S\000t\000y\000l\000e}{section.8}% 27
+\BOOKMARK [2][-]{subsection.8.4}{\376\377\000D\000i\000a\000c\000r\000i\000t\000i\000c\000s}{section.8}% 28
+\BOOKMARK [2][-]{subsection.8.5}{\376\377\000K\000e\000r\000n\000i\000n\000g}{section.8}% 29
+\BOOKMARK [2][-]{subsection.8.6}{\376\377\000C\000h\000a\000r\000a\000c\000t\000e\000r\000\040\000w\000i\000d\000t\000h}{section.8}% 30
+\BOOKMARK [2][-]{subsection.8.7}{\376\377\000V\000e\000r\000t\000i\000c\000a\000l\000\040\000t\000y\000p\000e\000s\000e\000t\000t\000i\000n\000g}{section.8}% 31
+\BOOKMARK [2][-]{subsection.8.8}{\376\377\000N\000u\000m\000e\000r\000i\000c\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{section.8}% 32
+\BOOKMARK [2][-]{subsection.8.9}{\376\377\000O\000p\000e\000n\000T\000y\000p\000e\000\040\000s\000c\000r\000i\000p\000t\000s\000\040\000a\000n\000d\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s}{section.8}% 33
+\BOOKMARK [0][-]{part.4}{\376\377\000I\000V\000\040\000C\000o\000m\000m\000a\000n\000d\000s\000\040\000f\000o\000r\000\040\000a\000c\000c\000e\000n\000t\000s\000\040\000a\000n\000d\000\040\000s\000y\000m\000b\000o\000l\000s\000\040\000\050\000`\000e\000n\000c\000o\000d\000i\000n\000g\000s\000'\000\051}{}% 34
+\BOOKMARK [1][-]{section.9}{\376\377\000A\000\040\000n\000e\000w\000\040\000U\000n\000i\000c\000o\000d\000e\000-\000b\000a\000s\000e\000d\000\040\000e\000n\000c\000o\000d\000i\000n\000g\000\040\000f\000r\000o\000m\000\040\000s\000c\000r\000a\000t\000c\000h}{part.4}% 35
+\BOOKMARK [1][-]{section.10}{\376\377\000A\000d\000j\000u\000s\000t\000i\000n\000g\000\040\000a\000\040\000p\000r\000e\000-\000e\000x\000i\000s\000t\000i\000n\000g\000\040\000e\000n\000c\000o\000d\000i\000n\000g}{part.4}% 36
+\BOOKMARK [1][-]{section.11}{\376\377\000S\000u\000m\000m\000a\000r\000y\000\040\000o\000f\000\040\000c\000o\000m\000m\000a\000n\000d\000s}{part.4}% 37
+\BOOKMARK [0][-]{part.5}{\376\377\000V\000\040\000L\000u\000a\000T\000e\000X\000-\000o\000n\000l\000y\000\040\000f\000o\000n\000t\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{}% 38
+\BOOKMARK [1][-]{section.12}{\376\377\000C\000u\000s\000t\000o\000m\000\040\000f\000o\000n\000t\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{part.5}% 39
+\BOOKMARK [0][-]{part.6}{\376\377\000V\000I\000\040\000F\000o\000n\000t\000s\000\040\000a\000n\000d\000\040\000f\000e\000a\000t\000u\000r\000e\000s\000\040\000w\000i\000t\000h\000\040\000X\000e\000T\000e\000X}{}% 40
+\BOOKMARK [1][-]{section.13}{\376\377\000X\000e\000T\000e\000X\000-\000o\000n\000l\000y\000\040\000f\000o\000n\000t\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{part.6}% 41
+\BOOKMARK [2][-]{subsection.13.1}{\376\377\000M\000a\000p\000p\000i\000n\000g}{section.13}% 42
+\BOOKMARK [2][-]{subsection.13.2}{\376\377\000D\000i\000f\000f\000e\000r\000e\000n\000t\000\040\000f\000o\000n\000t\000\040\000t\000e\000c\000h\000n\000o\000l\000o\000g\000i\000e\000s\000:\000\040\000a\000a\000t\000\040\000a\000n\000d\000\040\000O\000p\000e\000n\000T\000y\000p\000e}{section.13}% 43
+\BOOKMARK [2][-]{subsection.13.3}{\376\377\000O\000p\000t\000i\000c\000a\000l\000\040\000f\000o\000n\000t\000\040\000s\000i\000z\000e\000s}{section.13}% 44
+\BOOKMARK [1][-]{section.14}{\376\377\000M\000a\000c\000\040\000O\000S\000\040\000X\000'\000s\000\040\000a\000a\000t\000\040\000f\000o\000n\000t\000s}{part.6}% 45
+\BOOKMARK [2][-]{subsection.14.1}{\376\377\000L\000i\000g\000a\000t\000u\000r\000e\000s}{section.14}% 46
+\BOOKMARK [2][-]{subsection.14.2}{\376\377\000L\000e\000t\000t\000e\000r\000s}{section.14}% 47
+\BOOKMARK [2][-]{subsection.14.3}{\376\377\000N\000u\000m\000b\000e\000r\000s}{section.14}% 48
+\BOOKMARK [2][-]{subsection.14.4}{\376\377\000C\000o\000n\000t\000e\000x\000t\000u\000a\000l\000s}{section.14}% 49
+\BOOKMARK [2][-]{subsection.14.5}{\376\377\000V\000e\000r\000t\000i\000c\000a\000l\000\040\000p\000o\000s\000i\000t\000i\000o\000n}{section.14}% 50
+\BOOKMARK [2][-]{subsection.14.6}{\376\377\000F\000r\000a\000c\000t\000i\000o\000n\000s}{section.14}% 51
+\BOOKMARK [2][-]{subsection.14.7}{\376\377\000V\000a\000r\000i\000a\000n\000t\000s}{section.14}% 52
+\BOOKMARK [2][-]{subsection.14.8}{\376\377\000A\000l\000t\000e\000r\000n\000a\000t\000e\000s}{section.14}% 53
+\BOOKMARK [2][-]{subsection.14.9}{\376\377\000S\000t\000y\000l\000e}{section.14}% 54
+\BOOKMARK [2][-]{subsection.14.10}{\376\377\000C\000J\000K\000\040\000s\000h\000a\000p\000e}{section.14}% 55
+\BOOKMARK [2][-]{subsection.14.11}{\376\377\000C\000h\000a\000r\000a\000c\000t\000e\000r\000\040\000w\000i\000d\000t\000h}{section.14}% 56
+\BOOKMARK [2][-]{subsection.14.12}{\376\377\000V\000e\000r\000t\000i\000c\000a\000l\000\040\000t\000y\000p\000e\000s\000e\000t\000t\000i\000n\000g}{section.14}% 57
+\BOOKMARK [2][-]{subsection.14.13}{\376\377\000D\000i\000a\000c\000r\000i\000t\000i\000c\000s}{section.14}% 58
+\BOOKMARK [2][-]{subsection.14.14}{\376\377\000A\000n\000n\000o\000t\000a\000t\000i\000o\000n}{section.14}% 59
+\BOOKMARK [0][-]{part.7}{\376\377\000V\000I\000I\000\040\000C\000u\000s\000t\000o\000m\000i\000s\000a\000t\000i\000o\000n\000\040\000a\000n\000d\000\040\000p\000r\000o\000g\000r\000a\000m\000m\000i\000n\000g\000\040\000i\000n\000t\000e\000r\000f\000a\000c\000e}{}% 60
+\BOOKMARK [1][-]{section.15}{\376\377\000D\000e\000f\000i\000n\000i\000n\000g\000\040\000n\000e\000w\000\040\000f\000e\000a\000t\000u\000r\000e\000s}{part.7}% 61
+\BOOKMARK [1][-]{section.16}{\376\377\000D\000e\000f\000i\000n\000i\000n\000g\000\040\000n\000e\000w\000\040\000s\000c\000r\000i\000p\000t\000s\000\040\000a\000n\000d\000\040\000l\000a\000n\000g\000u\000a\000g\000e\000s}{part.7}% 62
+\BOOKMARK [1][-]{section.17}{\376\377\000G\000o\000i\000n\000g\000\040\000b\000e\000h\000i\000n\000d\000\040\000f\000o\000n\000t\000s\000p\000e\000c\000'\000s\000\040\000b\000a\000c\000k}{part.7}% 63
+\BOOKMARK [1][-]{section.18}{\376\377\000R\000e\000n\000a\000m\000i\000n\000g\000\040\000e\000x\000i\000s\000t\000i\000n\000g\000\040\000f\000e\000a\000t\000u\000r\000e\000s\000\040\000\046\000\040\000o\000p\000t\000i\000o\000n\000s}{part.7}% 64
+\BOOKMARK [1][-]{section.19}{\376\377\000P\000r\000o\000g\000r\000a\000m\000m\000i\000n\000g\000\040\000i\000n\000t\000e\000r\000f\000a\000c\000e}{part.7}% 65
+\BOOKMARK [2][-]{subsection.19.1}{\376\377\000V\000a\000r\000i\000a\000b\000l\000e\000s}{section.19}% 66
+\BOOKMARK [2][-]{subsection.19.2}{\376\377\000F\000u\000n\000c\000t\000i\000o\000n\000s\000\040\000f\000o\000r\000\040\000l\000o\000a\000d\000i\000n\000g\000\040\000n\000e\000w\000\040\000f\000o\000n\000t\000s\000\040\000a\000n\000d\000\040\000f\000a\000m\000i\000l\000i\000e\000s}{section.19}% 67
+\BOOKMARK [2][-]{subsection.19.3}{\376\377\000C\000o\000n\000d\000i\000t\000i\000o\000n\000a\000l\000s}{section.19}% 68
+\BOOKMARK [0][-]{part.8}{\376\377\000V\000I\000I\000I\000\040\000T\000h\000e\000\040\000`\000i\000m\000p\000r\000o\000v\000e\000m\000e\000n\000t\000'\000\040\000o\000f\000\040\000L\000a\000T\000e\000X\0002\003\265\000\040\000a\000n\000d\000\040\000o\000t\000h\000e\000r\000\040\000p\000a\000c\000k\000a\000g\000e\000s}{}% 69
+\BOOKMARK [1][-]{section.20}{\376\377\000V\000e\000r\000b\000a\000t\000i\000m}{part.8}% 70
+\BOOKMARK [1][-]{section.21}{\376\377\000D\000i\000s\000c\000r\000e\000t\000i\000o\000n\000a\000r\000y\000\040\000h\000y\000p\000h\000e\000n\000a\000t\000i\000o\000n\000:\000\040\000`\0004\0005}{part.8}% 71
+\BOOKMARK [1][-]{section.22}{\376\377\000C\000o\000m\000m\000a\000n\000d\000s\000\040\000f\000o\000r\000\040\000o\000l\000d\000-\000s\000t\000y\000l\000e\000\040\000a\000n\000d\000\040\000l\000i\000n\000i\000n\000g\000\040\000n\000u\000m\000b\000e\000r\000s}{part.8}% 72
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.pdf b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.pdf
new file mode 100644
index 00000000000..f9390d2903f
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.pdf
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.synctex.gz b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.synctex.gz
new file mode 100644
index 00000000000..63e781e9053
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.synctex.gz
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.tex b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.tex
index 4773cb4a9b7..ccd3f1f80c5 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.tex
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.tex
@@ -1,255 +1,10 @@
 
-\ifdefined \XeTeXOTcountscripts \else
-  \makeatletter
+\ifdefined \XeTeXOTcountscripts \else \makeatletter
   \@latex@error{^^J*** The fontspec documentation can only be typeset with XeTeX at present! ***\@gobble}\@ehc
 \fi
 
 \documentclass[a4paper]{ltxdoc}
-
-\makeatletter
-
-\usepackage{booktabs,calc,caption,color,enumitem,fancyvrb,hologo,graphicx,ifthen,url,varioref,varwidth,microtype,tocloft,framed}
-
-% ToC formatting:
-\setlength\cftsubsecnumwidth{1.4\cftsubsecnumwidth}
-%\def\@cfttocstart{\small\begin{multicols}{2}}
-%\def\@cfttocfinish{\end{multicols}}
-
-\fvset{gobble=0}
-
-\captionsetup[table]{position=above}
-\captionsetup[figure]{position=above}
-
-\usepackage{tgpagella,eulervm}
-\usepackage{inconsolata}
-\usepackage[
-  bookmarks=true,
-  colorlinks=true,
-  linkcolor=niceblue,
-  urlcolor=niceblue,
-  citecolor=niceblue,
-  pdftitle={The fontspec package},
-  pdfsubject={Advanced font selection for XeLaTeX/LuaLaTeX},
-  pdfauthor={Will Robertson},
-  pdfkeywords={xetex, xelatex, luatex, lualatex, unicode, opentype, aat}
-  ]{hyperref}
-
-%% ToC
-\def\@dotsep{1000}
-\setcounter{tocdepth}{2}
-\setlength\columnseprule{0.4pt}
-\renewcommand\tableofcontents{\relax
-  \begin{multicols}{2}[\section*{\contentsname}]\relax
-    \@starttoc{toc}\relax
-  \end{multicols}}
-
-%% Index
-\setcounter{IndexColumns}{2}
-\renewenvironment{theglossary}
-  {\small\list{}{}
-     \item\relax
-     \glossary@prologue\GlossaryParms
-     \let\item\@idxitem \ignorespaces
-     \def\pfill{\hspace*{\fill}}}
-  {\endlist}
-
-%% varioref definitions:
-\labelformat{table}{Table~#1}
-\labelformat{section}{Section~#1}
-\labelformat{subsection}{Section~#1}
-
-\definecolor{niceblue}{rgb}{0.1,0.2,0.8}
-
-\newsavebox\X
-\newsavebox\Y
-
-\newcounter{example}
-
-\newcommand\exref[1]{Example~\ref{ex:#1}}
-\newcommand\Exref[1]{Example~\ref{ex:#1}}
-
-\newenvironment{Xexample}[3][]
-  {\VerbatimEnvironment\begin{Fexample}[#1]{#2}{#3}{X}}
-  {\end{Fexample}}
-
-\newenvironment{Lexample}[3][]
-  {\VerbatimEnvironment\begin{Fexample}[#1]{#2}{#3}{L}}
-  {\end{Fexample}}
-
-
-
-\newenvironment{Fexample}[4][]
-  {%
-    \def\options{#1}%
-    \def\filename{#2}%
-    \def\captiontext{#3}%
-    \def\prefix{#4}
-    \refstepcounter{example}%
-    \label{ex:\filename}%
-    \IfFileExists{zzz-\theexample-\prefix-\filename.tex}{}{%
-      \immediate\write18{rm -f zzz-\theexample-* ;}%
-    }%
-    \VerbatimEnvironment
-    \begin{VerbatimOut}{zzz-\theexample-\prefix-\filename.tex}}
-% text in the environment
-  {\end{VerbatimOut}
-    \begin{figure}
-      \setlength\parindent{0pt}%
-      \edef\@tempa{[gobble=0,fontsize=\noexpand\small,\options]}%
-      \savebox\X{%
-                  \expandafter\BVerbatimInput
-                  \@tempa{zzz-\theexample-\prefix-\filename.tex}%
-                }%
-      \IfFileExists{zzz-\theexample-\prefix-\filename.pdf}{}
-         {%
-           \edef\1{%
-             \csname prog@\prefix\endcsname
-             "%
-             \unexpanded{%
-               \documentclass{article}%
-               \usepackage{booktabs,ifthen,graphicx,xcolor,varwidth}
-               \usepackage[active,tightpage]{preview}%
-               \usepackage{fontspec}%
-               \defaultfontfeatures{Ligatures=TeX} \begin{document}\begin{preview}\begin{varwidth}{0.7\linewidth}\input} zzz-\theexample-\prefix-\filename.tex
-             \unexpanded{\end{varwidth}\end{preview}\end{document}}
-             "
-           }%
-           \immediate\write18{\unexpanded\expandafter{\1}}%
-         }%
-      \savebox\Y{%
-      \IfFileExists{zzz-\theexample-\prefix-\filename.pdf}
-          {\includegraphics{zzz-\theexample-\prefix-\filename.pdf}}
-          {\color{red}\itshape ---Graphic not generated---}%
-      }
-      % TYPESETTING
-      \rule[0.5\baselineskip]{\columnwidth}{1pt}%
-      \vspace{-1.2ex}%
-      \def\@tempa{\small\textsf{Example~\theexample:~}}%
-      \settowidth\@tempdima{\@tempa\captiontext}%
-      \par
-      \ifdim\@tempdima>\linewidth
-        \settowidth\@tempdima{\@tempa}%
-        \@tempa\parbox[t]{\linewidth-\@tempdima}{\small\captiontext}%
-        \vspace{0.4\baselineskip}%
-      \else
-        \parbox{\linewidth}{\centering\@tempa~\captiontext}%
-      \fi
-      \par\rule[0.4\baselineskip]{\columnwidth}{0.4pt}\par
-      \ifdim\dimexpr\wd\X+\wd\Y>\linewidth\relax
-        \null\hfill\makebox[0pt][r]{\usebox\Y}\usebox\X
-      \else
-        \hfill\usebox\Y\hfill\usebox\X
-      \fi
-      \par\rule[0.5\baselineskip]{\columnwidth}{1pt}
-    \end{figure}
-}
-
-\def\prog@X{xelatex
-               -jobname=zzz-\theexample-X-\filename\space}
-
-\def\prog@L{lualatex
-               -jobname=zzz-\theexample-L-\filename\space}
-
-%%%%%%%%%%%%%%%%%%%%%%
-
-\newcommand*\setexsize[1]{\let\examplesize#1}
-\newcommand*\setverbwidth[1]{\def\auxwidth{#1}}
-
-%% Various labelling commands:
-\newcommand*\name[1]{{#1}}
-\newcommand*\pkg[1]{\textsf{#1}}
-\newcommand*\opt[1]{\texttt{#1}}
-\newcommand*\feat[1]{\texttt{#1}}
-
-\let\latin\textit
-\def\eg{\latin{e.g.}}
-\def\ie{\latin{i.e.}}
-\def\Eg{\latin{E.g.}}
-\def\Ie{\latin{I.e.}}
-\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
-
-\newcommand\note[1]{\unskip\footnote{#1}}
-
-\def\MacOSX{Mac~OS~X}
-\def\AAT{\textsc{aat}}
-\def\ATSUI{\textsc{atsui}}
-
-\newcommand\NFSS{\textsc{nfss}}
-\newcommand\XeTeX{\hologo{XeTeX}}
-\newcommand\XeLaTeX{\hologo{XeLaTeX}}
-\newcommand\LuaTeX{\hologo{LuaTeX}}
-\newcommand\LuaLaTeX{\hologo{LuaLaTeX}}
-
-
-%% (La)TeX font-related declarations:
-\linespread{1.05}      % Pagella needs more space between lines
-\frenchspacing         % Remove ugly extra space after punctuation
-
-\newcounter{argument}
-\g@addto@macro\endmacro{\setcounter{argument}{0}}
-\newcommand*\darg[1]{%
-  \stepcounter{argument}%
-  \noindent{\ttfamily\char`\#\theargument~:~}#1\par}
-\newcommand*\doarg[1]{%
-  \stepcounter{argument}%
-  \noindent{\ttfamily\makebox[0pt][r]{[}\char`\#\theargument]:~}#1\par}
-
-\newcommand\unichar[2]{\textsc{\MakeLowercase{u+#1: #2}}}
-
-\newcommand\cmdbox[1]{%
-  \smallskip\par\noindent
-  \fbox{\begin{varwidth}{\linewidth}
-    #1%
-  \end{varwidth}}%
-  \smallskip
-}
-\def\CMD#1{\texttt{\null#1\unskip}}
-
-\usepackage{xparse}
-\NewDocumentCommand \otf {somm} {%
-  \IfBooleanTF #1
-  {%
-    \gdef\NOTE{\par\smallskip {$\ast$ \footnotesize This feature is activated by default.}}%
-    \IfNoValueTF {#2} {\gdef\offname{No#3}}{\gdef\offname{#2}}%
-    \featname&#3&$\ast$&\texttt{#4}\\
-    \featname&\offname&&\texttt{#4}~~{\footnotesize(\textit{deactivate})}\\
-  }
-  {\featname&#3&&\texttt{#4}\\}%
-}
-\newenvironment{features}[1]{%
-  \def\NOTE{}
-  \def\thisfeatname{#1}%
-  \def\featname{\thisfeatname~~\texttt=~~\null\gdef\featname{}}%
-  \begin{table}
-    \caption{Options for the OpenType font feature `\thisfeatname'.}
-    \edef\@tempa{\noexpand\label{feat:\thisfeatname}}\@tempa
-    \centering
-    \begin{tabular}{@{}l@{}l@{\hspace{0.5\tabcolsep}}l@{\hspace{0.5\tabcolsep}}l@{}}
-    \toprule
-    Feature & Option && Tag \\
-    \midrule
-}{
-    \bottomrule
-    \end{tabular}
-    \NOTE
-  \end{table}
-}
-
-%%%%%%%%%%%
-
-\def \MakePrivateLetters {%
-  \catcode `\@ = 11
-  \catcode `\_ = 11
-  \catcode `\: = 11
-}
-
-%% for LaTeX3 csnames
-\catcode `\_= 11
-
-\renewcommand\partname{Part}
-
-\makeatother
-
+\usepackage{fontspec-doc-style}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -260,7 +15,6 @@
 \begin{document}
 
 \GetFileInfo{fontspec.dtx}
-\errorcontextlines=999                ^^A% Show up all my mistakes
 
 \title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX}
 \author{
@@ -270,2668 +24,17 @@
 \date{\filedate \qquad \fileversion}
 
 \maketitle
-
 \tableofcontents
-
 \newpage
 
-\part{Getting started}
-
-\section{History}
-
-This package began life as a \LaTeX\ interface to select system-installed
-\MacOSX\ fonts in \name{Jonathan Kew}'s \XeTeX, the first widely-used
-Unicode extension to \TeX. Over time, \XeTeX\ was extended to support OpenType
-fonts and then was ported into a cross-platform program to run also on Windows
-and Linux.
-
-More recently, \LuaTeX\ is fast becoming the \TeX\ engine of the day; it
-supports Unicode encodings and OpenType fonts and opens up the internals of
-\TeX\ via the Lua programming language. Hans Hagen's Con\TeX t Mk.\,IV is a
-re-write of his powerful typesetting system, taking full advantage of
-\LuaTeX's features including font support; a kernel of his work in this area
-has been extracted to be useful for other \TeX\ macro systems as well, and
-this has enabled \pkg{fontspec} to be adapted for \LaTeX\ when run with the
-\LuaTeX\ engine.
-
-\section{Introduction}
-
-The \pkg{fontspec} package allows users of either \XeTeX\ or \LuaTeX\ to
-load OpenType fonts in a \LaTeX\ document. No font installation is necessary,
-and font features can be selected and used as desired throughout the document.
-
-Without \pkg{fontspec}, it is necessary to write cumbersome font definition
-files for \LaTeX, since \LaTeX's font selection scheme (known as the
-`\textsc{nfss}') has a lot going on behind the scenes to allow easy
-commands like \cmd\emph\ or \cmd\bfseries. With an uncountable number of
-fonts now available for use, however, it becomes less desirable to have to
-write these font definition (|.fd|) files for every font one wishes to use.
-
-Because \pkg{fontspec} is designed to work in a variety of modes, this
-user documentation is split into separate sections that are designed to be
-relatively independent. Nonetheless, the basic functionality all behaves in
-the same way, so previous users of \pkg{fontspec} under \XeTeX\ should have
-little or no difficulty switching over to \LuaTeX.
-
-This manual can get rather in-depth, as there are a lot of details
-to cover. See the documents \path{fontspec-example.tex} for a complete minimal example
-to get started quickly.
-
-
-\subsection{Acknowledgements}
-
-This package could not have been possible without the early and continued support
-the author of \XeTeX, Jonathan Kew. When I started this package, he steered
-me many times in the right direction.
-
-I've had great
-feedback over the years on feature requests, documentation queries, bug reports, font suggestions, and so on from lots of people all around the world.
-Many thanks to you all.
-
-Thanks to David Perry and Markus B\"ohning for numerous documentation
-improvements and David Perry again for contributing the text for one of the
-sections of this manual.
-
-Special thanks to Khaled Hosny, who was the driving force behind the support for \LuaLaTeX, ultimately leading to version 2.0 of the package.
-
-\section{Package loading and options}
-
-For basic use, no package options are required:
-\begin{Verbatim}
-  \usepackage{fontspec}
-\end{Verbatim}
-Package options will be introduced below; some preliminary details are discussed first.
-
-\paragraph{Font encodings}
-\null\marginpar{\null\hfill\fbox{\color{red}\textsc{update}!}}%
-The 2016 release of \pkg{fontspec} initiates some changes for font encodings and the loading of \pkg{xunicode}.
-
-A new package option, \texttt{tuenc}, which is selected by default, switches the \textsc{nfss} font encoding to \texttt{TU}.
-\texttt{TU} is a new Unicode font encoding, intended for both \XeTeX\ and \LuaTeX\ engines, and automatically contains support for symbols covered by \LaTeX's traditional \texttt{T1} and \texttt{TS1} font encodings (for example, |\%|, |\textbullet|, |\"u|, and so on).
-As a result, with this package option, Ross Moore's \pkg{xunicode} package is \textbf{not} loaded.
-
-The old behaviour can be achieved by loading the \texttt{euenc} package option. This selects the \texttt{EU1} or \texttt{EU2} encoding (\XeTeX/\LuaTeX, resp.) and loads the \pkg{xunicode} package.
-Package authors and users who have referred explicitly to the encoding names \texttt{EU1} or \texttt{EU2} should update their code or documents.
-(See internal variable names described in \vref{sec:api} for how to do this properly.)
-
-\emph{While \pkg{fontspec} is providing the \texttt{TU} encoding, its interface should be considered \textsc{experimental}; feedback welcome. Once \texttt{TU} is incorporated into the \LaTeXe\ kernel directly (later in 2016), it will be considered stable.}
-
-
-\paragraph{\LuaTeX\ users only}
-In order to load fonts by their name rather than by their filename (\eg,
-`Latin Modern Roman' instead of `ec-lmr10'), you may need to run the script
-\texttt{luaotfload-tool}, which is distributed with the \pkg{luaotfload}
-package. Note that if you do not execute this script beforehand, the first
-time you attempt to typeset the process will pause for (up to) several
-minutes. (But only the first time.)
-Please see the \pkg{luaotfload} documentation for more information.
-
-
-\paragraph{\pkg{babel}}
-\emph{The \pkg{babel} package is only supported for certain languages.}
-Especially Vietnamese, Greek, and Hebrew at least might not work correctly, as far as I can tell.
-There's a better chance with Cyrillic and Latin-based languages, however---\pkg{fontspec} ensures at least that fonts should load correctly.
-The \pkg{polyglossia} package is recommended instead as a modern replacement for \pkg{babel}.
-
-
-
-\subsection{Maths fonts adjustments}
-By default, \pkg{fontspec} adjusts \LaTeX's default maths setup in order to maintain the correct Computer Modern symbols when the roman font changes.
-However, it will attempt to avoid doing this if another maths font package is loaded (such as \pkg{mathpazo} or the \pkg{unicode-math} package).
-
-If you find that \pkg{fontspec} is incorrectly changing the maths font when it shouldn't be, apply the |no-math| package option to manually suppress its selection of the maths fonts.
-
-\subsection{Configuration}
-\label{sec:config}
-
-If you wish to customise any part of the
-\pkg{fontspec} interface, this should be done by creating your own
-\texttt{fontspec.cfg} file,
-which will be automatically loaded if it is found by \XeTeX\ or \LuaTeX.
-A |fontspec.cfg| file is distributed with \pkg{fontspec} with a small number of defaults set up within it.
-
-To customise \pkg{fontspec} to your liking, use the standard |.cfg| file as a starting point or write your own from scratch, then either place it in the same folder as the main document for isolated cases, or in a location
-that \XeTeX\ or \LuaTeX\ searches by default; \eg\ in Mac\TeX: \path{~/Library/texmf/tex/latex/}.
-
-The package option |no-config| will suppress the loading of the |fontspec.cfg| file under all circumstances.
-
-\subsection{Warnings}
-\label{sec:quiet-warnings}
-
-This package can give some warnings that can be harmless if you know what
-you're doing. Use the |quiet| package option to write these warnings to the
-transcript (\texttt{.log}) file instead.
-
-Use the |silent| package option to completely suppress these warnings if you
-don't even want the |.log| file cluttered up.
-
-
-
-
-
-\part{General font selection}
-
-This section concerns the variety of commands that can be used to select
-fonts.
-
-\cmdbox{%
-  \CMD{\string\fontspec}\marg{font name}\oarg{font features}\\
-  \CMD{\string\setmainfont}\marg{font name}\oarg{font features}\\
-  \CMD{\string\setsansfont}\marg{font name}\oarg{font features}\\
-  \CMD{\string\setmonofont}\marg{font name}\oarg{font features}\\
-  \CMD{\string\newfontfamily}\meta{cmd}\marg{font name}\oarg{font features}
-}
-
-These are the main font-selecting commands of this package.
-The \cs{fontspec} command selects a font for one-time use; all
-others should be used to define the standard fonts used in a document, as shown in \exref{fontload}.
-Here, the scales of the fonts have been chosen to equalise their
-lowercase letter heights. The \feat{Scale} font feature will be discussed
-further in \vref{sec:font-ind-features}, including methods for automatic
-scaling.
-
-\begin{Lexample}{fontload}{Loading the default, sans serif, and monospaced fonts.}
-  \setmainfont{texgyrebonum-regular.otf}
-  \setsansfont{lmsans10-regular.otf}[Scale=MatchLowercase]
-  \setmonofont{Inconsolata.otf}[Scale=MatchLowercase]
-
-  \rmfamily Pack my box with five dozen liquor jugs\par
-  \sffamily Pack my box with five dozen liquor jugs\par
-  \ttfamily Pack my box with five dozen liquor jugs
-\end{Lexample}
-
-The font features argument accepts comma separated
-\meta{font feature}=\meta{option} lists; these are described in later:
-\begin{itemize}
-\item For general font features, see \vref{sec:font-ind-features}
-\item For OpenType fonts, see Part~\vref{sec:opentype-features}
-\item For \XeTeX-only general font features, see Part~\vref{sec:xetex-features}
-\item For \LuaTeX-only general font features, see Part~\vref{sec:luatex-features}
-\item For features for \AAT\ fonts in \XeTeX, see \vref{sec:aat-features}
-\end{itemize}
-
-\section{Font selection}
-
-In both \LuaTeX\ and \XeTeX, fonts can be selected either by `font name' or
-by `file name', but there are some differences in how each engine finds and selects fonts --- don't be too surprised if a font invocation in one engine needs correction to work in the other.
-
-\subsection{By font name}
-
-Fonts known to \LuaTeX\ or \XeTeX\ may be loaded by their standard names as
-you'd speak them out loud, such as \emph{Times New Roman} or
-\emph{Adobe Garamond}.
-`Known to' in this case generally means `exists in a standard fonts location'
-such as |~/Library/Fonts| on \MacOSX, or |C:\Windows\Fonts| on Windows.
-In \LuaTeX, fonts found in the \textsc{texmf} tree can also be loaded by name.
-
-The simplest example might be something like
-\begin{Verbatim}
-  \setmainfont{Cambria}[ ... ]
-\end{Verbatim}
-in which the bold and italic fonts will be found automatically
-(if they exist) and are immediately accessible with the usual
-\cs{textit} and \cs{textbf} commands.
-
-The `font name' can be found in various ways, such as by looking in the name listed in a application like \emph{Font Book} on Mac~OS~X.
-Alternatively, \TeX{}Live contains the \texttt{otfinfo} command line program, which can query this information; for example:
-\begin{Verbatim}
-    otfinfo -a `kpsewhich lmroman10-regular.otf`
-\end{Verbatim}
-results in `\texttt{LM Roman 10}'.
-
-\subsection{By file name}
-\label{sec:by-file-name}
-
-\XeTeX\ and \LuaTeX\ also allow fonts to be loaded by file name instead of font name.
-When you have a very large collection of fonts, you will sometimes not
-wish to have them all installed in your system's font directories.
-In this case, it is more convenient to load them from a different location on your disk.
-This technique is also necessary in \XeTeX\ when loading OpenType fonts that are present within your \TeX\ distribution, such as \path{/usr/local/texlive/2013/texmf-dist/fonts/opentype/public}.
-Fonts in such locations are visible to \XeTeX\ but cannot be loaded by font name, only file name; \LuaTeX\ does not have this restriction.
-
-When selecting fonts by file name, any font that can be found in the default
-search paths may be used directly (including in the current directory)
-without having to explicitly define the location of the font file on disk.
-
-Fonts selected by filename must include bold and italic variants explicitly.
-\begin{Verbatim}
-  \setmainfont{texgyrepagella-regular.otf}[
-       BoldFont       = texgyrepagella-bold.otf ,
-       ItalicFont     = texgyrepagella-italic.otf ,
-       BoldItalicFont = texgyrepagella-bolditalic.otf ]
-\end{Verbatim}
-\pkg{fontspec} knows that the font is to be selected by file name by the
-presence of the `|.otf|' extension.
-An alternative is to specify the extension separately, as shown following:
-\begin{Verbatim}
-  \setmainfont{texgyrepagella-regular}[
-       Extension      = .otf ,
-       BoldFont       = texgyrepagella-bold ,
-       ... ]
-\end{Verbatim}
-If desired, an abbreviation can be applied to the font names based on the
-mandatory `font name' argument:
-\begin{Verbatim}
-  \setmainfont{texgyrepagella}[
-       Extension      = .otf ,
-       UprightFont    = *-regular ,
-       BoldFont       = *-bold ,
-       ... ]
-\end{Verbatim}
-In this case `texgyrepagella' is no longer the name of an actual font,
-but is used to construct the font names for each shape;
-the |*| is replaced by `texgyrepagella'.
-Note in this case that |UprightFont| is required for constructing the font
-name of the normal font to use.
-
-To load a font that is not in one of the default search paths, its location
-in the filesystem must be specified with the |Path| feature:
-\begin{Verbatim}
-  \setmainfont{texgyrepagella}[
-       Path           = /Users/will/Fonts/ ,
-       UprightFont    = *-regular ,
-       BoldFont       = *-bold ,
-       ... ]
-\end{Verbatim}
-Note that \XeTeX\ and \LuaTeX\ are able to load the font without giving an
-extension, but \pkg{fontspec} must know to search for the file; this can can
-be indicated by using the |Path| option without an argument:
-\begin{Verbatim}
-  \setmainfont{texgyrepagella-regular}[
-       Path, BoldFont = texgyrepagella-bold,
-       ... ]
-\end{Verbatim}
-In previous versions of the package, the alias |ExternalLocation| was documented for this purpose, but this is now deprecated and may be removed in the future.
-
-
-
-
-
-
-\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
-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}.
-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
-inside its argument (i.e., the same behaviour as \cs{emph}) define it using regular \LaTeX\
-commands:
-\begin{Verbatim}
-  \newcommand\textnote[1]{{\notefont #1}}
-  \textnote{This is a note.}
-\end{Verbatim}
-Note that the double braces are intentional; the inner pair are used to
-to delimit the scope of the font change.
-
-\begin{Lexample}{nff}{Defining new font families.}
-  \newfontfamily\notefont{Kurier}
-  \notefont This is a \emph{note}.
-\end{Lexample}
-
-\DescribeMacro{\newfontface}
-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
-in the upright forms. \cmd\newfontface\ is used for this purpose, shown
-in \exref{nfface}, which is repeated in \vref{sec:contextuals}.
-
-\begin{Xexample}{nfface}{Defining a single font face.}
-  \newfontface\fancy{Hoefler Text Italic}%
-      [Contextuals={WordInitial,WordFinal}]
-  \fancy where is all the vegemite
-  % \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}
-
-\cmdbox{
- \feat{BoldFont} = \meta{font name} \\
- \feat{ItalicFont} = \meta{font name} \\
- \feat{~BoldItalicFont} = \meta{font name} \\
- \feat{SlantedFont} = \meta{font name} \\
- \feat{BoldSlantedFont} = \meta{font name} \\
- \feat{SmallCapsFont} = \meta{font name}
-}
-
-The automatic bold, italic, and bold italic font selections will not be
-adequate for the needs of every font: while some fonts mayn't even
-have bold or italic shapes, in which case a skilled (or lucky)
-designer may be able to chose well-matching accompanying shapes from
-a different font altogether, others can have a range of bold and
-italic fonts to chose among.  The \feat{BoldFont} and
-\feat{ItalicFont} features are provided for these situations. If only
-one of these is used, the bold italic font is requested as the
-default from the \emph{new} font. See \exref{bff}.
-
-\begin{Xexample}{bff}{Explicit selection of the bold font.}
-  \fontspec{Helvetica Neue UltraLight}%
-           [BoldFont={Helvetica Neue}]
-                Helvetica Neue UltraLight         \\
-  {\itshape     Helvetica Neue UltraLight Italic} \\
-  {\bfseries               Helvetica Neue       } \\
-  {\bfseries\itshape       Helvetica Neue Italic} \\
-\end{Xexample}
-
-If a bold italic shape is not defined, or you want to specify
-\emph{both} custom bold and italic shapes, the \feat{BoldItalicFont}
-feature is provided.
-
-
-
-\subsubsection{Small caps and slanted font shapes}
-
-When a font family has both slanted \emph{and} italic shapes, these may be specified separately using the analogous features \feat{SlantedFont} and \feat{BoldSlantedFont}.
-Without these, however, the \LaTeX\ font switches for slanted (\cs{textsl}, \cs{slshape}) will default to the italic shape.
-
-Pre-OpenType, it was common for font families to be distributed with small caps glyphs in separate fonts, due to the limitations on the number of glyphs allowed in the PostScript Type~1 format.
-Such fonts may be used by declaring the \feat{SmallCapsFont} of the family you are specifying:
-\begin{Verbatim}
-  \setmainfont{Minion MM Roman}[
-    SmallCapsFont={Minion MM Small Caps & Oldstyle Figures}
-  ]
-  Roman 123 \\ \textsc{Small caps 456}
-\end{Verbatim}
-In fact, you should specify the small caps font for each individual bold and
-italic shape as in
-\begin{Verbatim}
-  \setmainfont{ <upright> }[
-    UprightFeatures    = { SmallCapsFont={ <sc> } } ,
-    BoldFeatures       = { SmallCapsFont={ <bf sc> } } ,
-    ItalicFeatures     = { SmallCapsFont={ <it sc> } } ,
-    BoldItalicFeatures = { SmallCapsFont={ <bf it sc> } } ,
-  ]
-  Roman 123 \\ \textsc{Small caps 456}
-\end{Verbatim}
-For most modern fonts that have small caps as a font feature, this level of
-control isn't generally necessary.
-
-All of the bold, italic, and small caps fonts can be loaded with different
-font features from the main font. See \ref{sec:bfit-feat} for details.
-When an OpenType font is selected for |SmallCapsFont|, the small caps
-font feature is \emph{not} automatically enabled. In this case, users
-should write instead, if necessary,
-\begin{Verbatim}
-  \setmainfont{...}[
-    SmallCapsFont={...},
-    SmallCapsFeatures={Letters=SmallCaps},
-  ]
-\end{Verbatim}
-
-\subsection{Specifically choosing the \NFSS\ family}
-
-In \LaTeX's \NFSS, font families are defined with names such as `\texttt{ppl}' (Palatino), `\texttt{lmr}' (Latin Modern Roman), and so on, which are selected with the \cs{fontfamily} command:
-\begin{Verbatim}
-  \fontfamily{ppl}\selectfont
-\end{Verbatim}
-In \pkg{fontspec}, the family names are auto-generated based on the fontname of the font; for example, writing |\fontspec{Times New Roman}| for the first time would generate an internal font family name of `\texttt{TimesNewRoman(1)}'.
-Please note that should not rely on the name that is generated.
-
-In certain cases it is desirable to be able to choose this internal font family name so it can be re-used elsewhere for interacting with other packages that use the \LaTeX's font selection interface; an example might be
-\begin{Verbatim}
-  \usepackage{fancyvrb}
-  \fvset{fontfamily=myverbatimfont}
-\end{Verbatim}
-To select a font for use in this way in \pkg{fontspec} use the \feat{NFSSFamily} feature:\footnote{Thanks to Luca Fascione for the example and motivation for finally implementing this feature.}
-\begin{Verbatim}
-  \newfontfamily\verbatimfont[NFSSFamily=myverbatimfont]{Inconsolata}
-\end{Verbatim}
-It is then possible to write commands such as:
-\begin{Verbatim}
-  \fontfamily{myverbatimfont}\selectfont
-\end{Verbatim}
-which is essentially the same as writing |\verbatimfont|, or to go back to the orginal example:
-\begin{Verbatim}
-  \fvset{fontfamily=myverbatimfont}
-\end{Verbatim}
-Only use this feature when necessary; the in-built font switching commands that \pkg{fontspec} generates (such as |\verbatimfont| in the example above) are recommended in all other cases.
-
-If you don't wish to explicitly set the \NFSS\ family but you would like to know what it is, an alternative mechanism for package writers is introduced as part of the \pkg{fontspec} programming interface; see the function \cs{fontspec_set_family:Nnn} for details (\vref*{sec:api}).
-
-\subsection{Choosing additional \NFSS\ font faces}
-
-\LaTeX's font selection scheme (\NFSS) is more flexible than the \pkg{fontspec} interface discussed up until this point.
-It assigns to each font face a \emph{family} (discussed above), a \emph{series} such as bold or light or condensed, and a \emph{shape} such as italic or slanted or small caps.
-The \pkg{fontspec} features such as \feat{BoldFont} and so on all assign faces for the default series and shapes of the \NFSS, but it's not uncommon to have font families that have multiple weights and shapes and so on.
-
-If you set up a regular font family with the `standard four' (upright, bold, italic, and bold italic) shapes and then want to use, say, a light font for a certain document element, many users will be perfectly happy to use \cs{newfontface}\cs{\meta{switch}} and use the resulting font \cs{\meta{switch}}.
-In other cases, however, it is more convenient or even necessary to load additional fonts using additional \NFSS\ specifiers.
-
-\cmdbox{
-  \texttt{FontFace = }\marg{series}\marg{shape}
-     \texttt{\char`\{} \texttt{Font = }\meta{font name} \texttt, \meta{features} \texttt{\char`\}} \\
-  \texttt{FontFace = }\marg{series}\marg{shape}\marg{font name}
-}
-
-The font thus specified will inherit the font features of the main font, with optional additional \meta{features} as requested.
-(Note that the optional \marg{features} argument is still surrounded with curly braces.)
-Multiple \feat{FontFace} commands may be used in a single declaration to specify multiple fonts.
-As an example:
-\begin{Verbatim}
-  \setmainfont{font1.otf}[
-     FontFace = {c}{\updefault}{ font2.otf } ,
-     FontFace = {c}{m}{ Font = font3.otf , Color = red }
-    ]
-\end{Verbatim}
-Writing |\fontseries{c}\selectfont| will result in |font2| being selected, which then followed by |\fontshape{m}\selectfont| will result in |font3| being selected (in red).
-A font face that is defined in terms of a different series but an upright shape (|\updefault|, as shown above) will attempt to find a matching small caps feature and define that face as well.
-Conversely, a font face defined in terms of a non-standard font shape will not.
-
-There are some standards for choosing shape and series codes; the \LaTeXe\ font selection guide\footnote{\texttt{texdoc fntguide}} lists series |m| for medium, |b| for bold, |bx| for bold extended, |sb| for semi-bold, and |c| for condensed.
-A far more comprehensive listing is included in Appendix~A of Philipp Lehman's `The Font Installation Guide'\footnote{\texttt{texdoc fontinstallationguide}} covering 14 separate weights and 12 separate widths.
-
-The \feat{FontFace} command also interacts properly with the \feat{SizeFeatures} command as follows: (nonsense set of font selection choices)
-\begin{Verbatim}
-  FontFace = {c}{n}{
-    Font = Times ,
-    SizeFeatures = {
-      { Size =   -10 , Font = Georgia } ,
-      { Size = 10-15}                 , % default "Font = Times"
-      { Size = 15-   , Font = Cochin  } ,
-    },
-  },
-\end{Verbatim}
-Note that if the first \feat{Font} feature is omitted then each size needs its own inner \feat{Font} declaration.
-
-\subsection{Math(s) fonts}
-
-When \cmd\setmainfont, \cmd\setsansfont\ and \cmd\setmonofont\ are used in the
-preamble, they also define the fonts to be used in maths mode inside the
-\cmd\mathrm-type commands. This only occurs in the preamble because \LaTeX\
-freezes the maths fonts after this stage of the processing. The \pkg{fontspec}
-package must also be loaded after any maths font packages (\eg, \pkg{euler})
-to be successful. (Actually, it is \emph{only} \pkg{euler} that is the
-problem.\note{Speaking of \pkg{euler}, if you want to use its
-\texttt{[mathbf]} option, it won't work, and you'll need to put this after
-\pkg{fontspec} is loaded instead:
-\ttfamily\cmd\AtBeginDocument\char`\{\cmd\DeclareMathAlphabet\cmd\mathbf\char`\{U\char`\}\char`\{eur\char`\}\char`\{b\char`\}\char`\{n\char`\}})
-
-Note that \pkg{fontspec} will not change the font for general mathematics;
-only the upright and bold shapes will be affected.
-To change the font used for the mathematical symbols, see either the
-\pkg{mathspec} package or the \pkg{unicode-math} package.
-
-Note that you may find that loading some maths packages won't be as smooth as
-you expect since \pkg{fontspec} (and \XeTeX\ in general) breaks many of the
-assumptions of \TeX\ as to where maths characters and accents can be found.
-Contact me if you have troubles, but I can't guarantee to be able to fix any
-incompatibilities. The Lucida and Euler maths fonts should be fine; for all
-others keep an eye out for problems.
-
-\cmdbox{
-  \cmd{\setmathrm}\marg{font name}\oarg{font features} \\
-  \cmd{\setmathsf}\marg{font name}\oarg{font features} \\
-  \cmd{\setmathtt}\marg{font name}\oarg{font features} \\
-  \cmd{\setboldmathrm}\marg{font name}\oarg{font features}
-}
-
-However, the default text fonts may not necessarily be the ones you
-wish to use when typesetting maths (especially with the use of fancy
-ligatures and so on). For this reason, you may optionally use the
-commands above (in the same way as our other
-\cmd\fontspec-like commands) to explicitly state which fonts to use
-inside such commands as \cmd\mathrm. Additionally, the
-\cmd\setboldmathrm\ command allows you define the font used for
-\cmd\mathrm\ when in bold maths mode (which is activated with, among
-others, \cmd\boldmath).
-
-For example, if you were using Optima with the Euler maths font, you
-might have this in your preamble:
-\begin{Verbatim}
-  \usepackage{mathpazo}
-  \usepackage{fontspec}
-  \setmainfont{Optima}
-  \setmathrm{Optima}
-  \setboldmathrm[BoldFont={Optima ExtraBlack}]{Optima Bold}
-\end{Verbatim}
-These commands are compatible with the \pkg{unicode-math} package.
-Having said that, \pkg{unicode-math} also defines a more general way of defining fonts to use in maths mode, so you can ignore this subsection if you're already using that package.
-
-
-\section{Miscellaneous font selecting details}
-
-\paragraph{The optional argument --- from v2.4}
-For the first decade of \pkg{fontspec}'s life, optional font features were selected with a bracketed argument before the font name, as in:
-\begin{Verbatim}
-  \setmainfont[
-    lots and lots ,
-    and more and more ,
-    an excessive number really ,
-    of font features could go here
-  ]{myfont.otf}
-\end{Verbatim}
-This always looked like ugly syntax to me, because the most important detail --- the name of the font --- was tucked away at the end.
-The order of these arguments has now been reversed:
-\begin{Verbatim}
-  \setmainfont{myfont.otf}[
-    lots and lots ,
-    and more and more ,
-    an excessive number really ,
-    of font features could go here
-  ]
-\end{Verbatim}
-I hope this doesn't cause any problems.
-\begin{enumerate}
- \item Backwards compatibility has been preserved, so either input method works. (In fact, in the next version of \pkg{fontspec} you will be able to write
- \begin{Verbatim}
-  \fontspec[Ligatures=Rare]{myfont.otf}[Color=red]
- \end{Verbatim}
- if you really felt like it and both sets of features would be applied.)
-
- \item
- Following standard \pkg{xparse} behaviour, there must be no space before the opening bracket; writing
- \begin{Verbatim*}
-\fontspec{myfont.otf} [Color=red]
- \end{Verbatim*}
- will result in |[Color=red]| not being recognised an argument and therefore it will be typeset as text. When breaking over lines, write either of:
- \begin{Verbatim}
-   \fontspec{myfont.otf}%        \fontspec{myfont.otf}[
-     [Color=red]                    Color=Red]
- \end{Verbatim}
-
-\end{enumerate}
-
-\paragraph{Spaces}
-\cmd\fontspec\ and \cmd\addfontfeatures\ ignore trailing spaces as
-if it were a `naked' control sequence; \eg, `|M. \fontspec{...} N|' and
-`|M. \fontspec{...}N|' are the same.
-
-\paragraph{Italic small caps}
-Note that this package redefines the \cs{itshape}, \cs{slshape}, and \cs{scshape} commands in order to allow them to select italic small caps in conjunction.
-With these changes, writing |\itshape\scshape| will lead to italic small caps, and |\upshape| subsequently then moves back to small caps only. |\upshape| again returns from small caps to upright regular.
-(And similarly for for |\slshape|. In addition, once italic small caps are selected then |\slshape| will switch to slanted small caps, and vice versa.)
-
-\paragraph{Emphasis and nested emphasis}
-\LaTeXe\ allows you to specify the behaviour of \cs{emph} nested within \cs{emph} by setting the \cs{eminnershape} command.
-For example, |\renewcommand\eminnershape{\upshape\scshape}| will produce small caps within |\emph{\emph{...}}|.
-
-The \pkg{fontspec} package takes this idea one step further to allow arbitrary font changes (e.g., boldness) and arbitrary levels of nesting within emphasis.
-This is performed using the |\emfontdeclare| command, which takes a comma-separated list of font switches corresponding to increasing levels of emphasis.
-Two examples:
-\begin{enumerate}
-\item |\emfontdeclare{\itshape,\upshape\scshape,\itshape}| will lead to `italics', `small caps', then `italic small caps' as the level of emphasis increases, as long as italic small caps are defined for the font.
-  Note that |\upshape| is required because the font changes are cascading.
-\item |\emfontdeclare{\bfseries,\fontseries{h}\selectfont,\fontseries{x}\selectfont}| could lead to (if fonts are set up correctly) `bold', `heavy', and `extra bold'.
-\end{enumerate}
-
-
-
-
-\section{Selecting font features}
-\label{sec:selectingfeature}
-
-The commands discussed so far such as \cs{fontspec} each take an optional argument for
-accessing the font features of the requested font.
-Commands are provided to set default features to be applied for all fonts, and even to change the features that a font is presently loaded with.
-Different font shapes can be loaded with separate features, and different features can even be selected for different sizes that the font appears in.
-This section discusses these options.
-
-\subsection{Default settings} \label{sec:defaults}
-
-\cmdbox{\cmd\defaultfontfeatures\marg{font features}}
-
-It is sometimes useful to define
-font features that are applied to every subsequent font selection command.
-This may be defined with the
-\cmd{\defaultfontfeatures} command, shown in \exref{dff}.
-New calls of \cs{defaultfontfeatures} overwrite previous ones, and defaults can be reset by calling the command with an empty argument.
-
-\begin{Xexample}{dff}{A demonstration of the \cs{defaultfontfeatures} command.}
-  \fontspec{texgyreadventor-regular.otf}
-  Some default text 0123456789 \\
-  \defaultfontfeatures{
-     Numbers=OldStyle, Color=888888
-  }
-  \fontspec{texgyreadventor-regular.otf}
-  Now grey, with old-style figures:
-  0123456789
-\end{Xexample}
-
-\cmdbox{\cmd\defaultfontfeatures\oarg{font name}\marg{font features}}
-
-Default font features can be specified on a per-font and per-face basis
-by using the optional argument to \cs{defaultfontfeatures} as shown.\footnote{Internally, \meta{font name} has all spaces removed and is converted to lowercase.}
-\begin{Verbatim}
-  \defaultfontfeatures[texgyreadventor-regular.otf]{Color=blue}
-  \setmainfont{texgyreadventor-regular.otf}% will be blue
-\end{Verbatim}
-Multiple fonts may be affected by using a comma separated list of font names.
-
-\cmdbox{\cmd\defaultfontfeatures\oarg{\cs{font-switch}}\marg{font features}}
-
-\textbf{New in v2.4}.
-Defaults can also be applied to symbolic families such as those created with the |\newfontfamily| command and for |\rmfamily|, |\sffamily|, and |\ttfamily|:
-\begin{Verbatim}
-  \defaultfontfeatures[\rmfamily,\sffamily]{Ligatures=TeX}
-  \setmainfont{texgyreadventor-regular.otf}% will use standard TeX ligatures
-\end{Verbatim}
-The line above to set \TeX-like ligatures is now activated by \emph{default} in \texttt{fontspec.cfg}.
-To reset default font features, simply call the command with an empty argument:
-\begin{Verbatim}
-  \defaultfontfeatures[\rmfamily,\sffamily]{}
-  \setmainfont{texgyreadventor-regular.otf}% will no longer use standard TeX ligatures
-\end{Verbatim}
-
-\cmdbox{\cmd\defaultfontfeatures\texttt{+}\marg{font features}\\
-        \cmd\defaultfontfeatures\texttt{+}\oarg{font name}\marg{font features}}
-
-\textbf{New in v2.4}.
-Using the |+| form of the command appends the \meta{font features} to any already-selected defaults.
-
-
-\subsection{Default settings from a file}
-
-In addition to the defaults that may be specified in the document as described above, when a font is first loaded, a configuration file is searched
-for with the name `\meta{fontname}\texttt{.fontspec}'.\footnote{Located in the current folder or within a standard \texttt{texmf} location.}
-
-The contents of this file can be used to specify default font features without
-having to have this information present within each document.
-\meta{fontname} is stripped of spaces and file extensions are omitted; for
-example, the line above for \TeX\ Gyre Adventor could be placed in a file
-called \texttt{TeXGyreAdventor.fontspec}, or for specifying options for
-\texttt{texgyreadventor-regular.otf} (when loading by filename), the configuration
-file would be \texttt{texgyreadventor-regular.fontspec}.
-(N.B. the lettercase of the names should match.)
-
-This mechanism can be used to define custom names or aliases for your font collections.
-If you create a file \texttt{MyCharis.fontspec} containing, say,
-\begin{Verbatim}
-  \defaultfontfeatures[My Charis]
-   {
-    Extension = .ttf ,
-    UprightFont = CharisSILR,
-    BoldFont = CharisSILB,
-    ItalicFont = CharisSILI,
-    BoldItalicFont = CharisSILBI,
-    % <any other desired options>
-   }
-\end{Verbatim}
-you can load that custom family with \verb|\fontspec{My Charis}| and similar.
-The optional argument to \cs{defaultfontfeatures} must match that requested by the font loading command (\verb|\fontspec|, etc.), else the options won't take effect.
-
-Finally, note that options for font faces can also be defined in this way.
-To continue the example above, here we colour the different faces:
-\begin{Verbatim}
-  \defaultfontfeatures[CharisSILR]{Color=blue}
-  \defaultfontfeatures[CharisSILB]{Color=red}
-\end{Verbatim}
-And such configuration lines can be stored either inline inside \texttt{My Charis.fontspec} or within their own \texttt{.fontspec} files; in this way, \pkg{fontspec} is designed to handle `nested' configuration options as well.
-
-\subsection{Changing the currently selected features}
-\label{sec:addfontfeatures}
-
-\cmdbox{\cmd\addfontfeatures\marg{font features}}
-
-This command allows font features to
-be changed without knowing what features are currently selected or even what
-font is being used. A good example of this could be to add a hook to all
-tabular material to use monospaced numbers, as shown in \exref{aff}.
-Note however that the behaviour in this regard will be unreliable (subject to the font itself) if you attempt to \emph{change} an already selected feature.
-\Eg, this sort of thing can cause troubles:
-\begin{Verbatim}
-\addfontfeature{Numbers=OldStyle}...
-\addfontfeature{Numbers=Lining}...
-123
-\end{Verbatim}
-With both features active, how will the font render `123'? Depends on the font.
-In the distant future this functionality will be re-written to avoid this issue (giving `\verb|Numbers=OldStyle|' the smarts to know to explicitly de-activate any previous instances of `\verb|Numbers=Lining|', and vice-versa, but as I hope you can imagine this requires a fair degree of elbow grease which I haven't had available for some time now.
-
-\begin{Lexample}{aff}{A demonstration of the \cs{addfontfeatures} command. Note the caveat listed in the text regarding such usage.}
-  \fontspec{texgyreadventor-regular.otf}%
-           [Numbers={Proportional,OldStyle}]
-  `In 1842, 999 people sailed 97 miles in
-   13 boats. In 1923, 111 people sailed 54
-   miles in 56 boats.'            \bigskip
-
-  {\addfontfeatures{Numbers={Monospaced,Lining}}
-  \begin{tabular}{@{} cccc @{}}
-            Year & People & Miles & Boats \\
-    \hline  1842 &  999   &  75   &  13   \\
-            1923 &  111   &  54   &  56
-  \end{tabular}}
-\end{Lexample}
-
-\DescribeMacro{\addfontfeature}
-This command may also be executed under the alias \cmd{\addfontfeature}.
-
-\subsection{Priority of feature selection}
-Features defined with \cs{addfontfeatures} override features
-specified by \cs{fontspec}, which in turn override features
-specified by \cs{defaultfontfeatures}.  If in doubt, whenever a
-new font is chosen for the first time, an entry is made in the
-transcript (\texttt{.log}) file displaying the font name and the
-features requested.
-
-\subsection{Different features for different font shapes}
-\label{sec:bfit-feat}
-
-\cmdbox{
- \feat{BoldFeatures}\texttt=\marg{features} \\
- \feat{ItalicFeatures}\texttt=\marg{features} \\
- \feat{BoldItalicFeatures}\texttt=\marg{features} \\
- \feat{SlantedFeatures}\texttt=\marg{features} \\
- \feat{BoldSlantedFeatures}\texttt=\marg{features} \\
- \feat{SmallCapsFeatures}\texttt=\marg{features}
-}
-
-It is entirely possible that separate fonts in a family will require
-separate options; \eg, Hoefler Text Italic contains various swash
-feature options that are completely unavailable in the upright shapes.
-
-The font features defined at the top level of the optional \cmd\fontspec\
-argument are applied to \emph{all} shapes of the family.
-Using \feat{Upright-}, \feat{SmallCaps-}, \feat{Bold-},
-\feat{Italic-}, and \feat{BoldItalicFeatures},
-separate font features may be defined to their respective shapes
-\emph{in addition} to, and with precedence over, the `global' font features.
-See \exref{itfeat}.
-
-\begin{Xexample}{itfeat}{Features for, say, just italics.}
-\fontspec{EBGaramond12-Regular.otf}%
-  [ItalicFont=EBGaramond12-Italic.otf]
-\itshape Don’t Ask Victoria! \\
-\addfontfeature{ItalicFeatures={Style=Swash}}
-Don’t Ask Victoria! \\
-\end{Xexample}
-
-Note that because most fonts include their small caps glyphs
-within the main font, features specified with \feat{SmallCapsFeatures} are applied \emph{in addition} to
-any other shape-specific features as defined above, and hence \feat{SmallCapsFeatures}
-can be nested within \feat{ItalicFeatures} and friends. Every combination
-of upright, italic, bold and small caps can thus be assigned individual
-features, as shown in the somewhat ludicrous \exref{scfeat}.
-
-\begin{Xexample}{scfeat}{An example of setting the \feat{SmallCapsFeatures}
-separately for each font shape.}
-  \fontspec{texgyretermes}[
-      Extension = {.otf},
-      UprightFont = {*-regular}, ItalicFont = {*-italic},
-      BoldFont = {*-bold}, BoldItalicFont = {*-bolditalic},
-      UprightFeatures={Color = 220022,
-           SmallCapsFeatures = {Color=115511}},
-       ItalicFeatures={Color = 2244FF,
-           SmallCapsFeatures = {Color=112299}},
-         BoldFeatures={Color = FF4422,
-           SmallCapsFeatures = {Color=992211}},
-   BoldItalicFeatures={Color = 888844,
-           SmallCapsFeatures = {Color=444422}},
-           ]
-  Upright {\scshape Small Caps}\\
-  \itshape Italic {\scshape Italic Small Caps}\\
-  \upshape\bfseries Bold {\scshape Bold Small Caps}\\
-  \itshape Bold Italic {\scshape Bold Italic Small Caps}
-\end{Xexample}
-
-\subsection{Different features for different font sizes}
-\label{sec:sizefeature}
-
-\cmdbox{
-\ttfamily SizeFeatures = \char`\{\\
-\null\quad...\\
-\null\quad\char`\{~Size =
-\rmfamily\meta{size range}\ttfamily
-,
-\rmfamily \meta{font features}\ttfamily
-~\char`\} , \\
-\null\quad\char`\{~Size =
-\rmfamily\meta{size range}\ttfamily
-, Font =
-\rmfamily\meta{font name}\texttt, \meta{font features}\ttfamily
-~\char`\} , \\
-\null\quad... \\
-\char`\}}
-
-The \feat{SizeFeature} feature is a little more complicated
-than the previous features discussed. It allows different fonts
-and different font features to be selected for a given font
-family as the point size varies.
-
-It takes a comma separated list of braced, comma separated lists of features for each size range.
-Each sub-list must contain the \opt{Size} option
-to declare the size range, and optionally \opt{Font} to change the
-font based on size. Other (regular) fontspec features that are added
-are used on top of the font features that would be used anyway.
-A demonstration to clarify these details is shown in \exref{sizefeat}.
-A less trivial example is shown in the context of optical font sizes
-in \vref{sec:opticalsize}.
-
-\begin{Xexample}{sizefeat}{An example of specifying different font features for different sizes of font with \feat{SizeFeatures}.}
-  \fontspec{texgyrechorus-mediumitalic.otf}[
-    SizeFeatures={
-      {Size={-8}, Font=texgyrebonum-italic.otf, Color=AA0000},
-      {Size={8-14}, Color=00AA00},
-      {Size={14-}, Color=0000AA}} ]
-
-  {\scriptsize Small\par} Normal size\par {\Large Large\par}
-\end{Xexample}
-
-To be precise, the \opt{Size} sub-feature accepts arguments in the form shown in \vref{tab:sizing}.
-Braces around the size range are optional. For an exact font size (|Size=X|)
-font sizes chosen near that size will `snap'. For example, for size definitions
-at exactly 11pt and 14pt, if a 12pt font is requested \emph{actually} the
-11pt font will be selected. This is a remnant of the past when fonts were designed
-in metal (at obviously rigid sizes) and later when bitmap fonts were similarly
-designed for fixed sizes.
-
-If additional features are only required for a single size, the other sizes
-must still be specified.  As in:
-\begin{Verbatim}
-  SizeFeatures={
-     {Size=-10,Numbers=Uppercase},
-     {Size=10-}}
-\end{Verbatim}
-Otherwise, the font sizes greater than 10 won't be defined at all!
-
-\begin{table}
-\caption{Syntax for specifying the size to apply custom font features.}\label{tab:sizing}
-\centering
-\begin{tabular}{@{}ll@{}}
-\toprule
-Input & Font size, $s$ \\
-\midrule
- |Size = X-| & $s \geq \texttt{X}$ \\
- |Size = -Y| & $s < \texttt{Y}$ \\
- |Size = X-Y| & $\texttt{X} \leq s < \texttt{Y}$ \\
- |Size = X| & $s = \texttt{X}$ \\
-\bottomrule
-\end{tabular}
-\end{table}
-
-\paragraph{Interaction with other features}
-For \feat{SizeFeatures} to work with \feat{ItalicFeatures}, \feat{BoldFeatures}, etc., and \feat{SmallCapsFeatures}, a strict heirarchy is required:
-\begin{Verbatim}
- UprightFeatures =
-  {
-   SizeFeatures =
-    {
-     {
-      Size = -10,
-      Font = ..., % if necessary
-      SmallCapsFeatures = {...},
-      ... % other features for this size range
-     },
-     ... % other size ranges
-    }
-  }
-\end{Verbatim}
-Suggestions on simplifying this interface welcome.
-
-
-\section{Font independent options} \label{sec:font-ind-features}
-
-Features introduced in this section may be used with any font.
-
-\subsection{Colour}
-
-\feat{Color} (or \feat{Colour}), also shown in \vref{sec:defaults}
-and elsewhere, uses font specifications to set the colour of
-the text. The colour is defined as a triplet of two-digit Hex RGB
-values, with optionally another value for the transparency (where
-|00| is completely transparent and |FF| is opaque.)
-\begin{Lexample}{color}{Selecting colour with transparency. N.B. due to a conflict betweeen \pkg{fontspec} and the \pkg{preview} package, this example currently does not show any transparency!}
-  \fontsize{48}{48}
-  \fontspec{texgyrebonum-bold.otf}
-  {\addfontfeature{Color=FF000099}W}\kern-0.5ex
-  {\addfontfeature{Color=0000FF99}S}\kern-0.4ex
-  {\addfontfeature{Color=DDBB2299}P}\kern-0.4ex
-  {\addfontfeature{Color=00BB3399}R}
-\end{Lexample}
-Transparency is supported by \LuaLaTeX; \XeLaTeX\ with the \texttt{xdvipdfmx} driver
-does not support this feature.
-
-If you load the \pkg{xcolor} package, you may use any named colour instead
-of writing the colours in hexadecimal.
-\begin{Verbatim}
- \usepackage{xcolor}
- ...
- \fontspec[Color=red]{Verdana} ...
- \definecolor{Foo}{rgb}{0.3,0.4,0.5}
- \fontspec[Color=Foo]{Verdana} ...
-\end{Verbatim}
-The \pkg{color} package is \emph{not} supported; use \pkg{xcolor} instead.
-
-You may specify the transparency with a named colour using the \feat{Opacity}
-feature which takes an decimal from zero to one corresponding to
-transparent to opaque respectively:
-\begin{Verbatim}
- \fontspec[Color=red,Opacity=0.7]{Verdana} ...
-\end{Verbatim}
-It is still possible to specify a colour in six-char hexadecimal form
-while defining opacity in this way, if you like.
-
-\subsection{Scale}
-
-\cmdbox{
- \feat{Scale} = \meta{number} \\
- \feat{Scale} = \opt{MatchLowercase} \\
- \feat{Scale} = \opt{MatchUppercase}
-}
-
-In its explicit form, \feat{Scale} takes a single
-numeric argument for linearly scaling the font, as demonstrated
-in \exref{fontload}.
-It is now possible to
-measure the correct dimensions of the fonts loaded and
-calculate values to scale them automatically.
-
-As well as a numerical argument, the \feat{Scale} feature
-also accepts options \opt{MatchLowercase}
-and \opt{MatchUppercase}, which will scale the font being selected to match
-the current default roman font to either the height of the lowercase or
-uppercase letters, respectively; these features are shown in \exref{scale}.
-
-\begin{Xexample}{scale}{Automatically calculated scale values.}
-  \setmainfont{Georgia}
-  \newfontfamily\lc[Scale=MatchLowercase]{Verdana}
-   The perfect match {\lc is hard to find.}\\
-  \newfontfamily\uc[Scale=MatchUppercase]{Arial}
-   L O G O \uc F O N T
-\end{Xexample}
-
-The amount of scaling used in each instance is reported in the \texttt{.log} file.
-Since there is some subjectivity about the exact scaling to be used, these values
-should be used to fine-tune the results.
-
-Note that when |Scale=MatchLowercase| is used with |\setmainfont|, the new `main' font of the document will be scaled to match the old default.
-This may be undesirable in some cases, so to achieve `natural' scaling for the main font but automatically scale all other fonts selected, you may write
-\begin{Verbatim}
-  \defaultfontfeatures{ Scale = MatchLowercase }
-  \defaultfontfeatures[\rmfamily]{ Scale = 1}
-\end{Verbatim}
-One or both of these lines may be placed into a local |fontspec.cfg| file (see \vref{sec:config}) for this behaviour to be effected in your own documents automatically.
-(Also see \vref{sec:defaults} for more information on setting font defaults.)
-
-
-
-\subsection{Interword space}
-
-While the space between words can be varied on an individual
-basis with the \TeX\ primitive \cmd\spaceskip\ command, it is
-more convenient to specify this information when the font is
-first defined.
-
-The space in between words in a paragraph will be chosen automatically,
-and generally will not need to be adjusted. For those
-times when the precise details are important, the \feat{WordSpace}
-feature is
-provided, which takes either a single scaling factor to scale the
-default value, or a triplet of comma-separated
-values to scale the nominal value, the stretch, and the shrink of the
-interword space by, respectively. (|WordSpace={|$x$|}| is the same as
-|WordSpace={|$x$|,|$x$|,|$x$|}|.)
-
-\begingroup
-\let\centering\relax
-\begin{Xexample}{wordspace}{Scaling the default interword space. An exaggerated value has been chosen to emphasise the effects here.}
-  \fontspec{texgyretermes-regular.otf}
-  Some text for our example to take
-  up some space, and to demonstrate
-  the default interword space.
-  \bigskip
-
-  \fontspec{texgyretermes-regular.otf}%
-    [WordSpace = 0.3]
-  Some text for our example to take
-  up some space, and to demonstrate
-  the default interword space.
-\end{Xexample}
-\endgroup
-
-\subsection{Post-punctuation space}
-
-If \cmd\frenchspacing\ is \emph{not} in effect, \TeX\ will allow extra
-space after some punctuation in its goal of justifying the lines of text.
-Generally, this is considered old-fashioned, but occasionally in small amounts the
-effect can be justified, pardon the pun.
-
-The \feat{PunctuationSpace} feature takes a scaling factor by which to
-adjust the nominal value chosen for the font; this is demonstrated in
-\exref{punctspace}.
-Note that |PunctuationSpace=0|
-is \emph{not} equivalent to \cmd\frenchspacing, although the difference
-will only be apparent when a line of text is under-full.
-
-\begin{Lexample}{punctspace}{Scaling the default post-punctuation space.}
-  \nonfrenchspacing
-  \fontspec{texgyreschola-regular.otf}
-   Letters, Words. Sentences.          \par
-  \fontspec{texgyreschola-regular.otf}[PunctuationSpace=2]
-   Letters, Words. Sentences.          \par
-  \fontspec{texgyreschola-regular.otf}[PunctuationSpace=0]
-   Letters, Words. Sentences.
-\end{Lexample}
-
-
-
-
-\subsection{The hyphenation character}
-
-The letter used for hyphenation may be chosen with the \feat{HyphenChar}
-feature. It takes three types of input, which are chosen according to some
-simple rules. If the input is the string \opt{None}, then hyphenation is
-suppressed for this font.
-If the input is a single character, then this
-character is used. Finally, if the input is longer than a single character
-it must be the UTF-8 slot number of the hyphen character you desire.
-
-This package redefines \LaTeX's \cmd\-\ macro such that it adjusts along with the above changes.
-
-\begin{Xexample}{hyphchar}{Explicitly choosing the hyphenation character.}
- \def\text{\fbox{\parbox{1.55cm}{%
-   EXAMPLE HYPHENATION%
- }}\qquad\qquad\null\par\bigskip}
-
- \fontspec{Linux Libertine O}[HyphenChar=None]
- \text
- \fontspec{Linux Libertine O}[HyphenChar={+}]
- \text
-\end{Xexample}
-
-Note that \TeX's optimisations in how it loads fonts means that you cannot
-use this feature in \cs{addfontfeatures}.
-
-\subsection{Optical font sizes} \label{sec:opticalsize}
-
-Optically scaled fonts thicken out as the font size decreases
-in order to make the glyph shapes more robust (less prone to losing
-detail), which improves legibility. Conversely, at large optical
-sizes the serifs and other small details may be more delicately
-rendered.
-
-OpenType fonts with optical scaling will exist in
-several discrete sizes, and these will be selected by \XeTeX\
-and Lua\TeX\
-\emph{automatically} determined by the current font size as in
-\exref{optsize}, in which we've scaled down some large text in order to be
-able to compare the difference for equivalent font sizes.
-
-The
-\opt{OpticalSize} option may be used to specify a different optical
-size.
-With \opt{OpticalSize} set
-to zero, no optical size font substitution is performed, as shown in
-\exref{optsize0}.
-
-\begin{Xexample}{optsize}{A demonstration of automatic optical size selection.}
-  \fontspec{Latin Modern Roman}
-   Automatic optical size                  \\
-  \scalebox{0.4}{\Huge
-   Automatic optical size}
-\end{Xexample}
-
-\begin{Xexample}{optsize0}{Optical size substitution is suppressed when set to zero.}
-  \fontspec{Latin Modern Roman 5 Regular}[OpticalSize=0]
-   Latin Modern optical sizes                \\
-  \fontspec{Latin Modern Roman 8 Regular}[OpticalSize=0]
-   Latin Modern optical sizes                \\
-  \fontspec{Latin Modern Roman 12 Regular}[OpticalSize=0]
-   Latin Modern optical sizes                \\
-  \fontspec{Latin Modern Roman 17 Regular}[OpticalSize=0]
-   Latin Modern optical sizes
-\end{Xexample}
-
-The \feat{SizeFeatures} feature (\vref*{sec:sizefeature}) can be
-used to specify exactly which optical sizes will be used for ranges
-of font size. For example, something like:
-\begin{Verbatim}
-  \fontspec{Latin Modern Roman}[
-    UprightFeatures = { SizeFeatures = {
-      {Size=-10,     OpticalSize=8 },
-      {Size= 10-14,  OpticalSize=10},
-      {Size= 14-18,  OpticalSize=14},
-      {Size=    18-, OpticalSize=18}}}
-           ]
-\end{Verbatim}
-
-\part{OpenType}
-\label{sec:opentype-features}
-
-\section{Introduction}
-\label{sec:opentype-features-intro}
-
-OpenType fonts (and other `smart' font technologies such as AAT and Graphite) can change the appearance of text in many different ways.
-These changes are referred to as font features.
-When the user applies a feature~--- for example, small capitals~--- to a run of text, the code inside the font makes appropriate substitutions and small capitals appear in place of lowercase letters.
-However, the use of such features does not affect the underlying text.
-In our small caps example, the lowercase letters are still stored in the document; only the appearance has been changed by the OpenType feature.
-This makes it possible to search and copy text without difficulty.
-If the user selected a different font that does not support small caps, the `plain' lowercase letters would appear instead.
-
-Some OpenType features are required to support particular scripts, and these features are often applied automatically.
-The Indic scripts, for example, often require that characters be reshaped and reordered after they are typed by the user, in order to display them in the traditional ways that readers expect.
-Other features can be applied to support a particular language.
-The Junicode font for medievalists uses by default the Old English shape of the letter thorn, while in modern Icelandic thorn has a more rounded shape.
-If a user tags some text as being in Icelandic, Junicode will automatically change to the Icelandic shape through an OpenType feature that localises the shapes of letters.
-
-There are a large group of OpenType features, designed to support high quality typography a multitude of languages and writing scripts.
-Examples of some font features have already been shown in previous sections; the complete set of OpenType font features supported by \pkg{fontspec} is described below in \ref{sec:ot-feat}.
-
-The OpenType specification provides four-letter codes (e.g., \texttt{smcp} for small capitals) for each feature.  The four-letter codes are given below along with the \pkg{fontspec} names for various features, for the benefit of people who are already familiar with OpenType.  You can ignore the codes if they don't mean anything to you.
-
-
-\subsection{How to select font features}
-
-Font features are selected by a series of \meta{feature}=\meta{option}
-selections. Features are (usually) grouped logically; for example, all
-font features relating to ligatures are accessed by writing \verb|Ligatures={...}| with the appropriate argument(s), which could be \texttt{TeX}, \texttt{Rare}, etc., as shown below in \ref{sec:ot-feat-liga}.
-
-Multiple options may be given to
-any feature that accepts non-numerical input, although doing so will
-not always work. Some options will override others in generally
-obvious ways; \Verb|Numbers={OldStyle,Lining}| doesn't make much
-sense because the two options are mutually exclusive, and \XeTeX\
-will simply use the last option that is specified (in this case
-using \opt{Lining} over \opt{OldStyle}).
-
-If a feature or an option is requested that the font does not have,
-a warning is given in the console output. As mentioned in \vref{sec:quiet-warnings}
-these warnings can be suppressed by selecting the \texttt{[quiet]} package option.
-
-\subsection{How do I know what font features are supported by my fonts?}
-
-Although I've long desired to have a feature within \pkg{fontspec} to display the OpenType features within a font, it's never been high on my priority list.
-One reason for that is the existence of the document |opentype-info.tex|, which is available on \textsc{ctan} or typing |kpsewhich opentype-info.tex| in a Terminal window.
-Make a copy of this file and place it somewhere convenient.
-Then open it in your regular \TeX\ editor and change the font name to the font you'd like to query; after running through plain \XeTeX, the output \textsc{pdf} will look something like this:
-
-\begin{framed}
-\def\myfontname{[Asana-Math.otf]}
-%
-%%% OpenType-info.tex %%%
-
-\font\testfont="\myfontname/ICU" at 12pt
-
-\rightskip=0pt plus 1fil
-
-\font\titlefont=ec-lmssbx10 at 12pt
-\font\tenrm=ec-lmss10 at 9pt \tenrm
-\font\tentt=ec-lmtt10 at 9pt
-
-\def\fourcharcode#1{\begingroup
- \count0=#1\count1=\count0
- \ifnum\count0=0
-  $\langle$default$\rangle$%
- \else
-  \tentt
-  '%
-  \divide\count0 by "1000000
-  \char\count0
-  \multiply\count0 by "1000000
-  \advance\count1 by -\count0
-  \count0=\count1
-  \divide\count0 by "10000
-  \char\count0
-  \multiply\count0 by "10000
-  \advance\count1 by -\count0
-  \count0=\count1
-  \divide\count0 by "100
-  \char\count0
-  \multiply\count0 by "100
-  \advance\count1 by -\count0
-  \ifnum\count1=32 \ \else \char\count1 \fi
-  '%
- \fi
- \endgroup
-}
-
-\newcount\scriptcount
-\newcount\scriptindex
-\newcount\scripttag
-\newcount\langcount
-\newcount\langindex
-\newcount\langtag
-\newcount\featurecount
-\newcount\featureindex
-\newcount\featuretag
-
-\leftline{\titlefont OpenType Layout features found in `\myfontname'}
-\nobreak
-
-\scriptcount=\XeTeXOTcountscripts\testfont
-\ifnum\scriptcount=0 \noindent None\par\fi
-
-\loop
- \ifnum\scriptindex<\scriptcount
-  \smallskip
-  \scripttag=\XeTeXOTscripttag\testfont\scriptindex
-  \noindent script = \fourcharcode{\scripttag}\endgraf\nobreak
-  \langcount=\XeTeXOTcountlanguages\testfont\scripttag
-  \advance\langcount by 1 % one extra to get the default language system
-  {\loop
-    \langtag=\XeTeXOTlanguagetag\testfont\scripttag\langindex
-    \indent language = \fourcharcode{\langtag}\endgraf\nobreak
-    \featurecount=\XeTeXOTcountfeatures\testfont\scripttag\langtag
-    {\indent\indent \hangindent=3\parindent \hangafter=1 features = \loop
-      \featuretag=\XeTeXOTfeaturetag\testfont\scripttag\langtag\featureindex
-      \fourcharcode{\featuretag}
-      \advance\featureindex by 1
-      \ifnum\featureindex<\featurecount \repeat\endgraf}
-    \advance\langindex by 1
-  \ifnum\langindex<\langcount \medskip \repeat}
-  \advance\scriptindex by 1
-\repeat
-\end{framed}
-
-\noindent I intentionally picked a font that by design needs few font features; `regular' text fonts such as Latin Modern Roman contain many more, and I didn't want to clutter up the document too much.
-You'll then need to cross-check the OpenType feature tags with the `logical' names used by \pkg{fontspec}.
-
-\paragraph{otfinfo}
-Alternatively, and more simply, you can use the command line tool |otfinfo|, which is distributed with \TeX{}Live.
-Simply type in a Terminal window, say:
-\begin{Verbatim}
-  otfinfo -f `kpsewhich lmromandunh10-oblique.otf`
-\end{Verbatim}
-which results in:
-\begin{Verbatim}[frame=single]
-aalt	Access All Alternates
-cpsp	Capital Spacing
-dlig	Discretionary Ligatures
-frac	Fractions
-kern	Kerning
-liga	Standard Ligatures
-lnum	Lining Figures
-onum	Oldstyle Figures
-pnum	Proportional Figures
-size	Optical Size
-tnum	Tabular Figures
-zero	Slashed Zero
-\end{Verbatim}
-
-\section{Complete listing of OpenType font features}
-\label{sec:ot-feat}
-
-\subsection{Ligatures}
-\label{sec:ot-feat-liga}
-
-\feat{Ligatures} refer to the replacement of two separate characters
-with a specially drawn glyph for functional or \ae sthetic reasons.
-The list of options, of which multiple may be selected at one time,
-is shown in \ref{feat:Ligatures}.
-A demonstration with the Linux Libertine fonts\note{\url{http://www.linuxlibertine.org/}} is shown in \exref{lig}.
-
-Note the additional features accessed with \verb|Ligatures=TeX|. These are
-not actually real OpenType features, but additions provided by \pkg{luaotfload} (i.e., \LuaTeX\ only) to emulate \TeX's behaviour for \textsc{ascii} input of curly quotes and punctuation. In \XeTeX\ this is achieved with the \feat{Mapping} feature (see \vref{sec:mapping}) but for consistency \verb|Ligatures=TeX| will perform the same function as \verb|Mapping=tex-text|.
-
-\subsection{Letters} \label{sec:letters}
-The \opt{Letters} feature specifies how the letters in the current font
-will look. OpenType fonts may contain the following options:
-\opt{Uppercase}, \opt{SmallCaps}, \opt{PetiteCaps},
-\opt{UppercaseSmallCaps}, \opt{UppercasePetiteCaps}, and
-\opt{Unicase}.
-
-
-\begin{features}{Ligatures}
-\otf*{Required}{rlig}
-\otf*{Common}{liga}
-\otf*{Contextual}{clig}
-\otf{Rare/Discretionary}{dlig}
-\otf{Historic}{hlig}
-\otf{TeX}{tlig/trep}
-\end{features}
-
-\begin{Lexample}[firstline=2]{lig}{An example of the \feat{Ligatures} feature.}
-   \Huge\centering
-   \def\test#1#2{%
-     #2 $\to$ {\addfontfeature{#1} #2}\\}
-   \fontspec{Linux Libertine O}
-   \test{Ligatures=Historic}{strict}
-   \test{Ligatures=Rare}{wurtzite}
-   \test{Ligatures=NoCommon}{firefly}
-\end{Lexample}
-
-\begin{features}{Letters}
-\otf{Uppercase}{case}
-\otf{SmallCaps}{smcp}
-\otf{PetiteCaps}{pcap}
-\otf{UppercaseSmallCaps}{c2sc}
-\otf{UppercasePetiteCaps}{c2pc}
-\otf{Unicase}{unic}
-\end{features}
-
-Petite caps are smaller than small caps.
-\opt{SmallCaps} and \opt{PetiteCaps}
-turn lowercase letters into the smaller caps letters,
-whereas the \opt{Uppercase...} options turn the \emph{capital} letters into
-the smaller
-caps (good, \eg, for applying to already uppercase acronyms like
-`NASA').
-This difference is shown in \exref{caps}.
-`Unicase' is a weird hybrid of upper and lower case letters.
-
-\begin{Lexample}{caps}{Small caps from lowercase or uppercase letters.}
-  \fontspec{texgyreadventor-regular.otf}[Letters=SmallCaps]
-   THIS SENTENCE no verb                \\
-  \fontspec{texgyreadventor-regular.otf}[Letters=UppercaseSmallCaps]
-   THIS SENTENCE no verb
-\end{Lexample}
-
-Note that the \opt{Uppercase} option will (probably)
-not actually map letters to uppercase.
- \note{If you want automatic uppercase letters, look to \LaTeX's
-      \cmd\MakeUppercase\ command.}
-It is designed to select various
-uppercase forms for glyphs such as accents and dashes, such as shown
-in \exref{letters-uppercase}; note the raised position of the hyphen
-to better match the surrounding letters.
-
-\begin{Lexample}{letters-uppercase}{An example of the \opt{Uppercase} option of the \feat{Letters} feature.}
-  \fontspec{Linux Libertine O}
-   UPPER-CASE example \\
-  \addfontfeature{Letters=Uppercase}
-   UPPER-CASE example
-\end{Lexample}
-
-The \feat{Kerning} feature also contains an \opt{Uppercase} option,
-which adds a small amount of spacing in between letters (see \vref{sec:kerning}).
-
-\subsection{Numbers}
-
-The \feat{Numbers} feature defines how numbers will look in the
-selected font, accepting options shown in \ref{feat:Numbers}.
-
-\begin{features}{Numbers}
-\otf{Uppercase/Lining}{lnum}
-\otf{Lowercase/OldStyle}{onum}
-\otf{Proportional}{pnum}
-\otf{Monospaced}{tnum}
-\otf{SlashedZero}{zero}
-\otf{Arabic}{anum}
-\end{features}
-
-The synonyms
-\opt{Uppercase} and \opt{Lowercase} are equivalent to \opt{Lining} and
-\opt{OldStyle}, respectively.
-The differences have been shown previously
-in \vref{sec:addfontfeatures}.
-The \opt{Monospaced} option is useful for tabular material when digits need
-to be vertically aligned.
-
-The \opt{SlashedZero} option
-replaces the default zero with a slashed version to prevent
-confusion with an uppercase `O', shown in \exref{slashzero}.
-
-\begin{Lexample}{slashzero}{The effect of the \opt{SlashedZero} option.}
-  \fontspec[Numbers=Lining]{texgyrebonum-regular.otf}
-   0123456789
-  \fontspec[Numbers=SlashedZero]{texgyrebonum-regular.otf}
-   0123456789
-\end{Lexample}
-
-The \opt{Arabic} option (with tag \verb|anum|) maps regular numerals to their Arabic script or Persian equivalents
-based on the current \opt{Language} setting (see \vref{sec:ot}).
-This option is based on a \LuaTeX\ feature of the \pkg{luaotfload} package,
-not an OpenType feature. (Thus, this feature is unavailable in \XeTeX.)
-
-\subsection{Contextuals}
-This feature refers to substitutions of glyphs that vary `contextually' by their relative position in a word or string of characters;
-features such as contextual swashes are accessed via the options shown in \ref{feat:Contextuals}.
-
-\begin{features}{Contextuals}
-\otf{Swash}{cswh}
-\otf{Alternate}{calt}
-\otf{WordInitial}{init}
-\otf{WordFinal}{fina}
-\otf{LineFinal}{falt}
-\otf{Inner}{medi}
-\end{features}
-
-Historic forms are accessed in OpenType
-fonts via the feature \feat{Style=Historic}; this is generally \emph{not}
-contextual in OpenType, which is why it is not included in this feature.
-
-\subsection{Vertical Position}
-
-\begin{features}{VerticalPosition}
-\otf{Superior}{sups}
-\otf{Inferior}{subs}
-\otf{Numerator}{numr}
-\otf{Denominator}{dnom}
-\otf{ScientificInferior}{sinf}
-\otf{Ordinal}{ordn}
-\end{features}
-
-The \feat{VerticalPosition} feature is used to access things like
-subscript (\opt{Inferior}) and superscript (\opt{Superior}) numbers and
-letters (and a small amount of punctuation, sometimes).
-The \opt{Ordinal} option will only raise characters that are used
-in some languages directly after a number.
-The \opt{ScientificInferior} feature will move glyphs
-further below the baseline than the \opt{Inferior} feature.
-These are shown in \exref{vertpos}
-
-\opt{Numerator} and \opt{Denominator} should only be used for creating
-arbitrary fractions (see next section).
-
-\begin{Lexample}{vertpos}{The \feat{VerticalPosition} feature.}
-  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=Superior]
-   Superior: 1234567890                                   \\
-  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=Numerator]
-   Numerator: 12345                                       \\
-  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=Denominator]
-   Denominator: 12345                                     \\
-  \fontspec{LibreCaslonText-Regular.otf}[VerticalPosition=ScientificInferior]
-   Scientific Inferior: 12345
-\end{Lexample}
-
-The \pkg{realscripts} package
-(which is also loaded by \pkg{xltxtra} for \XeTeX)
-redefines the \cmd\textsubscript\ and
-\cmd\textsuperscript\ commands to use the above font features automatically,
-including for use in footnote labels.
-If this is the only feature of \pkg{xltxtra} you wish to use, consider
-loading \pkg{realscripts} on its own instead.
-
-
-\subsection{Fractions}
-
-\begin{features}{Fractions}
-\otf{On}{frac}
-\otf{Alternate}{afrc}
-\end{features}
-
-For OpenType fonts use a regular text slash to create fractions, but
-the \feat{Fraction} feature must be explicitly activated.
-Some (Asian fonts predominantly) also provide for the
-\opt{Alternate} feature. These are both shown in \exref{ot-frac}.
-
-\begin{Xexample}{ot-frac}{The \feat{Fractions} feature.}
-  \fontspec{Hiragino Maru Gothic Pro W4}
-   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
-  \addfontfeature{Fractions=On}
-   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
-  \addfontfeature{Fractions=Alternate}
-   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
-\end{Xexample}
-
-
-\subsection{Stylistic Set variations}
-
-This feature selects a `Stylistic Set' variation,
-which usually corresponds to an alternate glyph style for a range of
-characters (usually an alphabet or subset thereof).
-This feature is specified numerically. These correspond to OpenType
-features |ss01|, |ss02|, etc.
-
-Two demonstrations from the Junicode
-font\note{\url{http://junicode.sf.net}}
-are shown in \exref{ss} and \exref{ss2}; thanks to Adam
-Buchbinder for the suggestion.
-
-\begin{Lexample}{ss}{Insular letterforms, as used in medieval Northern Europe, for the Junicode font accessed with the \feat{StylisticSet} feature.}
-  \fontspec{Junicode}
-   Insular forms. \\
-  \addfontfeature{StylisticSet=2}
-   Insular forms. \\
-\end{Lexample}
-
-\begin{Lexample}{ss2}{Enlarged minuscules (capital letters remain unchanged) for the Junicode font, accessed with the \feat{StylisticSet} feature.}
-  \fontspec{Junicode}
-   ENLARGED Minuscules. \\
-  \addfontfeature{StylisticSet=6}
-   ENLARGED Minuscules. \\
-\end{Lexample}
-
-Multiple stylistic sets may be selected simultaneously by writing, e.g.,
-|StylisticSet={1,2,3}|.
-
-The |StylisticSet| feature is a synonym of the \feat{Variant} feature for \AAT\ fonts.
-See \vref{sec:newfeatures} for a way to assign names to stylistic sets, which should be done on a per-font basis.
-
-\subsection{Character Variants}
-
-Similar to the `Stylistic Sets' above, `Character Variations' are selected
-numerically to adjust the output of (usually) a single character for the
-particular font. These correspond to the OpenType features |cv01| to |cv99|.
-
-For each character that can be varied, it is possible to select among
-possible options for that particular glyph.
-For example, in \exref{cv} a variety of glyphs for the character `v' are
-selected, in which |5| corresponds to the character `v' for this font feature,
-and the trailing |:|\meta{n} corresponds to which variety to choose.
-Georg Duffner's open source Garamond revival font\footnote{\url{http://www.georgduffner.at/ebgaramond/}} is used in this example.
-Character variants are specifically designed not to conflict with each
-other, so you can enable them individually per character as shown in
-\exref{cv2}. (Unlike stylistic alternates, say.)
-
-Note that the indexing starts from zero.
-
-\begin{Lexample}[firstline=2]{cv}{The \feat{CharacterVariant} feature showing off Georg Duffner's open source Garamond revival font.}
-  \huge
-  \fontspec{EB Garamond 12 Italic}                       very \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5]   very \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:0] very \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:1] very \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:2] very \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant=5:3] very
-\end{Lexample}
-
-\begin{Lexample}[firstline=2]{cv2}{The \feat{CharacterVariant} feature selecting multiple variants simultaneously.}
-  \huge
-  \fontspec{EB Garamond 12 Italic}                           \& violet \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant={4}]     \& violet \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant={5:2}]   \& violet \\
-  \fontspec{EB Garamond 12 Italic}[CharacterVariant={4,5:2}] \& violet
-\end{Lexample}
-
-\subsection{Alternates}
-
-The \feat{Alternate} feature (for the raw OpenType feature |salt|) is used to access alternate font glyphs when variations exist in the font, such as in \exref{salt}.
-It uses a numerical selection, starting from zero, that will be different for each font.
-Note that the \texttt{Style=Alternate} option is equivalent
-to \texttt{Alternate=0} to access the default case.
-
-\begin{Xexample}[firstline=2]{salt}{The \feat{Alternate} feature.}
-  \huge
-  \fontspec{Linux Libertine O}
-  \textsc{a} \& h \\
-  \addfontfeature{Alternate=0}
-  \textsc{a} \& h
-\end{Xexample}
-
-Note that the indexing starts from zero.
-
-See \vref{sec:newfeatures} for a way to assign names to alternates,
-which must be done on a per-font basis.
-
-\subsection{Style}
-\label{sec:ot-feat-style}
-
-\begin{features}{Style}
-\otf{Alternate}{salt}
-\otf{Italic}{ital}
-\otf{Ruby}{ruby}
-\otf{Swash}{swsh}
-\otf{Historic}{hist}
-\otf{TitlingCaps}{titl}
-\otf{HorizontalKana}{hkna}
-\otf{VerticalKana}{vkna}
-\end{features}
-
-`Ruby' refers to a small optical size, used in
-Japanese typography for annotations.
-For fonts with multiple |salt| OpenType features,
-use the fontspec \feat{Alternate} feature instead.
-
-\Exref{style-alt} and \exref{style-hist} both contain glyph
-substitutions with similar characteristics.
-Note the occasional inconsistency with which font features are labelled; a long-tailed `Q' could turn up anywhere!
-
- \begin{Xexample}[firstline=2]{style-alt}{Example of the \opt{Alternate} option of the \feat{Style} feature.}
-  \Large
-  \fontspec{Quattrocento Roman}
-   M Q W                      \\
-  \addfontfeature{Style=Alternate}
-   M Q W
-\end{Xexample}
-
-\begin{Xexample}[firstline=2]{style-hist}{Example of the \opt{Historic} option of the \feat{Style} feature.}
-  \Large
-  \fontspec{Adobe Jenson Pro}
-   M Q Z                      \\
-  \addfontfeature{Style=Historic}
-   M Q Z
-\end{Xexample}
-
-In other features, larger breadths of changes can be seen, covering
-the style of an entire alphabet. See \exref{style-titl} and \exref{style-itrub}; in the latter, the \opt{Italic} option affects the Latin text and the \opt{Ruby} option the Japanese.
-
-\begin{Xexample}[firstline=2]{style-titl}{Example of the \opt{TitlingCaps} option of the \feat{Style} feature.}
-  \Large
-  \fontspec{Adobe Garamond Pro}
-   TITLING CAPS                       \\
-  \addfontfeature{Style=TitlingCaps}
-   TITLING CAPS
-\end{Xexample}
-
-\begin{Xexample}[firstline=2]{style-itrub}{Example of the \opt{Italic} and \opt{Ruby} options of the \feat{Style} feature.}
-  \Large \def\kana{ようこそ ワカヨタレソ}
-  \fontspec{Hiragino Mincho Pro}
-   Latin \kana        \\
-  \addfontfeature{Style={Italic, Ruby}}
-   Latin \kana
-\end{Xexample}
-
-Note the difference here between the default and the horizontal style kana
-in \exref{style-hvkana}: the horizontal style is slightly wider.
-
-\begin{Xexample}[firstline=2]{style-hvkana}{Example of the \opt{HorizontalKana} and \opt{VerticalKana} options of the \feat{Style} feature.}
-  \Large \def\kana{ようこそ ワカヨタレソ}
-   \fontspec{Hiragino Mincho Pro}
-    \kana   \\
-  {\addfontfeature{Style=HorizontalKana}
-    \kana } \\
-  {\addfontfeature{Style=VerticalKana}
-    \kana }
-\end{Xexample}
-
-\subsection{Diacritics}
-Specifies how combining diacritics should be placed.
-These will usually be controlled automatically
-according to the Script setting.
-
-\begin{features}{Diacritics}
-\otf*{MarkToBase}{mark}
-\otf*{MarkToMark}{mkmk}
-\otf*{AboveBase}{abvm}
-\otf*{BelowBase}{blwm}
-\end{features}
-
-\subsection{Kerning}\label{sec:kerning}
-Specifies how inter-glyph spacing should behave.
-Well-made fonts include information for how differing
-amounts of space should be inserted between separate character pairs.
-This kerning space is inserted automatically but in rare
-circumstances you may wish to turn it off.
-
-\begin{features}{Kerning}
-\otf{Uppercase}{cpsp}
-\otf*[Off]{On}{kern}
-\end{features}
-
-As briefly mentioned previously at the end of \vref{sec:letters},
-the \opt{Uppercase} option will add a small amount of tracking between
-uppercase letters, seen in \exref{kernup}, which uses the Romande
-fonts\note{\url{http://arkandis.tuxfamily.org/adffonts.html}}
-(thanks to Clea F. Rees for the suggestion).
-The \opt{Uppercase} option acts separately to the regular kerning
-controlled by the \opt{On}/\opt{Off} options.
-
-\begin{Xexample}[firstline=2]{kernup}{Adding extra kerning for uppercase letters. (The difference is usually very small.)}
-  \large
-  \fontspec{Romande ADF Std Bold}
-   UPPERCASE EXAMPLE \\
-  \addfontfeature{Kerning=Uppercase}
-   UPPERCASE EXAMPLE
-\end{Xexample}
-
-
-\subsection{Font transformations}
-
-In rare situations users may want to mechanically distort the shapes of the glyphs in the current font such as shown in \exref{fake}. Please don't overuse these features; they are \emph{not} a good alternative to having the real shapes.
-
-\begin{Xexample}{fake}{Articifial font transformations.}
-  \fontspec{Charis SIL} \emph{ABCxyz} \quad
-  \fontspec{Charis SIL}[FakeSlant=0.2] ABCxyz
-
-  \fontspec{Charis SIL}  ABCxyz \quad
-  \fontspec{Charis SIL}[FakeStretch=1.2] ABCxyz
-
-  \fontspec{Charis SIL} \textbf{ABCxyz} \quad
-  \fontspec{Charis SIL}[FakeBold=1.5] ABCxyz
-\end{Xexample}
-
-If values are omitted, their defaults are as shown above.
-
-If you want the bold shape to be faked automatically, or the italic shape
-to be slanted automatically, use the \feat{AutoFakeBold} and
-\feat{AutoFakeSlant} features. For example, the following two invocations
-are equivalent:
-\begin{Verbatim}
-  \fontspec[AutoFakeBold=1.5]{Charis SIL}
-  \fontspec[BoldFeatures={FakeBold=1.5}]{Charis SIL}
-\end{Verbatim}
-If both of the \feat{AutoFake...} features are used, then the bold italic
-font will also be faked.
-
-The \feat{FakeBold} and \feat{AutoFakeBold} features are only available with the \XeTeX\ engine and will be ignored in \LuaTeX.
-
-\subsection{Annotation}
-Some fonts are equipped with an extensive range of
-numbers and numerals in different forms. These are accessed with the
-\feat{Annotation} feature (OpenType feature |nalt|), selected numerically as shown in
-\exref{ot-annot}.
-
-\begin{Xexample}{ot-annot}{Annotation forms for OpenType fonts.}
-  \fontspec{Hiragino Maru Gothic Pro}
-   1 2 3 4 5 6 7 8 9
-  \def\x#1{\\{\addfontfeature{Annotation=#1}
-            1 2 3 4 5 6 7 8 9 }}
-  \x0\x1\x2\x3\x4\x5\x6\x7\x7\x8\x9
-\end{Xexample}
-
-Note that the indexing starts from zero.
-
-\subsection{CJK shape}
-
-\begin{features}{CJKShape}
-\otf{Traditional}{trad}
-\otf{Simplified} {smpl}
-\otf{JIS1978}    {jp78}
-\otf{JIS1983}    {jp83}
-\otf{JIS1990}    {jp90}
-\otf{Expert}     {expt}
-\otf{NLC}        {nlck}
-\end{features}
-
-There have been many standards for how CJK ideographic
-glyphs are `supposed' to look. Some fonts will contain many alternate
-glyphs available in order to be able to display these gylphs
-correctly in whichever form is appropriate. Both \AAT\ and OpenType
-fonts support the following \feat{CJKShape} options:
-\opt{Traditional}, \opt{Simplified}, \opt{JIS1978}, \opt{JIS1983},
-\opt{JIS1990}, and \opt{Expert}. OpenType also supports the \opt{NLC} option.
-
-\begin{Xexample}[firstline=2]{ot-cjk-shape}{Different standards for CJK ideograph presentation.}
-  \LARGE\def\text{ 唖噛躯 妍并訝}
-  \fontspec{Hiragino Mincho Pro}
-  {\addfontfeature{CJKShape=Traditional}
-  \text }                          \\
-  {\addfontfeature{CJKShape=NLC}
-  \text }                          \\
-  {\addfontfeature{CJKShape=Expert}
-  \text }
-\end{Xexample}
-
-\subsection{Character width}\label{sec:CharacterWidth}
-Many Asian fonts are equipped with variously spaced characters for
-shoe-horning into their generally monospaced text.
-These are
-accessed through the \feat{CharacterWidth} feature.
-
-\begin{features}{CharacterWidth}
-\otf{Proportional}{pwid}
-\otf{Full}        {fwid}
-\otf{Half}        {hwid}
-\otf{Third}       {twid}
-\otf{Quarter}     {qwid}
-\otf{AlternateProportional}{palt}
-\otf{AlternateHalf}{halt}
-\end{features}
-
-Japanese alphabetic glyphs (in Hiragana or Katakana) may be typeset
-proportionally, to better fit horizontal measures, or monospaced, to
-fit into the rigid grid imposed by ideographic typesetting. In this
-latter case, there are also half-width forms for squeezing more kana
-glyphs (which are less complex than the kanji they are amongst) into
-a given block of space. The same features are given to roman letters
-in Japanese fonts, for typesetting foreign words in the same style
-as the surrounding text.
-
-\begin{Xexample}[firstline=2]{charwdprop}{Proportional or fixed width forms.}
-  \def\texta{ようこそ}\def\textb{ワカヨタレソ}
-  \def\test{\makebox[2cm][l]{\texta}%
-            \makebox[2.5cm][l]{\textb}%
-            \makebox[2.5cm][l]{abcdef}}
-  \fontspec{Hiragino Mincho Pro}
-  {\addfontfeature{CharacterWidth=Proportional}\test}\\
-  {\addfontfeature{CharacterWidth=Full}\test}\\
-  {\addfontfeature{CharacterWidth=Half}\test}
-\end{Xexample}
-
-The same situation occurs with numbers, which are provided in
-increasingly illegible compressed forms seen in \exref{charwd}.
-
-\begin{Xexample}[firstline=2]{charwd}{Numbers can be compressed significantly.}
-  \centering
-  \fontspec[Renderer=AAT]{Hiragino Mincho Pro}
-  {\addfontfeature{CharacterWidth=Full}
-   ---12321---}\\
-  {\addfontfeature{CharacterWidth=Half}
-   ---1234554321---}\\
-  {\addfontfeature{CharacterWidth=Third}
-   ---123456787654321---}\\
-  {\addfontfeature{CharacterWidth=Quarter}
-   ---12345678900987654321---}
-\end{Xexample}
-
-\subsection{Vertical typesetting}
-
-TODO!
-
-
-\subsection{OpenType scripts and languages}\label{sec:ot}
-
-Fonts that include glyphs for various scripts and languages may contain different font features for the different character sets and languages they support, and different font features may behave differently depending on the script or language chosen.
-When multilingual fonts are used, it is important to select which language
-they are being used for, and more importantly what script is being used.
-
-The `script' refers to the alphabet in use; for example, both English
-and French use the Latin script. Similarly, the Arabic script can be used
-to write in both the Arabic and Persian languages.
-
-The
-\feat{Script} and \feat{Language} features are used to designate this information. The possible options are
-tabulated in \vref{tab:ot-scpt} and \vref{tab:ot-lang},
-respectively. When a script or language is requested that is not
-supported by the current font, a warning is printed in the console output.
-
-Because these font features can
-change which features are able to be selected for the font, they 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}.
-
-
-\subsubsection{\feat{Script} and \feat{Language} examples}
-
-In the examples shown in \exref{script-lang},
-the Code2000 font\note{\url{http://www.code2000.net/}}
-is used to typeset various input texts with and without the OpenType Script
-applied for various alphabets.
-The text is only rendered correctly in the second case;
-many examples of incorrect diacritic spacing as
-well as a lack of contextual ligatures and rearrangement can be
-seen.
-Thanks to \name{Jonathan Kew}, \name{Yves Codet} and
-\name{Gildas Hamel} for their contributions towards these examples.
-
-\begin{Xexample}[firstline=14,lastline=23]{script-lang}{An example of various Scripts and Languages.}
-\def\testfeature#1#2{%^^A
-  \fontspec{\examplefont}#2 & \fontspec[#1]{\examplefont}#2\\[1ex]}
-\def \examplefont{Code2000}
-\def \arabictext{العربي}
-\def \devanagaritext{हिन्दी}
-\def \bengalitext{লেখ}
-\def \gujaratitext{મર્યાદા-સૂચક નિવેદન}
-\def \malayalamtext{നമ്മുടെ പാരബര്യ}
-\def \gurmukhitext{ਆਦਿ ਸਚੁ ਜੁਗਾਦਿ ਸਚੁ}
-\def \tamiltext{தமிழ் தேடி}
-\def \hebrewtext{רִדְתָּֽהּ}
-\def \vietnamesetext{cấp số mỗi}
-\begin{tabular}{r@{\quad}l}
-  \testfeature{Script=Arabic}{\arabictext}
-  \testfeature{Script=Devanagari}{\devanagaritext}
-  \testfeature{Script=Bengali}{\bengalitext}
-  \testfeature{Script=Gujarati}{\gujaratitext}
-  \testfeature{Script=Malayalam}{\malayalamtext}
-  \testfeature{Script=Gurmukhi}{\gurmukhitext}
-  \testfeature{Script=Tamil}{\tamiltext}
-  \testfeature{Script=Hebrew}{\hebrewtext}
-  \def\examplefont{Doulos SIL}
-  \testfeature{Language=Vietnamese}{\vietnamesetext}
-\end{tabular}
-\end{Xexample}
-
-
-
-\subsubsection{Defining new scripts and languages}
-
-\DescribeMacro{\newfontscript}
-\DescribeMacro{\newfontlanguage}
-While the scripts and languages listed in \ref{tab:ot-scpt} and \ref{tab:ot-lang}
-are intended to be comprehensive, there may be some missing; alternatively,
-you might wish to use different names to access scripts/languages that are
-already listed.
-Adding scripts and languages can be performed with the \cmd\newfontscript\
-and \cmd\newfontlanguage\ commands. For example,
-\begin{Verbatim}
-  \newfontscript{Arabic}{arab}
-  \newfontlanguage{Zulu}{ZUL}
-\end{Verbatim}
-The first argument is the \pkg{fontspec} name, the second the OpenType
-tag. The advantage to using these commands rather than \cmd\newfontfeature\
-(see \vref{sec:newfeatures}) is the error-checking that is performed when
-the script or language is requested.
-
-\begin{table}[!hbp]
-  \caption{Defined \opt{Script}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily\textcolor{red}{\P}}).}
-  \label{tab:ot-scpt}
-\def\dup{\makebox[0pt][r]{\textcolor{red}{\P}}}
-\setlength\columnseprule{0pt}
-  \hrule
-  \begin{multicols}{4}\setlength\parindent{0pt}
-    \sffamily\scriptsize
-    Arabic \par Armenian \par Balinese \par Bengali \par Bopomofo \par Braille \par Buginese \par Buhid \par Byzantine Music \par Canadian Syllabics \par Cherokee \par \dup CJK \par \dup CJK Ideographic \par Coptic \par Cypriot Syllabary \par Cyrillic \par Default \par Deseret \par Devanagari \par Ethiopic \par Georgian \par Glagolitic \par Gothic \par Greek \par Gujarati \par Gurmukhi \par Hangul Jamo \par Hangul \par Hanunoo \par Hebrew \par \dup Hiragana and Katakana \par \dup Kana \par Javanese \par Kannada \par Kharosthi \par Khmer \par Lao \par Latin \par Limbu \par Linear B \par Malayalam \par \dup Math \par \dup Maths \par Mongolian \par Musical Symbols \par Myanmar \par N'ko \par Ogham \par Old Italic \par Old Persian Cuneiform \par Oriya \par Osmanya \par Phags-pa \par Phoenician \par Runic \par Shavian \par Sinhala \par Sumero-Akkadian Cuneiform \par Syloti Nagri \par Syriac \par Tagalog \par Tagbanwa \par Tai Le \par Tai Lu \par Tamil \par Telugu \par Thaana \par Thai \par Tibetan \par Tifinagh \par Ugaritic Cuneiform \par Yi
-  \end{multicols}
-  \hrule
-\end{table}
-
-\begin{table}[p]
-  \vspace*{-3cm}
-  \hspace{-3cm}
-  \def\dup{\makebox[0pt][r]{\textcolor{red}{\P}}}
-  \begin{minipage}{\linewidth+4cm}
-  \caption{Defined \opt{Language}s for OpenType fonts. Aliased names are shown in adjacent positions marked with red pilcrows ({\sffamily\textcolor{red}{\P}}).}
-  \label{tab:ot-lang}
-  \setlength\columnseprule{0pt}
-  \hrule
-  \begin{multicols}{6}
-    \everypar{\setlength\parindent{0pt}\setlength\hangindent{2em}}
-    \sffamily\footnotesize\raggedright
-    Abaza \par Abkhazian \par Adyghe \par Afrikaans \par Afar \par Agaw \par Altai \par Amharic \par Arabic \par Aari \par Arakanese \par Assamese \par Athapaskan \par Avar \par Awadhi \par Aymara \par Azeri \par Badaga \par Baghelkhandi \par Balkar \par Baule \par Berber \par Bench \par Bible Cree \par Belarussian \par Bemba \par Bengali \par Bulgarian \par Bhili \par Bhojpuri \par Bikol \par Bilen \par Blackfoot \par Balochi \par Balante \par Balti \par Bambara \par Bamileke \par Breton \par Brahui \par Braj Bhasha \par Burmese \par Bashkir \par Beti \par Catalan \par Cebuano \par Chechen \par Chaha Gurage \par Chattisgarhi \par Chichewa \par Chukchi \par Chipewyan \par Cherokee \par Chuvash \par Comorian \par Coptic \par Cree \par Carrier \par Crimean Tatar \par Church Slavonic \par Czech \par Danish \par Dargwa \par Woods Cree \par German \par Default \par Dogri \par Divehi \par Djerma \par Dangme \par Dinka \par Dungan \par Dzongkha \par Ebira \par Eastern Cree \par Edo \par Efik \par Greek \par English \par Erzya \par Spanish \par Estonian \par Basque \par Evenki \par Even \par Ewe \par French Antillean \par \dup Farsi \par \dup Parsi \par \dup Persian \par Finnish \par Fijian \par Flemish \par Forest Nenets \par Fon \par Faroese \par French \par Frisian \par Friulian \par Futa \par Fulani \par Ga \par Gaelic \par Gagauz \par Galician \par Garshuni \par Garhwali \par Ge'ez \par Gilyak \par Gumuz \par Gondi \par Greenlandic \par Garo \par Guarani \par Gujarati \par Haitian \par Halam \par Harauti \par Hausa \par Hawaiin \par Hammer-Banna \par Hiligaynon \par Hindi \par High Mari \par Hindko \par Ho \par Harari \par Croatian \par Hungarian \par Armenian \par Igbo \par Ijo \par Ilokano \par Indonesian \par Ingush \par Inuktitut \par Irish \par Irish Traditional \par Icelandic \par Inari Sami \par Italian \par Hebrew \par Javanese \par Yiddish \par Japanese \par Judezmo \par Jula \par Kabardian \par Kachchi \par Kalenjin \par Kannada \par Karachay \par Georgian \par Kazakh \par Kebena \par Khutsuri Georgian \par Khakass \par Khanty-Kazim \par Khmer \par Khanty-Shurishkar \par Khanty-Vakhi \par Khowar \par Kikuyu \par Kirghiz \par Kisii \par Kokni \par Kalmyk \par Kamba \par Kumaoni \par Komo \par Komso \par Kanuri \par Kodagu \par Korean Old Hangul \par Konkani \par Kikongo \par Komi-Permyak \par Korean \par Komi-Zyrian \par Kpelle \par Krio \par Karakalpak \par Karelian \par Karaim \par Karen \par Koorete \par Kashmiri \par Khasi \par Kildin Sami \par Kui \par Kulvi \par Kumyk \par Kurdish \par Kurukh \par Kuy \par Koryak \par Ladin \par Lahuli \par Lak \par Lambani \par Lao \par Latin \par Laz \par L-Cree \par Ladakhi \par Lezgi \par Lingala \par Low Mari \par Limbu \par Lomwe \par Lower Sorbian \par Lule Sami \par Lithuanian \par Luba \par Luganda \par Luhya \par Luo \par Latvian \par Majang \par Makua \par Malayalam Traditional \par Mansi \par Marathi \par Marwari \par Mbundu \par Manchu \par Moose Cree \par Mende \par Me'en \par Mizo \par Macedonian \par Male \par Malagasy \par Malinke \par Malayalam Reformed \par Malay \par Mandinka \par Mongolian \par Manipuri \par Maninka \par Manx Gaelic \par Moksha \par Moldavian \par Mon \par Moroccan \par Maori \par Maithili \par Maltese \par Mundari \par Naga-Assamese \par Nanai \par Naskapi \par N-Cree \par Ndebele \par Ndonga \par Nepali \par Newari \par Nagari \par Norway House Cree \par Nisi \par Niuean \par Nkole \par N'ko \par Dutch \par Nogai \par Norwegian \par Northern Sami \par Northern Tai \par Esperanto \par Nynorsk \par Oji-Cree \par Ojibway \par Oriya \par Oromo \par Ossetian \par Palestinian Aramaic \par Pali \par Punjabi \par Palpa \par Pashto \par Polytonic Greek \par Pilipino \par Palaung \par Polish \par Provencal \par Portuguese \par Chin \par Rajasthani \par R-Cree \par Russian Buriat \par Riang \par Rhaeto-Romanic \par Romanian \par Romany \par Rusyn \par Ruanda \par Russian \par Sadri \par Sanskrit \par Santali \par Sayisi \par Sekota \par Selkup \par Sango \par Shan \par Sibe \par Sidamo \par Silte Gurage \par Skolt Sami \par Slovak \par Slavey \par Slovenian \par Somali \par Samoan \par Sena \par Sindhi \par Sinhalese \par Soninke \par Sodo Gurage \par Sotho \par Albanian \par Serbian \par Saraiki \par Serer \par South Slavey \par Southern Sami \par Suri \par Svan \par Swedish \par Swadaya Aramaic \par Swahili \par Swazi \par Sutu \par Syriac \par Tabasaran \par Tajiki \par Tamil \par Tatar \par TH-Cree \par Telugu \par Tongan \par Tigre \par Tigrinya \par Thai \par Tahitian \par Tibetan \par Turkmen \par Temne \par Tswana \par Tundra Nenets \par Tonga \par Todo \par Turkish \par Tsonga \par Turoyo Aramaic \par Tulu \par Tuvin \par Twi \par Udmurt \par Ukrainian \par Urdu \par Upper Sorbian \par Uyghur \par Uzbek \par Venda \par Vietnamese \par Wa \par Wagdi \par West-Cree \par Welsh \par Wolof \par Tai Lue \par Xhosa \par Yakut \par Yoruba \par Y-Cree \par Yi Classic \par Yi Modern \par Chinese Hong Kong \par Chinese Phonetic \par Chinese Simplified \par Chinese Traditional \par Zande \par Zulu
-  \end{multicols}
-  \hspace{4pt}
-  \hrule
- \end{minipage}
-\end{table}
-
-
-
-\part{\LuaTeX-only font features}
-\label{sec:luatex-features}
-
-\section{OpenType font feature files}
-
-An OpenType font feature file is a plain text file describing OpenType layout
-feature of a font in a human-readable format. The syntax of OpenType feature
-files is defined by Adobe\note{\url{http://www.adobe.com/devnet/opentype/afdko/topic_feature_file_syntax.html}}.
-
-Feature files can be used to add or customize OpenType features of a font on
-the fly without editing the font file itself.
-
-Adding a new OpenType feature is as creating a plain text file defining
-the new feature and then loading it by passing its name or path to
-\feat{FeatureFile}, then OpenType features defined in the file can be
-activated as usual.
-
-For example, when adding one of the default features like \texttt{kern}
-or \texttt{liga}, no special activation is needed. On the other hand,
-an optional feature like \texttt{onum} or \texttt{smcp} will be
-activated when old style numbers or small capitals are activated,
-respectively. However, OpenType feature in the feature file can have any
-and that can be used to selectively activate the feature; for example
-defining a ligature feature called \texttt{mlig} and then activating it
-using \feat{RawFeature} option without activating other ligatures in the
-font.
-
-Figure~\ref{fig:featurefile} shows an example feature file. The first two
-lines set the script and language under which the defined features will be
-available, which the default language in both default and Latin scripts,
-respectively.
-
-Then it defines a \texttt{liga} feature, which is a glyph substitution
-feature. The names starting with backslash are glyph names that is to be
-substituted and while the leading backslash is optional, it is used to
-escape glyph names when they interfere with preserved keywords. It should
-also be noted that glyph names are font specific and the same glyph can be
-named differently in different fonts.
-
-Glyph positioning features like kerning can be defined in a similar way,
-but instead of the keyword \texttt{sub(stitute)} the keyword
-\texttt{pos(ition)} is used instead. Figure~\ref{fig:featurefile} shows
-an example of adding kerning between \texttt{AY} and \texttt{ay}\note{
-The kerning is expressed in font design units which are fractions of em
-depending on the \emph{units per em} value of the font, usually 1000 for
-PostScript fonts and 2048 for TrueType fonts.}.
-
-Lines starting with \verb|#| are comments and will be ignored.
-
-An OpenType feature file can have any number of features and can have a
-mix of substitution and positioning features, please refer to the full
-feature file specification for further documentation.
-
-\begin{figure}
-\caption{An example font feature file.}
-\label{fig:featurefile}
-\hrule
-\begin{Verbatim}
-languagesystem DFLT dflt;
-languagesystem latn dflt;
-
-# Ligatures
-feature liga {
-  sub \f \i by \fi;
-  sub \f \l by \fl;
-} liga;
-
-# Kerning
-feature kern {
- pos \A \Y -200;
- pos \a \y -80;
-} kern;
-\end{Verbatim}
-\hrule
-\end{figure}
-
-\part{Fonts and features with \XeTeX}
-\label{sec:xetex-features}
-
-
-
-
-\section{\XeTeX-only font features}
-
-The features described here are available for any font
-selected by \pkg{fontspec}.
-
-\subsection{Mapping}
-\label{sec:mapping}
-
-\feat{Mapping} enables a \XeTeX\ text-mapping scheme, shown in \exref{mapping}.
-
-\begin{Xexample}{mapping}{\XeTeX's \feat{Mapping} feature.}
-  \fontspec{Cochin}[Mapping=tex-text]
-  ``!`A small amount of---text!''
-\end{Xexample}
-
-Using the |tex-text| mapping is also equivalent to writing |Ligatures=TeX|.
-The use of the latter syntax is recommended for better compatibility with
-\LuaTeX\ documents.
-
-
-\subsection{Letter spacing}
-Letter spacing, or tracking, is the term given to adding (or subtracting) a small amount of horizontal space in between adjacent characters. It is specified with the \feat{LetterSpace}, which takes a numeric argument,
-shown in \exref{tracking}.
-
-The letter spacing parameter is a normalised additive factor (not a scaling factor); it is defined as a percentage of the font size. That is, for a 10\,pt font, a letter spacing parameter of `|1.0|' will add 0.1\,pt between each letter.
-
-\begin{Xexample}{tracking}{The \feat{LetterSpace} feature.}
-  \fontspec{Didot}
-  \addfontfeature{LetterSpace=0.0}
-  USE TRACKING FOR DISPLAY CAPS TEXT \\
-  \addfontfeature{LetterSpace=2.0}
-  USE TRACKING FOR DISPLAY CAPS TEXT
-\end{Xexample}
-
-This functionality \emph{should not be used for lowercase text}, which is spacing correctly to begin with, but it can be very useful, in small amounts, when setting small caps or all caps titles.
-Also see the OpenType \opt{Uppercase}
-option of the \feat{Letters} feature (\vref*{sec:letters}).
-
-\subsection{Different font technologies: \AAT\ and OpenType}\label{sec:renderer}
-
-\XeTeX\ supports two rendering technologies for typesetting, selected with
-the \feat{Renderer} font feature. The first, \opt{AAT}, is
-that provided (only) by \MacOSX\ itself. The second, \opt{OpenType},
-is an open source OpenType interpreter.
-\note{v2.4: This was called `\texttt{ICU}' in previous versions of \XeTeX\ and \pkg{fontspec}.
-Backwards compatibility is preserved.}
-It provides greater support for
-OpenType features, notably contextual arrangement, over \opt{AAT}.
-
-In general, this feature will not need to be explicitly called: for OpenType
-fonts, the \opt{OpenType} renderer is used automatically, and for \AAT\ fonts,
-\opt{AAT} is chosen by default. Some fonts, however, will contain font tables
-for \emph{both} rendering technologies, such as the Hiragino Japanese fonts
-distributed with \MacOSX, and in these cases the choice may be required.
-
-Among some other font features only available through a specific renderer,
-\opt{OpenType} provides for the \feat{Script} and \feat{Language} features, which allow
-different font behaviour for different alphabets and languages; see \vref{sec:ot}
-for the description of these features. {\em Because these font features can
-change which features are able to be selected for the font instance, they are selected
-by \pkg{fontspec} before all others and will automatically and without warning
-select the \opt{OpenType} renderer.}
-
-
-\subsection{Optical font sizes} \label{sec:aat-opticalsize}
-
-Multiple Master fonts are parameterised over
-orthogonal font axes, allowing continuous selection along such
-features as weight, width, and optical size~(see \vref{sec:mm} for
-further details). Whereas an OpenType font will have only a few separate
-optical sizes, a Multiple Master font's optical size can be
-specified over a continuous range. Unfortunately, this flexibility makes
-it harder to create an automatic interface through \LaTeX, and the
-optical size for a Multiple Master font must always be specified
-explicitly.
-\begin{Verbatim}
-  \fontspec{Minion MM Roman}[OpticalSize=11]
-   MM optical size test                    \\
-  \fontspec{Minion MM Roman}[OpticalSize=47]
-   MM optical size test                    \\
-  \fontspec{Minion MM Roman}[OpticalSize=71]
-   MM optical size test                    \\
-\end{Verbatim}
-
-
-
-
-\section{\MacOSX's \AAT\ fonts}
-\label{sec:aat-features}
-
-\begin{quote}\itshape
-\textbf{Warning!}
-\XeTeX's implementation on \MacOSX\ is currently in a state of flux and the information contained below may well be wrong from 2013 onwards.
-There is a good chance that the features described in this section will not be available any more as \XeTeX's completes its transition to a cross-platform--only application.
-\end{quote}
-
-\MacOSX's font technology began life before the ubiquitous-OpenType era
-and revolved around the Apple-invented `\AAT' font format. This format
-had some advantages (and other disadvantages) but it never became widely
-popular in the font world.
-
-Nonetheless, this is the font format that was first supported by \XeTeX\
-(due to its pedigree on \MacOSX\ in the first place) and was the first
-font format supported by \pkg{fontspec}. A number of fonts distributed with
-\MacOSX\ are still in the \AAT\ format, such as `Skia'.
-
-\subsection{Ligatures}
-
-\feat{Ligatures} refer to the replacement of two separate characters
-with a specially drawn glyph for functional or \ae sthetic reasons.
-For \AAT\ fonts, you may choose from any combination of \opt{Required},
-\opt{Common}, \opt{Rare} (or \opt{Discretionary}), \opt{Logos}, \opt{Rebus},
-\opt{Diphthong}, \opt{Squared}, \opt{AbbrevSquared}, and \opt{Icelandic}.
-
-Some other Apple \AAT\ fonts have those `Rare' ligatures contained in
-the \opt{Icelandic} feature. Notice also that the old \TeX\ trick of
-splitting up a ligature with an empty brace pair does not work in
-\XeTeX; you must use a 0\,pt kern or \cs{hbox} (\eg, \cs{null}) to
-split the characters up if you do not want a ligature to be performed (the usual examples for when this might be desired are words like `shelf\null full').
-
-\subsection{Letters} \label{sec:aat-letters}
-The \opt{Letters} feature specifies how the letters in the current font
-will look. For \AAT\ fonts, you may choose from \opt{Normal},
-\opt{Uppercase}, \opt{Lowercase}, \opt{SmallCaps}, and
-\opt{InitialCaps}.
-
-
-\subsection{Numbers}
-The \feat{Numbers} feature defines how numbers will look in the
-selected font. For \AAT\ fonts, they may be a
-combination of \opt{Lining} or \opt{OldStyle} and \opt{Proportional} or
-\opt{Monospaced} (the latter is good for tabular material). The synonyms
-\opt{Uppercase} and \opt{Lowercase} are equivalent to \opt{Lining} and
-\opt{OldStyle}, respectively. The differences have been shown previously
-in \vref{sec:addfontfeatures}.
-
-\subsection{Contextuals} \label{sec:contextuals}
-This feature refers to glyph substitution that vary by their position;
-things like contextual swashes are implemented here.
-The options for \AAT\ fonts are
-\opt{WordInitial}, \opt{WordFinal} (\exref{wordcx}), \opt{LineInitial},
-\opt{LineFinal}, and \opt{Inner} (\exref{longsaat}, also called `non-final' sometimes). As
-non-exclusive selectors, like the ligatures, you can turn them off
-by prefixing their name with \opt{No}.
-
-\begin{Xexample}{wordcx}{Contextual glyph for the beginnings and ends of words.}
-  \newfontface\fancy{Hoefler Text Italic}
-      [Contextuals={WordInitial,WordFinal}]
-  \fancy where is all the vegemite
-\end{Xexample}
-
-\begin{Xexample}{longsaat}{A contextual feature for the `long s' can be convenient as the character does not need to be marked up explicitly.}
-  \fontspec{Hoefler Text}[Contextuals=Inner]
-  `Inner' swashes can \emph{sometimes}    \\
-   contain the archaic long~s.
-\end{Xexample}
-
-
-
-\subsection{Vertical position}
-The \feat{VerticalPosition} feature is used to access things like
-subscript (\opt{Inferior}) and superscript (\opt{Superior}) numbers and
-letters (and a small amount of punctuation, sometimes).
-The \opt{Ordinal} option is (supposed to be)
-contextually sensitive to only raise characters that appear directly
-after a number.
-These are shown in \exref{aat-supp}.
-
-\begin{Xexample}{aat-supp}{Vertical position for AAT fonts.}
-  \fontspec{Skia}
-   Normal
-  \fontspec{Skia}[VerticalPosition=Superior]
-   Superior
-  \fontspec{Skia}[VerticalPosition=Inferior]
-   Inferior                \\
-  \fontspec{Skia}[VerticalPosition=Ordinal]
-   1st 2nd 3rd 4th 0th 8abcde
-\end{Xexample}
-
-The \pkg{realscripts} package
-(also loaded by \pkg{xltxtra})
-redefines the \cmd\textsubscript\ and
-\cmd\textsuperscript\ commands to use the above font features,
-including for use in footnote labels.
-
-\subsection{Fractions}
-Many fonts come with the capability to typeset various forms of
-fractional material. This is accessed in \pkg{fontspec} with the
-\feat{Fractions} feature, which may be turned \opt{On} or \opt{Off}
-in both \AAT\ and OpenType fonts.
-
-In \AAT\ fonts, the `fraction slash' or solidus character, is
-to be used to create fractions. When \feat{Fractions} are turned
-\opt{On}, then only pre-drawn fractions will be used.
-See \exref{aat-frac}.
-
-Using the \opt{Diagonal} option (\AAT\ only), the font will attempt
-to create the fraction from superscript and subscript
-characters.
-
-\edef\caretcc{\the\catcode`\^}
-\catcode`\^=12\relax
-\begin{Xexample}{aat-frac}{Fractions in AAT fonts. The \texttt{\relax^^^^2044} glyph is the `fraction slash' that may be typed in \MacOSX\ with \textsc{opt+shift+1}; not shown literally here due to font contraints.}
-  \fontspec[Fractions=On]{Skia}
-   1{^^^^2044}2 \quad 5{^^^^2044}6 \\ % fraction slash
-   1/2 \quad 5/6    % regular  slash
-
-  \fontspec[Fractions=Diagonal]{Skia}
-         13579{^^^^2044}24680 \\ % fraction slash
-   \quad 13579/24680    % regular  slash
-\end{Xexample}
-\catcode`\^=\caretcc\relax
-
-Some (Asian fonts predominantly) also provide for the
-\opt{Alternate} feature shown in \exref{frac-alt}.
-
-\begin{Xexample}{frac-alt}{Alternate design of pre-composed fractions.}
-  \fontspec{Hiragino Maru Gothic Pro}
-   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680 \\
-  \addfontfeature{Fractions=Alternate}
-   1/2 \quad 1/4 \quad 5/6 \quad 13579/24680
-\end{Xexample}
-
-
-\subsection{Variants}
-The \feat{Variant} feature takes a single numerical input for
-choosing different alphabetic shapes. Don't mind my fancy \exref{aat-var}
-\texttt{:)} I'm just looping through the nine~(\,!\,) variants of
-Zapfino.
-
-\begin{Xexample}[firstline=2,lastline=9]{aat-var}{Nine variants of Zapfino.}
-  \Huge \rule{0pt}{2cm}
-  \newcounter{var}
-  \whiledo{\value{var}<9}{%
-    \edef\1{%
-    \noexpand\fontspec[Variant=\thevar,
-      Color=0099\thevar\thevar]{Zapfino}}\1%
-    \makebox[0.75\width]{d}%
-    \stepcounter{var}}
-  \hspace*{2cm}
-\end{Xexample}
-
-See \vref{sec:newfeatures} for a way to assign names to variants,
-which should be done on a per-font basis.
-
-\subsection{Alternates}
-
-Selection of \feat{Alternate}s \emph{again}
-must be done numerically; see \exref{aat-alt}.
-See \vref{sec:newfeatures} for a way to assign names to alternates,
-which should be done on a per-font basis.
-
-\begin{Xexample}{aat-alt}{Alternate shape selection must be numerical.}
-  \fontspec{Hoefler Text Italic}[Alternate=0]
-   Sphinx Of Black Quartz, {\scshape Judge My Vow} \\
-  \fontspec{Hoefler Text Italic}[Alternate=1]
-   Sphinx Of Black Quartz, {\scshape Judge My Vow}
-\end{Xexample}
-
-
-\subsection{Style}
-
-The options of the \feat{Style} feature
-are defined in \AAT\ as one of the following: \opt{Display},
-\opt{Engraved}, \opt{IlluminatedCaps}, \opt{Italic},
-\opt{Ruby},\footnotemark\ \opt{TallCaps}, or \opt{TitlingCaps}.
-\footnotetext{`Ruby' refers to a small optical size, used in
-Japanese typography for annotations.}
-
-Typical examples for these features are shown in \ref{sec:ot-feat-style}.
-
-
-
-
-
-
-\subsection{CJK shape}
-There have been many standards for how CJK ideographic
-glyphs are `supposed' to look. Some fonts will contain many alternate
-glyphs in order to be able to display these gylphs
-correctly in whichever form is appropriate. Both \AAT\ and OpenType
-fonts support the following \feat{CJKShape} options:
-\opt{Traditional}, \opt{Simplified}, \opt{JIS1978}, \opt{JIS1983},
-\opt{JIS1990}, and \opt{Expert}. OpenType also supports the \opt{NLC} option.
-
-\subsection{Character width}
-See \vref{sec:CharacterWidth} for relevant examples; the features are
-the same between OpenType and \AAT\ fonts.
-\AAT\ also allows \feat{CharacterWidth}|=|\opt{Default} to return to
-the original font settings.
-
-
-
-
-
-
-
-\subsection{Vertical typesetting}
-
-TODO: improve!
-
-\XeTeX\ provides for vertical typesetting simply with the ability to rotate
-the individual glyphs as a font is used for typesetting, as shown in
-\exref{vert}.
-
-\begin{Xexample}[firstline=2]{vert}{Vertical typesetting.}
-  \def\verttext{共産主義者は}
-  \fontspec{Hiragino Mincho Pro}
-  \verttext
-
-  \fontspec{Hiragino Mincho Pro}[Renderer=AAT,Vertical=RotatedGlyphs]
-  \rotatebox{-90}{\verttext}% requires the graphicx package
-\end{Xexample}
-
-No actual provision is made for typesetting top-to-bottom
-languages; for an example of how to do this, see the vertical Chinese
-example provided in the \XeTeX\ documentation.
-
-
-
-
-\subsection{Diacritics}
-Diacritics are marks, such as the acute accent or the tilde, applied to letters; they usually indicate a change in pronunciation.
-In Arabic scripts, diacritics are used to indicate vowels.
-You may either choose
-to \opt{Show}, \opt{Hide} or \opt{Decompose} them in \AAT\ fonts.
-The \opt{Hide} option is for scripts such as Arabic which may be
-displayed either with or without vowel markings. E.g.,
-\verb|\fontspec[Diacritics=Hide]{...}|
-
-Some older fonts distributed with \MacOSX\ included `|O/|' \etc\ as shorthand for writing `\O' under the label of the \feat{Diacritics} feature. If you come across such fonts, you'll
-want to turn this feature off (imagine typing |hello/goodbye| and
-getting `hell\o goodbye' instead!) by decomposing the two characters
-in the diacritic into the ones you actually
-want. I recommend using
-the proper \LaTeX\ input conventions for obtaining such characters
-instead.
-
-
-
-\subsection{Annotation}
-Various Asian fonts are equipped with a more extensive range of
-numbers and numerals in different forms. These are accessed through
-the \feat{Annotation} feature with the following
-options: \opt{Off},
-\opt{Box}, \opt{RoundedBox}, \opt{Circle}, \opt{BlackCircle},
-\opt{Parenthesis}, \opt{Period}, \opt{RomanNumerals}, \opt{Diamond},
-\opt{BlackSquare}, \opt{BlackRoundSquare}, and \opt{DoubleCircle}.
-
-
-
-\part{Programming interface}
-
-This is the beginning of some work to provide some hooks that use
-\pkg{fontspec} for various macro programming purposes.
-
-
-\section{Defining new features} \label{sec:newfeatures}
-This package cannot hope to contain every possible font
-feature. Three commands are provided for selecting font features
-that are not provided for out of the box. If you are using
-them a lot, chances are I've left something out, so please let me
-know.
-
-\DescribeMacro{\newAATfeature}
-New \AAT\ features may be created with this command:\par
-{\centering\cmd\newAATfeature\marg{feature}\marg{option}\marg{feature code}\marg{selector code}\par}\noindent
-Use the \XeTeX\ file \path{AAT-info.tex} to obtain the code numbers.
-See \exref{newAATfeat}.
-
-\begin{Xexample}{newAATfeat}{Assigning new \AAT\ features.}
-  \newAATfeature{Alternate}{HoeflerSwash}{17}{1}
-  \fontspec{Hoefler Text Italic}[Alternate=HoeflerSwash]
-   This is XeTeX by Jonathan Kew.
-\end{Xexample}
-
-
-\DescribeMacro{\newopentypefeature}
-New OpenType features may be created with this command:\par
-{\centering\cmd\newopentypefeature\marg{feature}\marg{option}\marg{feature tag}\par}
-The synonym \cs{newICUfeature} is deprecated.
-
-Here's what it would look like in practise:
-\begin{Verbatim}
-\newopentypefeature{Style}{NoLocalForms}{-locl}
-\end{Verbatim}
-
-\DescribeMacro{\newfontfeature}
-In case the above commands do not accommodate the desired font feature
-(perhaps a new \XeTeX\ feature that \pkg{fontspec} hasn't been updated
-to support), a command is provided to pass arbitrary input into the
-font selection string:\par
-{\centering\cmd{\newfontfeature}\marg{name}\marg{input string}\par}
-
-For example, Zapfino
-contains the feature `Avoid d-collisions'. To access it
-with this package, you could do some like that shown in \exref{avoidd}.
-(For some reason this feature doesn't appear to be working although \pkg{fontspec} is doing the right thing. To be investigated.)
-
-\begin{Xexample}{avoidd}{Assigning new arbitary features.}
-  \newfontfeature{AvoidD}{Special=Avoid d-collisions}
-  \newfontfeature{NoAvoidD}{Special=!Avoid d-collisions}
-  \fontspec{Zapfino}[AvoidD,Variant=1]
-   sockdolager rubdown               \\
-  \fontspec{Zapfino}[NoAvoidD,Variant=1]
-   sockdolager rubdown
-\end{Xexample}
-
-The advantage to using the \cmd\newAATfeature\ and \cmd\newopentypefeature\
-commands instead of \cs{newfontfeature} is that they check if the selected font actually contains the desired font
-feature at load time. By contrast, \cmd\newfontfeature\ will not give a warning
-for improper input.
-
-\section{Going behind \pkg{fontspec}'s back}
-Expert users may wish not to use \pkg{fontspec}'s feature handling at all,
-while still taking advantage of its \LaTeX\ font selection conveniences. The
-\feat{RawFeature} font feature allows literal \XeTeX\ font feature selection
-when you happen to have the OpenType feature tag memorised.
-
-\begin{Xexample}{raw}{Using raw font features directly.}
-  \fontspec{texgyrepagella-regular.otf}[RawFeature=+smcp]
-  Pagella small caps
-\end{Xexample}
-
-Multiple features can either be included in a single declaration:\par
-{\centering|[RawFeature=+smcp;+onum]|\par}
-\noindent or with multiple declarations:\par
-{\centering|[RawFeature=+smcp, RawFeature=+onum]|\par}
-
-\section{Renaming existing features \& options}
-\label{sec:aliasfontfeature}
-
-\DescribeMacro{\aliasfontfeature}
-If you don't like the name of a particular font feature,
-it may be aliased to another with the
-\cs{aliasfontfeature}\marg{existing name}\marg{new name} command,
-such as shown in \exref{alias}.
-
-\begin{Xexample}{alias}{Renaming font features.}
-  \aliasfontfeature{ItalicFeatures}{IF}
-  \fontspec{Hoefler Text}[IF = {Alternate=1}]
-  Roman Letters \itshape And Swash
-\end{Xexample}
-
-Spaces in feature (and option names, see below) \emph{are} allowed. (You may have
-noticed this already in the lists of OpenType scripts and languages).
-
-\DescribeMacro{\aliasfontfeatureoption}
-If you wish to change the name of a font feature option,
-it can be aliased to another with the command
-\cs{aliasfontfeatureoption}\marg{font feature}\marg{existing name}\marg{new name}, such as shown in \exref{aliasopt}.
-
-\begin{Lexample}{aliasopt}{Renaming font feature options.}
-  \aliasfontfeature{VerticalPosition}{Vert Pos}
-  \aliasfontfeatureoption{VerticalPosition}{ScientificInferior}{Sci Inf}
-  \fontspec{LinLibertine_R.otf}[Vert Pos=Sci Inf]
-   Scientific Inferior: 12345
-\end{Lexample}
-
-This example demonstrates an important point: when aliasing the feature
-options, the \emph{original} feature name must be used when declaring
-to which feature the option belongs.
-
-Only feature options that exist as sets of fixed strings may be altered in
-this way. That is, \opt{Proportional} can be aliased to \opt{Prop} in the
-\feat{Letters} feature, but \opt{550099BB} cannot be substituted for \opt{Purple}
-in a \feat{Color} specification. For this type of thing, the \cmd\newfontfeature\
-command should be used to declare a new, \eg, \feat{PurpleColor} feature:
-\begin{Verbatim}
-  \newfontfeature{PurpleColor}{color=550099BB}
-\end{Verbatim}
-Except that this example was written before support for named colours was
-implemented. But you get the idea.
-
-\section{Programming details}
-\label{sec:api}
-
-\subsection{Variables}
-
-\DescribeMacro{\l_fontspec_family_tl}
-\DescribeMacro{\l_fontspec_font}
-In some cases, it is useful to know what the \LaTeX\ font family
-of a specific \pkg{fontspec} font is. After a \cmd\fontspec-like
-command, this is stored inside the \cmd\l_fontspec_family_tl\ macro.
-Otherwise, \LaTeX's own \cmd\f@family\ macro can be useful here,
-too.
-The raw \TeX\ font that is defined from the `base' font in the family is stored in \cmd{\l_fontspec_font}.
-
-\DescribeMacro{\g_fontspec_encoding_tl}
-Package authors who need to load fonts with legacy \LaTeX\ \NFSS\ commands may also need to know what the default font encoding is.
-Since this has changed from \texttt{EU1}/\texttt{EU2} to \texttt{TU}, it is best to use the variables \cs{g_fontspec_encoding_tl} or \cs{UTFencname} instead.
-
-\subsection{Functions for loading new fonts and families}
-
-\begin{macro}{\fontspec_set_family:Nnn}
-\darg{\LaTeX\ family}
-\darg{fontspec features}
-\darg{font name}
-Defines a new \NFSS\ family from given \meta{features} and \meta{font},
-and stores the family name in the variable \meta{family}.
-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.
-\end{macro}
-
-\begin{macro}{\fontspec_set_fontface:NNnn}
-\darg{primitive font}
-\darg{\LaTeX\ family}
-\darg{fontspec features}
-\darg{font name}
-Variant of the above in which the primitive \TeX\ font command is stored in
-the variable \meta{primitive font}.
-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}.
-\end{macro}
-
-
-\subsection{Functions for querying font families}
-
-The following functions in \pkg{expl3} syntax may be used
-for writing code that interfaces with \pkg{fontspec}-loaded fonts.
-All of the following conditionals also exist with |T| and |F|
-as well as |TF| suffixes.
-
-\begin{macro}{\fontspec_if_fontspec_font:TF}
-Test whether the currently selected font has been loaded by fontspec.
-\end{macro}
-
-
-\begin{macro}{\fontspec_if_aat_feature:nnTF}
-Test whether the currently selected font contains the \AAT\
-feature (|#1|,|#2|).
-\end{macro}
-
-
-\begin{macro}{\fontspec_if_opentype:TF}
-Test whether the currently selected font is an OpenType font.
-Always true for \LuaTeX{} fonts.
-\end{macro}
-
-\begin{macro}{\fontspec_if_feature:nTF}
-Test whether the currently selected font contains the raw OpenType
-feature |#1|. E.g.: |\fontspec_if_feature:nTF {pnum} {True} {False}|.
-Returns false if the font is not loaded by fontspec or is not an OpenType
-font.
-\end{macro}
-
-\begin{macro}{\fontspec_if_feature:nnnTF}
-Test whether the currently selected font with raw OpenType script tag |#1| and raw OpenType language tag |#2| contains the raw OpenType feature tag |#3|. E.g.: |\fontspec_if_feature:nTF {latn} {ROM} {pnum} {True} {False}|.
-Returns false if the font is not loaded by fontspec or is not an OpenType
-font.
-\end{macro}
-
-\begin{macro}{\fontspec_if_script:nTF}
-Test whether the currently selected font contains the raw OpenType
-script |#1|. E.g.: |\fontspec_if_script:nTF {latn} {True} {False}|.
-Returns false if the font is not loaded by fontspec or is not an OpenType
-font.
-\end{macro}
-
-\begin{macro}{\fontspec_if_language:nTF}
-Test whether the currently selected font contains the raw OpenType language
-tag |#1|. E.g.: |\fontspec_if_language:nTF {ROM} {True} {False}|.
-Returns false if the font is not loaded by fontspec or is not an OpenType
-font.
-\end{macro}
-
-\begin{macro}{\fontspec_if_language:nnTF}
-Test whether the currently selected font contains the raw OpenType language
-tag |#2| in script |#1|. E.g.: |\fontspec_if_language:nnTF {cyrl} {SRB} {True} {False}|.
-Returns false if the font is not loaded by fontspec or is not an OpenType
-font.
-\end{macro}
-
-
-\begin{macro}{\fontspec_if_current_script:nTF}
-Test whether the currently loaded font is using the specified raw
-OpenType script tag |#1|.
-\end{macro}
-
-\begin{macro}{\fontspec_if_current_language:nTF}
-Test whether the currently loaded font is using the specified raw
-OpenType language tag |#1|.
-\end{macro}
-
-
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\part{The `improvement' of \LaTeXe\ and other packages}
-\label{sec:patching}
-
-This part of the package code contains patches to various
-\LaTeX\ components and third-party packages to improve the default
-behaviour.
-
-\section{Verbatim}
-\label{sec:verb}
-
-Many verbatim mechanisms assume the existence of a `visible space' character that exists in the \textsc{ascii} space slot of the typewriter font. This character is known in Unicode as \unichar{2423}{box open}, which looks like this: `\verb*| |'.
-
-When a Unicode typewriter font is used, \LaTeX\ no longer prints visible spaces for the |verbatim*| environment and |\verb*| command. This problem is fixed by using the correct Unicode glyph, and the following packages are patched to do the same:
-\pkg{listings}, \pkg{fancyvrb}, \pkg{moreverb}, and \pkg{verbatim}.
-
-In the case that the typewriter font does not contain `\verb*| |', the Latin Modern Mono font is used as a fallback.
-
-\section{Discretionary hyphenation: \cmd\-}
-\label{sec:hyphen}
-
-\LaTeX\ defines the macro \cmd\-\ to insert discretionary hyphenation points.
-However, it is hard-coded in \LaTeX\ to use the hyphen |-| character. Since \pkg{fontspec}
-makes it easy to change the hyphenation character on a per font basis, it would
-be nice if \cmd\-\ adjusted automatically --- and now it does.
-
-\section{Commands for old-style and lining numbers}
-
-\DescribeMacro{\oldstylenums}
-\DescribeMacro{\liningnums}
-\LaTeX's definition of \cs{oldstylenums} relies on strange font encodings.
-We provide a \pkg{fontspec}-compatible alternative and while we're at it
-also throw in the reverse option as well. Use \cs{oldstylenums}\marg{text}
-to explicitly use old-style (or lowercase) numbers in \meta{text}, and
-the reverse for \cs{liningnums}\marg{text}.
+\include{fontspec-doc-intro}
+\include{fontspec-doc-fontsel}
+\include{fontspec-doc-featset}
+\include{fontspec-doc-opentype}
+\include{fontspec-doc-enc}
+\include{fontspec-doc-luatex}
+\include{fontspec-doc-xetex}
+\include{fontspec-doc-api}
 
 \providecommand\ENDDOCUMENT{\end{document}}
 \ENDDOCUMENT
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-doc.toc b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.toc
new file mode 100644
index 00000000000..8190a871494
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-doc.toc
@@ -0,0 +1,96 @@
+\contentsline {part}{I\hspace {1em}Getting started}{4}{part.1}
+\contentsline {section}{\numberline {1}History}{4}{section.1}
+\contentsline {section}{\numberline {2}Introduction}{4}{section.2}
+\contentsline {subsection}{\numberline {2.1}Acknowledgements}{4}{subsection.2.1}
+\contentsline {section}{\numberline {3}Package loading and options}{5}{section.3}
+\contentsline {paragraph}{Font encodings}{5}{section*.1}
+\contentsline {paragraph}{\hologoRobust {LuaTeX}\ users only}{5}{section*.2}
+\contentsline {paragraph}{\textsf {babel}}{5}{section*.3}
+\contentsline {subsection}{\numberline {3.1}Maths fonts adjustments}{5}{subsection.3.1}
+\contentsline {subsection}{\numberline {3.2}Configuration}{6}{subsection.3.2}
+\contentsline {subsection}{\numberline {3.3}Warnings}{6}{subsection.3.3}
+\contentsline {part}{II\hspace {1em}General font selection}{7}{part.2}
+\contentsline {section}{\numberline {4}Font selection}{7}{section.4}
+\contentsline {subsection}{\numberline {4.1}By font name}{8}{subsection.4.1}
+\contentsline {subsection}{\numberline {4.2}By file name}{8}{subsection.4.2}
+\contentsline {subsection}{\numberline {4.3}Querying whether a font `exists'}{9}{subsection.4.3}
+\contentsline {section}{\numberline {5}Commands to select font families}{10}{section.5}
+\contentsline {subsection}{\numberline {5.1}More control over font shape selection}{11}{subsection.5.1}
+\contentsline {subsubsection}{\numberline {5.1.1}Small caps and slanted font shapes}{11}{subsubsection.5.1.1}
+\contentsline {subsection}{\numberline {5.2}Specifically choosing the \textsc {nfss}\ family}{12}{subsection.5.2}
+\contentsline {subsection}{\numberline {5.3}Choosing additional \textsc {nfss}\ font faces}{13}{subsection.5.3}
+\contentsline {subsection}{\numberline {5.4}Math(s) fonts}{14}{subsection.5.4}
+\contentsline {section}{\numberline {6}Miscellaneous font selecting details}{15}{section.6}
+\contentsline {paragraph}{The optional argument --- from v2.4}{15}{section*.8}
+\contentsline {paragraph}{Spaces}{16}{section*.9}
+\contentsline {paragraph}{Italic small caps}{16}{section*.10}
+\contentsline {paragraph}{Emphasis and nested emphasis}{16}{section*.11}
+\contentsline {part}{III\hspace {1em}OpenType}{17}{part.3}
+\contentsline {section}{\numberline {7}Introduction}{17}{section.7}
+\contentsline {subsection}{\numberline {7.1}How to select font features}{17}{subsection.7.1}
+\contentsline {subsection}{\numberline {7.2}How do I know what font features are supported by my fonts?}{18}{subsection.7.2}
+\contentsline {paragraph}{otfinfo}{18}{section*.12}
+\contentsline {section}{\numberline {8}OpenType font features}{19}{section.8}
+\contentsline {subsection}{\numberline {8.1}Tag-based features}{19}{subsection.8.1}
+\contentsline {subsubsection}{\numberline {8.1.1}Ligatures}{19}{subsubsection.8.1.1}
+\contentsline {subsection}{\numberline {8.2}Letters}{19}{subsection.8.2}
+\contentsline {subsubsection}{\numberline {8.2.1}Numbers}{23}{subsubsection.8.2.1}
+\contentsline {subsubsection}{\numberline {8.2.2}Contextuals}{24}{subsubsection.8.2.2}
+\contentsline {subsubsection}{\numberline {8.2.3}Vertical Position}{24}{subsubsection.8.2.3}
+\contentsline {subsubsection}{\numberline {8.2.4}Fractions}{26}{subsubsection.8.2.4}
+\contentsline {subsection}{\numberline {8.3}Style}{26}{subsection.8.3}
+\contentsline {subsection}{\numberline {8.4}Diacritics}{28}{subsection.8.4}
+\contentsline {subsection}{\numberline {8.5}Kerning}{28}{subsection.8.5}
+\contentsline {subsection}{\numberline {8.6}Character width}{28}{subsection.8.6}
+\contentsline {subsubsection}{\numberline {8.6.1}CJK shape}{30}{subsubsection.8.6.1}
+\contentsline {subsection}{\numberline {8.7}Vertical typesetting}{30}{subsection.8.7}
+\contentsline {subsection}{\numberline {8.8}Numeric features}{32}{subsection.8.8}
+\contentsline {subsubsection}{\numberline {8.8.1}Stylistic Set variations --- \texttt {ssNN}}{32}{subsubsection.8.8.1}
+\contentsline {subsubsection}{\numberline {8.8.2}Character Variants --- \texttt {cvNN}}{32}{subsubsection.8.8.2}
+\contentsline {subsubsection}{\numberline {8.8.3}Alternates --- \texttt {salt}}{34}{subsubsection.8.8.3}
+\contentsline {subsubsection}{\numberline {8.8.4}Annotation --- \texttt {nalt} }{34}{subsubsection.8.8.4}
+\contentsline {subsubsection}{\numberline {8.8.5}Ornament --- \texttt {ornm}}{34}{subsubsection.8.8.5}
+\contentsline {subsection}{\numberline {8.9}OpenType scripts and languages}{35}{subsection.8.9}
+\contentsline {subsubsection}{\numberline {8.9.1}\texttt {Script} and \texttt {Language} examples}{35}{subsubsection.8.9.1}
+\contentsline {part}{IV\hspace {1em}Commands for accents and symbols (`encodings')}{38}{part.4}
+\contentsline {section}{\numberline {9}A new Unicode-based encoding from scratch}{38}{section.9}
+\contentsline {section}{\numberline {10}Adjusting a pre-existing encoding}{39}{section.10}
+\contentsline {section}{\numberline {11}Summary of commands}{41}{section.11}
+\contentsline {part}{V\hspace {1em}\hologoRobust {LuaTeX}-only font features}{42}{part.5}
+\contentsline {section}{\numberline {12}Custom font features}{42}{section.12}
+\contentsline {part}{VI\hspace {1em}Fonts and features with \hologoRobust {XeTeX}}{43}{part.6}
+\contentsline {section}{\numberline {13}\hologoRobust {XeTeX}-only font features}{43}{section.13}
+\contentsline {subsection}{\numberline {13.1}Mapping}{43}{subsection.13.1}
+\contentsline {subsection}{\numberline {13.2}Different font technologies: \textsc {aat}\ and OpenType}{43}{subsection.13.2}
+\contentsline {subsection}{\numberline {13.3}Optical font sizes}{43}{subsection.13.3}
+\contentsline {section}{\numberline {14}Mac\nobreakspace {}OS\nobreakspace {}X's \textsc {aat}\ fonts}{44}{section.14}
+\contentsline {subsection}{\numberline {14.1}Ligatures}{44}{subsection.14.1}
+\contentsline {subsection}{\numberline {14.2}Letters}{44}{subsection.14.2}
+\contentsline {subsection}{\numberline {14.3}Numbers}{44}{subsection.14.3}
+\contentsline {subsection}{\numberline {14.4}Contextuals}{45}{subsection.14.4}
+\contentsline {subsection}{\numberline {14.5}Vertical position}{45}{subsection.14.5}
+\contentsline {subsection}{\numberline {14.6}Fractions}{46}{subsection.14.6}
+\contentsline {subsection}{\numberline {14.7}Variants}{46}{subsection.14.7}
+\contentsline {subsection}{\numberline {14.8}Alternates}{46}{subsection.14.8}
+\contentsline {subsection}{\numberline {14.9}Style}{47}{subsection.14.9}
+\contentsline {subsection}{\numberline {14.10}CJK shape}{47}{subsection.14.10}
+\contentsline {subsection}{\numberline {14.11}Character width}{47}{subsection.14.11}
+\contentsline {subsection}{\numberline {14.12}Vertical typesetting}{47}{subsection.14.12}
+\contentsline {subsection}{\numberline {14.13}Diacritics}{48}{subsection.14.13}
+\contentsline {subsection}{\numberline {14.14}Annotation}{48}{subsection.14.14}
+\contentsline {part}{VII\hspace {1em}Customisation and programming interface}{49}{part.7}
+\contentsline {section}{\numberline {15}Defining new features}{49}{section.15}
+\contentsline {section}{\numberline {16}Defining new scripts and languages}{50}{section.16}
+\contentsline {section}{\numberline {17}Going behind \textsf {fontspec}'s back}{50}{section.17}
+\contentsline {section}{\numberline {18}Renaming existing features \& options}{50}{section.18}
+\contentsline {section}{\numberline {19}Programming interface}{51}{section.19}
+\contentsline {subsection}{\numberline {19.1}Variables}{51}{subsection.19.1}
+\contentsline {subsection}{\numberline {19.2}Functions for loading new fonts and families}{51}{subsection.19.2}
+\contentsline {subsection}{\numberline {19.3}Conditionals}{52}{subsection.19.3}
+\contentsline {subsubsection}{\numberline {19.3.1}Querying font families}{52}{subsubsection.19.3.1}
+\contentsline {subsubsection}{\numberline {19.3.2}Availability of features}{52}{subsubsection.19.3.2}
+\contentsline {subsubsection}{\numberline {19.3.3}Currently selected features}{53}{subsubsection.19.3.3}
+\contentsline {part}{VIII\hspace {1em}The `improvement' of \LaTeXe \ and other packages}{54}{part.8}
+\contentsline {section}{\numberline {20}Verbatim}{54}{section.20}
+\contentsline {section}{\numberline {21}Discretionary hyphenation: \cs {\char 45\relax }}{54}{section.21}
+\contentsline {section}{\numberline {22}Commands for old-style and lining numbers}{54}{section.22}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-enc.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-enc.dtx
new file mode 100644
index 00000000000..c744c241651
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-enc.dtx
@@ -0,0 +1,138 @@
+
+% \section{Extended font encodings}
+%
+% \iffalse
+%    \begin{macrocode}
+%<*fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
+%
+% To be removed after the 2017 release of LaTeX2e:
+%    \begin{macrocode}
+\providecommand\UnicodeFontFile[2]{"[#1]:#2"}
+\providecommand\UnicodeFontName[2]{"#1:#2"}
+%<xetexx>\providecommand\UnicodeFontTeXLigatures{mapping=tex-text;}
+%<luatex>\providecommand\UnicodeFontTeXLigatures{+tlig;}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\providecommand\add@unicode@accent[2]{#2\char#1\relax}
+\providecommand\DeclareUnicodeAccent[3]{%
+  \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
+}
+%    \end{macrocode}
+%
+% \begin{macro}{\EncodingCommand}
+%    \begin{macrocode}
+\DeclareDocumentCommand \EncodingCommand {mO{}m}
+  {
+    \bool_if:NF \l_@@_defining_encoding_bool
+      { \@@_error:nn {only-inside-encdef} \EncodingCommand }
+    \DeclareTextCommand{#1}{\UnicodeEncodingName}[#2]{#3}
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\EncodingAccent}
+%    \begin{macrocode}
+\DeclareDocumentCommand \EncodingAccent {mm}
+  {
+    \bool_if:NF \l_@@_defining_encoding_bool
+      { \@@_error:nn {only-inside-encdef} \EncodingAccent }
+    \DeclareTextCommand{#1}{\UnicodeEncodingName}{\add@unicode@accent{#2}}
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\EncodingSymbol}
+%    \begin{macrocode}
+\DeclareDocumentCommand \EncodingSymbol {mm}
+  {
+    \bool_if:NF \l_@@_defining_encoding_bool
+      { \@@_error:nn {only-inside-encdef} \EncodingSymbol }
+    \DeclareTextSymbol{#1}{\UnicodeEncodingName}{#2}
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\EncodingComposite}
+%    \begin{macrocode}
+\DeclareDocumentCommand \EncodingComposite {mmm}
+  {
+    \bool_if:NF \l_@@_defining_encoding_bool
+      { \@@_error:nn {only-inside-encdef} \EncodingComposite }
+    \DeclareTextComposite{#1}{\UnicodeEncodingName}{#2}{#3}
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\EncodingCompositeCommand}
+%    \begin{macrocode}
+\DeclareDocumentCommand \EncodingCompositeCommand {mmm}
+  {
+    \bool_if:NF \l_@@_defining_encoding_bool
+      { \@@_error:nn {only-inside-encdef} \EncodingCompositeCommand }
+    \DeclareTextCompositeCommand{#1}{\UnicodeEncodingName}{#2}{#3}
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\DeclareUnicodeEncoding}
+%    \begin{macrocode}
+\DeclareDocumentCommand \DeclareUnicodeEncoding {mm}
+  {
+    \DeclareFontEncoding{#1}{}{}
+    \DeclareErrorFont{#1}{lmr}{m}{n}{10}
+    \DeclareFontSubstitution{#1}{lmr}{m}{n}
+    \DeclareFontFamily{#1}{lmr}{}
+
+    \DeclareFontShape{#1}{lmr}{m}{n}
+      {<->\UnicodeFontFile{lmroman10-regular}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{m}{it}
+      {<->\UnicodeFontFile{lmroman10-italic}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{m}{sc}
+      {<->\UnicodeFontFile{lmromancaps10-regular}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{bx}{n}
+      {<->\UnicodeFontFile{lmroman10-bold}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{bx}{it}
+      {<->\UnicodeFontFile{lmroman10-bolditalic}{\UnicodeFontTeXLigatures}}{}
+
+    \tl_set_eq:NN \l_@@_prev_unicode_name_tl \UnicodeEncodingName
+    \tl_set:Nn \UnicodeEncodingName {#1}
+    \bool_set_true:N \l_@@_defining_encoding_bool
+    #2
+    \bool_set_false:N \l_@@_defining_encoding_bool
+    \tl_set_eq:NN \UnicodeEncodingName \l_@@_prev_unicode_name_tl
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\UndeclareSymbol}
+%    \begin{macrocode}
+\DeclareDocumentCommand \UndeclareSymbol {m}
+  {
+    \bool_if:NF \l_@@_defining_encoding_bool
+      { \@@_error:nn {only-inside-encdef} \UndeclareSymbol }
+    \UndeclareTextCommand {#1} {\UnicodeEncodingName}
+  }
+
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\UndeclareComposite}
+%    \begin{macrocode}
+\DeclareDocumentCommand \UndeclareComposite {mm}
+  {
+    \bool_if:NF \l_@@_defining_encoding_bool
+      { \@@_error:nn {only-inside-encdef} \UndeclareComposite }
+    \cs_undefine:c
+      { \c_backslash_str \UnicodeEncodingName \token_to_str:N #1 - \tl_to_str:n {#2} }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \iffalse
+%    \begin{macrocode}
+%</fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-feat-aat.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-aat.dtx
new file mode 100644
index 00000000000..deda43cc049
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-aat.dtx
@@ -0,0 +1,224 @@
+
+% \subsection{AAT feature definitions}
+%
+% These are only defined for \XeTeX.
+%
+% \iffalse
+%    \begin{macrocode}
+%<*fontspec&xetexx>
+%    \end{macrocode}
+% \fi
+
+% \subsubsection{Ligatures}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {Ligatures}
+\@@_define_aat_feature:nnnn      {Ligatures} {Required} {1} {0}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoRequired} {1} {1}
+\@@_define_aat_feature:nnnn      {Ligatures} {Common} {1} {2}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoCommon} {1} {3}
+\@@_define_aat_feature:nnnn      {Ligatures} {Rare} {1} {4}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoRare} {1} {5}
+\@@_define_aat_feature:nnnn      {Ligatures} {Discretionary} {1} {4}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoDiscretionary} {1} {5}
+\@@_define_aat_feature:nnnn      {Ligatures} {Logos} {1} {6}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoLogos} {1} {7}
+\@@_define_aat_feature:nnnn      {Ligatures} {Rebus} {1} {8}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoRebus} {1} {9}
+\@@_define_aat_feature:nnnn      {Ligatures} {Diphthong} {1} {10}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoDiphthong} {1} {11}
+\@@_define_aat_feature:nnnn      {Ligatures} {Squared} {1} {12}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoSquared} {1} {13}
+\@@_define_aat_feature:nnnn      {Ligatures} {AbbrevSquared} {1} {14}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoAbbrevSquared} {1} {15}
+\@@_define_aat_feature:nnnn      {Ligatures} {Icelandic} {1} {32}
+\@@_define_aat_feature:nnnn      {Ligatures} {NoIcelandic} {1} {33}
+%    \end{macrocode}
+% Emulate CM extra ligatures.
+%    \begin{macrocode}
+\keys_define:nn {fontspec-aat}
+ {
+  Ligatures / TeX .code:n =
+   {
+    \@@_update_featstr:n { mapping = tex-text }
+   }
+ }
+%    \end{macrocode}
+%
+% \subsubsection{Letters}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {Letters}
+\@@_define_aat_feature:nnnn      {Letters} {Normal} {3} {0}
+\@@_define_aat_feature:nnnn      {Letters} {Uppercase} {3} {1}
+\@@_define_aat_feature:nnnn      {Letters} {Lowercase} {3} {2}
+\@@_define_aat_feature:nnnn      {Letters} {SmallCaps} {3} {3}
+\@@_define_aat_feature:nnnn      {Letters} {InitialCaps} {3} {4}
+%    \end{macrocode}
+%
+% \subsubsection{Numbers}
+%
+% These were originally separated into \feat{NumberCase} and
+% \feat{NumberSpacing} following \AAT, but it makes more sense to
+% combine them.
+%
+% Both naming conventions are offered to select the number case.
+%
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {Numbers}
+\@@_define_aat_feature:nnnn      {Numbers} {Monospaced} {6} {0}
+\@@_define_aat_feature:nnnn      {Numbers} {Proportional} {6} {1}
+\@@_define_aat_feature:nnnn      {Numbers} {Lowercase} {21} {0}
+\@@_define_aat_feature:nnnn      {Numbers} {OldStyle} {21} {0}
+\@@_define_aat_feature:nnnn      {Numbers} {Uppercase} {21} {1}
+\@@_define_aat_feature:nnnn      {Numbers} {Lining} {21} {1}
+\@@_define_aat_feature:nnnn      {Numbers} {SlashedZero} {14} {5}
+\@@_define_aat_feature:nnnn      {Numbers} {NoSlashedZero} {14} {4}
+%    \end{macrocode}
+%
+% \subsubsection{Contextuals}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n   {Contextuals}
+\@@_define_aat_feature:nnnn      {Contextuals} {WordInitial} {8} {0}
+\@@_define_aat_feature:nnnn      {Contextuals} {NoWordInitial} {8} {1}
+\@@_define_aat_feature:nnnn      {Contextuals} {WordFinal} {8} {2}
+\@@_define_aat_feature:nnnn      {Contextuals} {NoWordFinal} {8} {3}
+\@@_define_aat_feature:nnnn      {Contextuals} {LineInitial} {8} {4}
+\@@_define_aat_feature:nnnn      {Contextuals} {NoLineInitial} {8} {5}
+\@@_define_aat_feature:nnnn      {Contextuals} {LineFinal} {8} {6}
+\@@_define_aat_feature:nnnn      {Contextuals} {NoLineFinal} {8} {7}
+\@@_define_aat_feature:nnnn      {Contextuals} {Inner} {8} {8}
+\@@_define_aat_feature:nnnn      {Contextuals} {NoInner} {8} {9}
+%    \end{macrocode}
+%
+% \subsubsection{Diacritics}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {Diacritics}
+\@@_define_aat_feature:nnnn      {Diacritics} {Show} {9} {0}
+\@@_define_aat_feature:nnnn      {Diacritics} {Hide} {9} {1}
+\@@_define_aat_feature:nnnn      {Diacritics} {Decompose} {9} {2}
+%    \end{macrocode}
+%
+%
+% \subsubsection{Vertical position}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {VerticalPosition}
+\@@_define_aat_feature:nnnn      {VerticalPosition} {Normal} {10} {0}
+\@@_define_aat_feature:nnnn      {VerticalPosition} {Superior} {10} {1}
+\@@_define_aat_feature:nnnn      {VerticalPosition} {Inferior} {10} {2}
+\@@_define_aat_feature:nnnn      {VerticalPosition} {Ordinal} {10} {3}
+%    \end{macrocode}
+%
+% \subsubsection{Fractions}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {Fractions}
+\@@_define_aat_feature:nnnn      {Fractions} {On} {11} {1}
+\@@_define_aat_feature:nnnn      {Fractions} {Off} {11} {0}
+\@@_define_aat_feature:nnnn      {Fractions} {Diagonal} {11} {2}
+%    \end{macrocode}
+%
+% \subsubsection{Alternate}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n  { Alternate }
+\keys_define:nn {fontspec-aat}
+ {
+  Alternate .default:n = {0} ,
+  Alternate / unknown .code:n =
+   {
+    \clist_map_inline:nn {#1}
+      {
+        \@@_make_AAT_feature:nn {17}{##1}
+      }
+   }
+ }
+%    \end{macrocode}
+%
+%
+% \subsubsection{Variant / StylisticSet}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n  {Variant}
+\keys_define:nn {fontspec-aat}
+ {
+  Variant .default:n = {0} ,
+  Variant / unknown .code:n =
+   {
+    \clist_map_inline:nn {#1}
+      { \@@_make_AAT_feature:nn {18}{##1} }
+   }
+ }
+\aliasfontfeature{Variant}{StylisticSet}
+%    \end{macrocode}
+%
+%
+%
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n  {Vertical}
+\keys_define:nn {fontspec-aat}
+ {
+  Vertical .choice: ,
+  Vertical / RotatedGlyphs .code:n =
+    {
+      \__fontspec_update_featstr:n {vertical}
+    }
+ }
+
+%    \end{macrocode}
+%
+%
+% \subsubsection{Style}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {Style}
+\@@_define_aat_feature:nnnn      {Style} {Italic} {32} {2}
+\@@_define_aat_feature:nnnn      {Style} {Ruby} {28} {2}
+\@@_define_aat_feature:nnnn      {Style} {Display} {19} {1}
+\@@_define_aat_feature:nnnn      {Style} {Engraved} {19} {2}
+\@@_define_aat_feature:nnnn      {Style} {TitlingCaps} {19} {4}
+\@@_define_aat_feature:nnnn      {Style} {TallCaps} {19} {5}
+%    \end{macrocode}
+%
+% \subsubsection{CJK shape}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {CJKShape}
+\@@_define_aat_feature:nnnn      {CJKShape} {Traditional} {20} {0}
+\@@_define_aat_feature:nnnn      {CJKShape} {Simplified} {20} {1}
+\@@_define_aat_feature:nnnn      {CJKShape} {JIS1978} {20} {2}
+\@@_define_aat_feature:nnnn      {CJKShape} {JIS1983} {20} {3}
+\@@_define_aat_feature:nnnn      {CJKShape} {JIS1990} {20} {4}
+\@@_define_aat_feature:nnnn      {CJKShape} {Expert} {20} {10}
+\@@_define_aat_feature:nnnn      {CJKShape} {NLC} {20} {13}
+%    \end{macrocode}
+%
+% \subsubsection{Character width}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {CharacterWidth}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {Proportional} {22} {0}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {Full} {22} {1}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {Half} {22} {2}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {Third} {22} {3}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {Quarter} {22} {4}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {AlternateProportional} {22} {5}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {AlternateHalf} {22} {6}
+\@@_define_aat_feature:nnnn      {CharacterWidth} {Default} {22} {7}
+%    \end{macrocode}
+%
+% \subsubsection{Annotation}
+%    \begin{macrocode}
+\@@_define_aat_feature_group:n {Annotation}
+\@@_define_aat_feature:nnnn      {Annotation} {Off} {24} {0}
+\@@_define_aat_feature:nnnn      {Annotation} {Box} {24} {1}
+\@@_define_aat_feature:nnnn      {Annotation} {RoundedBox} {24} {2}
+\@@_define_aat_feature:nnnn      {Annotation} {Circle} {24} {3}
+\@@_define_aat_feature:nnnn      {Annotation} {BlackCircle} {24} {4}
+\@@_define_aat_feature:nnnn      {Annotation} {Parenthesis} {24} {5}
+\@@_define_aat_feature:nnnn      {Annotation} {Period} {24} {6}
+\@@_define_aat_feature:nnnn      {Annotation} {RomanNumerals} {24} {7}
+\@@_define_aat_feature:nnnn      {Annotation} {Diamond} {24} {8}
+\@@_define_aat_feature:nnnn      {Annotation} {BlackSquare} {24} {9}
+\@@_define_aat_feature:nnnn      {Annotation} {BlackRoundSquare} {24} {10}
+\@@_define_aat_feature:nnnn      {Annotation} {DoubleCircle} {24} {11}
+%    \end{macrocode}
+%
+% \iffalse
+%    \begin{macrocode}
+%</fontspec&xetexx>
+%    \end{macrocode}
+% \fi
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-feat-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-opentype.dtx
new file mode 100644
index 00000000000..7bfada24d79
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-feat-opentype.dtx
@@ -0,0 +1,534 @@
+
+% \subsection{OpenType feature definitions}
+%
+% \iffalse
+%    \begin{macrocode}
+%<*fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
+%
+%
+%    \begin{macrocode}
+\@@_feat_prop_add:nn {salt} { Alternate\,=\,$N$ }
+\@@_feat_prop_add:nn {nalt} { Annotation\,=\,$N$ }
+\@@_feat_prop_add:nn {ornm} { Ornament\,=\,$N$ }
+\@@_feat_prop_add:nn {cvNN} { CharacterVariant\,=\,$N$:$M$ }
+\@@_feat_prop_add:nn {ssNN} { StylisticSet\,=\,$N$ }
+%    \end{macrocode}
+%
+% \subsection{Regular key=val / tag definitions}
+%
+% \subsubsection{Ligatures}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n {Ligatures}
+\@@_define_opentype_feature:nnnnn {Ligatures} {ResetAll} {} {}
+  {
+    +dlig,-dlig,+rlig,-rlig,+liga,-liga,+dlig,-dlig,+clig,-clig,+hlig,-hlig,
+%<xetexx>  mapping = tex-text
+%<luatex>  +tlig,-tlig
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {Ligatures} {Required}      {rlig} {rlig} {}
+\@@_define_opentype_onoffreset:nnnnn {Ligatures} {Common}        {liga} {liga} {}
+\@@_define_opentype_onoffreset:nnnnn {Ligatures} {Rare}          {dlig} {dlig} {}
+\@@_define_opentype_onoffreset:nnnnn {Ligatures} {Discretionary} {dlig} {dlig} {}
+\@@_define_opentype_onoffreset:nnnnn {Ligatures} {Contextual}    {clig} {clig} {}
+\@@_define_opentype_onoffreset:nnnnn {Ligatures} {Historic}      {hlig} {hlig} {}
+%    \end{macrocode}
+% Emulate CM extra ligatures.
+%    \begin{macrocode}
+%<xetexx>\@@_define_opentype_onreset:nnnnn {Ligatures} {TeX} {} { mapping = tex-text } {}
+%<luatex>\@@_define_opentype_onreset:nnnnn {Ligatures} {TeX} {} { +tlig } {}
+%    \end{macrocode}
+%
+% \subsubsection{Letters}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n {Letters}
+\@@_define_opentype_feature:nnnnn   {Letters} {ResetAll} {} {}
+  {
+    +case,+smcp,+pcap,+c2sc,+c2pc,+unic,+rand,
+    -case,-smcp,-pcap,-c2sc,-c2pc,-unic,-rand
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {Letters} {Uppercase} {case} {case} {+smcp,+pcap,+c2sc,+c2pc,+unic,+rand}
+\@@_define_opentype_onoffreset:nnnnn {Letters} {SmallCaps} {smcp} {smcp} {+pcap,+unic,+rand}
+\@@_define_opentype_onoffreset:nnnnn {Letters} {PetiteCaps} {pcap} {pcap} {+smcp,+unic,+rand}
+\@@_define_opentype_onoffreset:nnnnn {Letters} {UppercaseSmallCaps} {c2sc} {c2sc} {+c2pc,+unic,+rand}
+\@@_define_opentype_onoffreset:nnnnn {Letters} {UppercasePetiteCaps} {c2pc} {c2pc} {+c2sc,+unic,+rand}
+\@@_define_opentype_onoffreset:nnnnn {Letters} {Unicase} {unic} {unic} {+rand}
+\@@_define_opentype_onoffreset:nnnnn {Letters} {Random} {rand} {rand} {+unic}
+%    \end{macrocode}
+%
+% \subsubsection{Numbers}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n {Numbers}
+\@@_define_opentype_feature:nnnnn   {Numbers} {ResetAll} {} {}
+  {
+    +tnum,-tnum,
+    +pnum,-pnum,
+    +onum,-onum,
+    +lnum,-lnum,
+    +zero,-zero,
+    +anum,-anum,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {Numbers} {Monospaced}   {tnum} {tnum} {+pnum,-pnum}
+\@@_define_opentype_onoffreset:nnnnn {Numbers} {Proportional} {pnum} {pnum} {+tnum,-tnum}
+\@@_define_opentype_onoffreset:nnnnn {Numbers} {Lowercase}    {onum} {onum} {+lnum,-lnum}
+\@@_define_opentype_onoffreset:nnnnn {Numbers} {Uppercase}    {lnum} {lnum} {+onum,-onum}
+\@@_define_opentype_onoffreset:nnnnn {Numbers} {SlashedZero}  {zero} {zero} {}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\aliasfontfeatureoption {Numbers} {Lowercase} {OldStyle}
+\aliasfontfeatureoption {Numbers} {Uppercase} {Lining}
+%    \end{macrocode}
+%
+% |luaotload| provides a custom |anum| feature for replacing Latin
+% (AKA Arabic) numbers with Arabic (AKA Indic-Arabic). The same feature
+% maps to Farsi (Persian) numbers if font language is Farsi.
+%    \begin{macrocode}
+%<luatex>  \@@_define_opentype_onoffreset:nnnnn {Numbers} {Arabic} {anum} {anum} {}
+%    \end{macrocode}
+%
+% \subsubsection{Vertical position}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {VerticalPosition}
+\@@_define_opentype_feature:nnnnn    {VerticalPosition} {ResetAll} {} {}
+  {
+    +sups,-sups,
+    +subs,-subs,
+    +ordn,-ordn,
+    +numr,-numr,
+    +dnom,-dnom,
+    +sinf,-sinf,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {VerticalPosition} {Superior}           {sups} {sups} {+subs,+ordn,+numr,+dnom,+sinf}
+\@@_define_opentype_onoffreset:nnnnn {VerticalPosition} {Inferior}           {subs} {subs} {+sups,+ordn,+numr,+dnom,+sinf}
+\@@_define_opentype_onoffreset:nnnnn {VerticalPosition} {Ordinal}            {ordn} {ordn} {+sups,+subs,+numr,+dnom,+sinf}
+\@@_define_opentype_onoffreset:nnnnn {VerticalPosition} {Numerator}          {numr} {numr} {+sups,+subs,+ordn,+dnom,+sinf}
+\@@_define_opentype_onoffreset:nnnnn {VerticalPosition} {Denominator}        {dnom} {dnom} {+sups,+subs,+ordn,+numr,+sinf}
+\@@_define_opentype_onoffreset:nnnnn {VerticalPosition} {ScientificInferior} {sinf} {sinf} {+sups,+subs,+ordn,+numr,+dnom}
+%    \end{macrocode}
+%
+% \subsubsection{Contextuals}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Contextuals}
+\@@_define_opentype_feature:nnnnn    {Contextuals} {ResetAll} {} {}
+  {
+    +cswh,-cswh,
+    +calt,-calt,
+    +init,-init,
+    +fina,-fina,
+    +falt,-falt,
+    +medi,-medi,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {Contextuals} {Swash}       {cswh} {cswh} {}
+\@@_define_opentype_onoffreset:nnnnn {Contextuals} {Alternate}   {calt} {calt} {}
+\@@_define_opentype_onoffreset:nnnnn {Contextuals} {WordInitial} {init} {init} {}
+\@@_define_opentype_onoffreset:nnnnn {Contextuals} {WordFinal}   {fina} {fina} {}
+\@@_define_opentype_onoffreset:nnnnn {Contextuals} {LineFinal}   {falt} {falt} {}
+\@@_define_opentype_onoffreset:nnnnn {Contextuals} {Inner}       {medi} {medi} {}
+%    \end{macrocode}
+%
+% \subsubsection{Diacritics}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Diacritics}
+\@@_define_opentype_feature:nnnnn    {Diacritics} {ResetAll} {} {}
+  {
+    +mark,-mark,
+    +mkmk,-mkmk,
+    +abvm,-abvm,
+    +blwm,-blwm,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {Diacritics} {MarkToBase} {mark} {mark} {}
+\@@_define_opentype_onoffreset:nnnnn {Diacritics} {MarkToMark} {mkmk} {mkmk} {}
+\@@_define_opentype_onoffreset:nnnnn {Diacritics} {AboveBase}  {abvm} {abvm} {}
+\@@_define_opentype_onoffreset:nnnnn {Diacritics} {BelowBase}  {blwm} {blwm} {}
+%    \end{macrocode}
+%
+% \subsubsection{Kerning}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Kerning}
+\@@_define_opentype_feature:nnnnn    {Kerning} {ResetAll} {} {}
+  {
+    +cpsp,-cpsp,
+    +kern,-kern,
+  }
+\@@_define_opentype_onoffreset:nnnnn {Kerning} {Uppercase} {cpsp} {cpsp} {}
+\@@_define_opentype_feature:nnnnn    {Kerning} {On}        {kern} {+kern} {-kern}
+\@@_define_opentype_feature:nnnnn    {Kerning} {Off}       {kern} {-kern} {+kern}
+\@@_define_opentype_feature:nnnnn    {Kerning} {Reset}     {} {} {+kern,-kern}
+%    \end{macrocode}
+%
+% \subsubsection{Fractions}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Fractions}
+\@@_define_opentype_feature:nnnnn    {Fractions} {ResetAll} {} {}
+  {
+    +frac,-frac,
+    +afrc,-afrc,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_feature:nnnnn    {Fractions} {On}    {frac} {+frac} {}
+\@@_define_opentype_feature:nnnnn    {Fractions} {Off}   {frac} {-frac} {}
+\@@_define_opentype_feature:nnnnn    {Fractions} {Reset} {} {} {+frac,-frac}
+\@@_define_opentype_onoffreset:nnnnn {Fractions} {Alternate} {afrc} {afrc} {-frac}
+%    \end{macrocode}
+%
+
+% \subsubsection{Style}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Style}
+\@@_define_opentype_feature:nnnnn    {Style} {ResetAll} {} {}
+  {
+    +salt,-salt,
+    +ital,-ital,
+    +ruby,-ruby,
+    +swsh,-swsh,
+    +hist,-hist,
+    +titl,-titl,
+    +hkna,-hkna,
+    +vkna,-vkna,
+    +ssty=0,-ssty=0,
+    +ssty=1,-ssty=1,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {Style} {Alternate}        {salt} {salt} {}
+\@@_define_opentype_onoffreset:nnnnn {Style} {Italic}           {ital} {ital} {}
+\@@_define_opentype_onoffreset:nnnnn {Style} {Ruby}             {ruby} {ruby} {}
+\@@_define_opentype_onoffreset:nnnnn {Style} {Swash}            {swsh} {swsh} {}
+\@@_define_opentype_onoffreset:nnnnn {Style} {Cursive}          {swsh} {curs} {}
+\@@_define_opentype_onoffreset:nnnnn {Style} {Historic}         {hist} {hist} {}
+\@@_define_opentype_onoffreset:nnnnn {Style} {TitlingCaps}      {titl} {titl} {}
+\@@_define_opentype_onoffreset:nnnnn {Style} {HorizontalKana}   {hkna} {hkna} {+vkna,+pkna}
+\@@_define_opentype_onoffreset:nnnnn {Style} {VerticalKana}     {vkna} {vkna} {+hkna,+pkna}
+\@@_define_opentype_onoffreset:nnnnn {Style} {ProportionalKana} {pkna} {pkna} {+vkna,+hkna}
+\@@_define_opentype_feature:nnnnn    {Style} {MathScript}       {ssty} {+ssty=0} {+ssty=1}
+\@@_define_opentype_feature:nnnnn    {Style} {MathScriptScript} {ssty} {+ssty=1} {+ssty=0}
+%    \end{macrocode}
+%
+% \subsubsection{CJK shape}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {CJKShape}
+\@@_define_opentype_feature:nnnnn    {CJKShape} {ResetAll} {} {}
+  {
+    +trad,-trad,
+    +smpl,-smpl,
+    +jp78,-jp78,
+    +jp83,-jp83,
+    +jp90,-jp90,
+    +jp04,-jp04,
+    +expt,-expt,
+    +nlck,-nlck,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {Traditional} {trad} {trad} {+smpl,+jp78,+jp83,+jp90,+jp04,+expt,+nlck}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {Simplified}  {smpl} {smpl} {+trad,+jp78,+jp83,+jp90,+jp04,+expt,+nlck}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1978}     {jp78} {jp78} {+trad,+smpl,+jp83,+jp90,+jp04,+expt,+nlck}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1983}     {jp83} {jp83} {+trad,+smpl,+jp78,+jp90,+jp04,+expt,+nlck}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1990}     {jp90} {jp90} {+trad,+smpl,+jp78,+jp83,+jp04,+expt,+nlck}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {JIS2004}     {jp04} {jp04} {+trad,+smpl,+jp78,+jp83,+jp90,+expt,+nlck}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {Expert}      {expt} {expt} {+trad,+smpl,+jp78,+jp83,+jp90,+jp04,+nlck}
+\@@_define_opentype_onoffreset:nnnnn {CJKShape} {NLC}         {nlck} {nlck} {+trad,+smpl,+jp78,+jp83,+jp90,+jp04,+expt}
+%    \end{macrocode}
+%
+% \subsubsection{Character width}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {CharacterWidth}
+\@@_define_opentype_feature:nnnnn    {CharacterWidth} {ResetAll} {} {}
+  {
+    +pwid,-pwid,
+    +fwid,-fwid,
+    +hwid,-hwid,
+    +twid,-twid,
+    +qwid,-qwid,
+    +palt,-palt,
+    +halt,-halt,
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {Proportional}          {pwid} {pwid} {+fwid,+hwid,+twid,+qwid,+palt,+halt}
+\@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {Full}                  {fwid} {fwid} {+pwid,+hwid,+twid,+qwid,+palt,+halt}
+\@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {Half}                  {hwid} {hwid} {+pwid,+fwid,+twid,+qwid,+palt,+halt}
+\@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {Third}                 {twid} {twid} {+pwid,+fwid,+hwid,+qwid,+palt,+halt}
+\@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {Quarter}               {qwid} {qwid} {+pwid,+fwid,+hwid,+twid,+palt,+halt}
+\@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {AlternateProportional} {palt} {palt} {+pwid,+fwid,+hwid,+twid,+qwid,+halt}
+\@@_define_opentype_onoffreset:nnnnn {CharacterWidth} {AlternateHalf}         {halt} {halt} {+pwid,+fwid,+hwid,+twid,+qwid,+palt}
+%    \end{macrocode}
+%
+% \subsubsection{Vertical}
+% According to spec |vkrn| must also activate |vpal| if available but for simplicity we don't do that here (yet?).
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n {Vertical}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {RotatedGlyphs}         {vrt2} {vrt2} {+vrtr,+vert}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {AlternatesForRotation} {vrtr} {vrtr} {+vrt2}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {Alternates}            {vert} {vert} {+vrt2}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {KanaAlternates}        {vkna} {vkna} {+hkna}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {Kerning}               {vkrn} {vkrn} {}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {AlternateMetrics}      {valt} {valt} {+vhal,+vpal,+kern}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {HalfMetrics}           {vhal} {vhal} {+valt,+vpal,+kern}
+\@@_define_opentype_onoffreset:nnnnn {Vertical} {ProportionalMetrics}   {vpal} {vpal} {+valt,+vhal}
+%    \end{macrocode}
+%
+%
+%
+%
+% \subsection{OpenType features that need numbering}
+%
+% \subsubsection{Alternate}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Alternate}
+\keys_define:nn {fontspec-opentype}
+ {
+  Alternate .default:n = {0} ,
+%<luatex>  Alternate / Random  .code:n =
+%<luatex>   { \@@_make_OT_feature:nnn {salt}{ +salt = random }{} } ,
+  Alternate / unknown .code:n =
+   {
+    \clist_map_inline:nn {#1}
+      { \@@_make_OT_feature:nnn {salt}{ +salt = ##1 }{} }
+   }
+ }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\aliasfontfeature{Alternate}{StylisticAlternates}
+%    \end{macrocode}
+%
+%
+% \subsubsection{Variant / StylisticSet}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Variant}
+\keys_define:nn {fontspec-opentype}
+ {
+  Variant .default:n = {0} ,
+  Variant / unknown .code:n =
+   {
+    \clist_map_inline:nn {#1}
+      {
+        \@@_make_OT_feature:xxx { ss \two@digits {##1} } { +ss \two@digits {##1} } {}
+      }
+   }
+ }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\aliasfontfeature{Variant}{StylisticSet}
+%    \end{macrocode}
+%
+% \subsubsection{CharacterVariant}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {CharacterVariant}
+\use:x
+ {
+  \cs_new:Npn \exp_not:N \fontspec_parse_cv:w
+      ##1 \c_colon_str ##2 \c_colon_str ##3 \exp_not:N \q_nil
+   {
+     \@@_make_OT_feature:xxx
+       { cv \exp_not:N \two@digits {##1} } { +cv \exp_not:N \two@digits {##1} = ##2 } {}
+   }
+  \keys_define:nn {fontspec-opentype}
+   {
+    CharacterVariant / unknown .code:n =
+     {
+      \clist_map_inline:nn {##1}
+       {
+        \exp_not:N \fontspec_parse_cv:w
+          ####1 \c_colon_str 0 \c_colon_str \exp_not:N \q_nil
+       }
+     }
+   }
+ }
+%    \end{macrocode}
+% Possibilities: \verb|a:0:\q_nil| or \verb|a:b:0:\q_nil|.
+%
+%
+% \subsubsection{Annotation}
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n {Annotation}
+\keys_define:nn {fontspec-opentype}
+ {
+  Annotation .default:n = {0} ,
+  Annotation / unknown .code:n =
+   {
+    \@@_make_OT_feature:nnn {nalt} {+nalt=#1} {}
+   }
+ }
+%    \end{macrocode}
+%
+% \subsubsection{Ornament}
+%
+%    \begin{macrocode}
+\@@_define_opentype_feature_group:n  {Ornament}
+\keys_define:nn {fontspec-opentype}
+ {
+  Ornament .default:n = {0} ,
+  Ornament / unknown .code:n =
+   {
+    \@@_make_OT_feature:nnn {ornm} { +ornm=#1 } {}
+   }
+ }
+%    \end{macrocode}
+%
+%
+% \subsection{Script and Language}
+%
+%
+% \subsubsection{Script}
+%
+%    \begin{macrocode}
+\keys_define:nn { fontspec-opentype } { Script .choice: }
+\cs_new:Nn \fontspec_new_script:nn
+ {
+  \keys_define:nn { fontspec-opentype } { Script / #1 .code:n =
+    \bool_set_false:N \l_@@_script_exist_bool
+    \clist_map_inline:nn {#2}
+     {
+      \@@_check_script:nTF {####1}
+       {
+        \tl_set:Nn \l_fontspec_script_tl {####1}
+        \int_set:Nn \l_@@_script_int {\l_@@_strnum_int}
+        \bool_set_true:N \l_@@_script_exist_bool
+        \tl_gset:Nx \g_@@_single_feat_tl { script=####1 }
+        \clist_map_break:
+       }
+       { }
+     }
+    \bool_if:NF \l_@@_script_exist_bool
+     {
+      \str_if_eq:nnTF {#1} {Latin}
+       {
+        \@@_warning:nx {script-not-exist} {#1}
+       }
+       {
+        \@@_check_script:nTF {latn}
+         {
+          \@@_warning:nx {script-not-exist-latn} {#1}
+          \tl_set:Nn \l_fontspec_script_tl {latn}
+          \int_set:Nn \l_@@_script_int {\l_@@_strnum_int}
+         }
+         {
+          \@@_warning:nx {script-not-exist} {#1}
+         }
+       }
+     }
+   }
+ }
+%    \end{macrocode}
+%
+%
+% \subsubsection{Language}
+%
+%    \begin{macrocode}
+\keys_define:nn { fontspec-opentype } { Language .choice: }
+\cs_new:Nn \fontspec_new_lang:nn
+ {
+  \keys_define:nn { fontspec-opentype } { Language / #1 .code:n =
+  \@@_check_lang:nTF {#2}
+     {
+      \tl_set:Nn \l_fontspec_lang_tl {#2}
+      \int_set:Nn \l_@@_language_int {\l_@@_strnum_int}
+      \tl_gset:Nx \g_@@_single_feat_tl { language=#2 }
+     }
+     {
+      \@@_warning:nx {language-not-exist} {#1}
+      \keys_set:nn { fontspec-opentype } { Language = Default }
+     }
+  }
+ }
+%    \end{macrocode}
+%
+% \paragraph{Default}
+%
+%    \begin{macrocode}
+\@@_keys_define_code:nnn {fontspec-opentype}{ Language / Default }
+ {
+  \tl_set:Nn \l_fontspec_lang_tl {DFLT}
+  \int_zero:N \l_@@_language_int
+  \tl_gset:Nn \g_@@_single_feat_tl { language=DFLT }
+ }
+%    \end{macrocode}
+%
+% \paragraph{Turkish} Turns out that many fonts use `TUR' as their Turkish language tag rather than the specified `TRK'. So we check for both:
+%    \begin{macrocode}
+\keys_define:nn {fontspec-opentype}
+ {
+  Language / Turkish .code:n =
+   {
+    \@@_check_lang:nTF {TRK}
+     {
+      \int_set:Nn \l_@@_language_int {\l_@@_strnum_int}
+      \tl_set:Nn \l_fontspec_lang_tl {TRK}
+      \tl_gset:Nn \g_@@_single_feat_tl { language=TRK }
+     }
+     {
+      \@@_check_lang:nTF {TUR}
+       {
+        \int_set:Nn \l_@@_language_int {\l_@@_strnum_int}
+        \tl_set:Nn \l_fontspec_lang_tl {TUR}
+        \tl_gset:Nn \g_@@_single_feat_tl { language=TUR }
+       }
+       {
+        \@@_warning:nx {language-not-exist} {Turkish}
+        \keys_set:nn {fontspec-opentype} {Language=Default}
+       }
+     }
+   }
+ }
+%    \end{macrocode}
+%
+% \subsection{Backwards compatibility}
+% Backwards compatibility:
+%    \begin{macrocode}
+\cs_new:Nn \@@_ot_compat:nn
+  {
+    \aliasfontfeatureoption {#1} {#2Off} {No#2}
+  }
+\@@_ot_compat:nn {Ligatures}   {Rare}
+\@@_ot_compat:nn {Ligatures}   {Required}
+\@@_ot_compat:nn {Ligatures}   {Common}
+\@@_ot_compat:nn {Ligatures}   {Discretionary}
+\@@_ot_compat:nn {Ligatures}   {Contextual}
+\@@_ot_compat:nn {Ligatures}   {Historic}
+\@@_ot_compat:nn {Numbers}     {SlashedZero}
+\@@_ot_compat:nn {Contextuals} {Swash}
+\@@_ot_compat:nn {Contextuals} {Alternate}
+\@@_ot_compat:nn {Contextuals} {WordInitial}
+\@@_ot_compat:nn {Contextuals} {WordFinal}
+\@@_ot_compat:nn {Contextuals} {LineFinal}
+\@@_ot_compat:nn {Contextuals} {Inner}
+\@@_ot_compat:nn {Diacritics}  {MarkToBase}
+\@@_ot_compat:nn {Diacritics}  {MarkToMark}
+\@@_ot_compat:nn {Diacritics}  {AboveBase}
+\@@_ot_compat:nn {Diacritics}  {BelowBase}
+%    \end{macrocode}
+%
+% \iffalse
+%    \begin{macrocode}
+%</fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx
index 566be0aeeb9..88d5d1407dd 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-fontload.dtx
@@ -7,27 +7,31 @@
 %    \end{macrocode}
 % \fi
 %
-%    \begin{macrocode}
-\cs_set:Nn \@@_fontwrap:n { "#1" }
-%    \end{macrocode}
-%
+% \begin{macro}{\@@_primitive_font_set:Nnn,\@@_primitive_font_gset:Nnn}
 %    \begin{macrocode}
 \cs_set:Npn \@@_primitive_font_set:Nnn #1#2#3
   {
     \font #1 = #2 ~at~ #3 \scan_stop:
   }
-
 \cs_set:Npn \@@_primitive_font_gset:Nnn #1#2#3
   {
     \global \font #1 = #2 ~at~ #3 \scan_stop:
   }
-
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_font_suppress_not_found_error:}
+%    \begin{macrocode}
 \cs_set:Npn \@@_font_suppress_not_found_error:
   {
     \int_set_eq:NN \xetex_suppressfontnotfounderror:D \c_one
   }
-
-\prg_set_conditional:Nnn \@@_font_if_null:N {p,TF,T,F}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[pTF]{\@@_primitive_font_if_null:N}
+%    \begin{macrocode}
+\prg_set_conditional:Nnn \@@_primitive_font_if_null:N {p,TF,T,F}
   {
     \ifx #1 \nullfont
       \prg_return_true:
@@ -36,33 +40,32 @@
     \fi
   }
 %    \end{macrocode}
+% \end{macro}
 %
-%
-% \begin{macro}{\fontspec_set:Nnn,\fontspec_gset:Nnn}
-% Wrapper around \cs{font_set:Nnn} and \cs{font_gset:Nnn}.
+% \begin{macro}[TF]{\@@_primitive_font_if_exist:n}
 %    \begin{macrocode}
-\cs_new:Nn \@@_font_set:Nnn
- {
-  \@@_primitive_font_set:Nnn  #1 { \@@_fontwrap:n {#2} } {#3}
- }
-\cs_new:Nn \@@_font_gset:Nnn
- {
-  \@@_primitive_font_gset:Nnn #1 { \@@_fontwrap:n {#2} } {#3}
- }
+\prg_set_conditional:Nnn \@@_primitive_font_if_exist:n {TF,T,F}
+  {
+    \group_begin:
+      \@@_font_suppress_not_found_error:
+      \@@_primitive_font_set:Nnn \l_@@_primitive_font {#1} {10pt}
+      \@@_primitive_font_if_null:NTF \l_@@_primitive_font
+        { \group_end: \prg_return_false: }
+        { \group_end: \prg_return_true:  }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-%
-% \begin{macro}{\font_glyph_if_exist:NnTF}
+% \begin{macro}{\@@_primitive_font_glyph_if_exist:NnTF}
 %    \begin{macrocode}
-\prg_new_conditional:Nnn \font_glyph_if_exist:Nn {p,TF,T,F}
- {
-  \etex_iffontchar:D #1 #2 \scan_stop:
-    \prg_return_true:
-  \else:
-    \prg_return_false:
-  \fi:
- }
+\prg_new_conditional:Nnn \@@_primitive_font_glyph_if_exist:Nn {p,TF,T,F}
+  {
+    \etex_iffontchar:D #1 #2 \scan_stop:
+      \prg_return_true:
+    \else:
+      \prg_return_false:
+    \fi:
+  }
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-graphite.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-graphite.dtx
new file mode 100644
index 00000000000..8015020ad32
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-graphite.dtx
@@ -0,0 +1,103 @@
+% \section{Graphite/AAT code}
+%
+% \iffalse
+%    \begin{macrocode}
+%<*fontspec&xetexx>
+%    \end{macrocode}
+% \fi
+%
+
+
+% \begin{macro}{\@@_define_aat_feature_group:n}
+%    \begin{macrocode}
+\cs_new:Nn \@@_define_aat_feature_group:n
+  { \keys_define:nn {fontspec-aat} { #1 .multichoice: } }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_define_aat_feature:nnnn}
+%    \begin{macrocode}
+\cs_new:Nn \@@_define_aat_feature:nnnn
+ {
+  \keys_define:nn {fontspec-aat}
+   {
+    #1/#2 .code:n = { \@@_make_AAT_feature:nn {#3}{#4} }
+   }
+ }
+%    \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\@@_make_AAT_feature:nn}
+%    \begin{macrocode}
+\cs_new:Nn \@@_make_AAT_feature:nn
+ {
+  \tl_if_empty:nTF {#1}
+   { \@@_warning:n {aat-feature-not-exist} }
+   {
+     \@@_make_AAT_feature_string:nnTF {#1}{#2}
+      {
+       \@@_update_featstr:n {\l_fontspec_feature_string_tl}
+     }
+     { \@@_warning:nx {aat-feature-not-exist-in-font} {#1,#2} }
+   }
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_make_AAT_feature_string:nnTF}
+%   This macro takes the numerical codes for a font feature and
+%   creates a specified macro containing the string required in the
+%   font definition to turn that feature on or off. Used primarily in
+%   [...], but also used to check if small caps
+%   exists in the requested font (see page~\pageref{mac:makesmallcaps}).
+%
+% For exclusive selectors, it's easy; just grab the string:
+% For \emph{non}-exclusive selectors, it's a little more complex.
+% If the selector is even, it corresponds to switching the feature on.
+% If the selector is \emph{odd}, it corresponds to switching the feature off.
+% But \XeTeX\ doesn't return a selector string for this number, since the
+% feature is defined for the `switching on' value. So we need to check the
+% selector of the previous number, and then prefix the feature string with |!|
+% to denote the switch.
+%
+% Finally, save out the complete feature string in \cmd\l_fontspec_feature_string_tl.
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \@@_make_AAT_feature_string:nn {TF,T,F}
+ {
+  \tl_set:Nx \l_tmpa_tl { \XeTeXfeaturename \l_fontspec_font #1 }
+  \tl_if_empty:NTF \l_tmpa_tl
+   { \prg_return_false: }
+   {
+    \int_compare:nTF { \XeTeXisexclusivefeature\l_fontspec_font #1 > 0 }
+     {
+      \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
+     }
+     {
+      \int_if_even:nTF {#2}
+       {
+        \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
+       }
+       {
+        \tl_set:Nx \l_tmpb_tl
+         {
+          \XeTeXselectorname\l_fontspec_font #1\space \numexpr#2-1\relax
+         }
+        \tl_if_empty:NF \l_tmpb_tl { \tl_put_left:Nn \l_tmpb_tl {!} }
+       }
+    }
+    \tl_if_empty:NTF \l_tmpb_tl
+     { \prg_return_false: }
+     {
+      \tl_set:Nx \l_fontspec_feature_string_tl { \l_tmpa_tl = \l_tmpb_tl }
+      \prg_return_true:
+     }
+   }
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \iffalse
+%    \begin{macrocode}
+%</fontspec&xetexx>
+%    \end{macrocode}
+% \fi
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx
index 467ccb77f71..85c16e3cadf 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx
@@ -6,16 +6,10 @@
 %    \end{macrocode}
 % \fi
 %
-% \subsection{Internal macros}
+% \subsection{The main function for setting fonts}
 % \label{sec:codeinternal}
 %
-% The macros from here in are used internally by all those defined above.
-% They are not designed to remain consistent between versions.
-%
-%
-%
-%
-% \begin{macro}{\fontspec_select:nn}
+% \begin{macro}{\@@_select_font_family:nn}
 % This is the command that defines font families for use, the underlying
 % procedure of all \cmd\fontspec-like commands. Given a
 % list of font features (|#1|) for a requested font (|#2|),
@@ -30,58 +24,122 @@
 % \begin{itemize}
 % \item \cmd{\l_fontspec_fontname_tl} is used as the generic name of the font being defined.
 % \item \cmd{\l_@@_fontid_tl} is the unique identifier of the font with all its features.
-% \item \cmd{\l_fontspec_fontname_up_tl} is the font specifically to be used as the upright font.
+% \item \cmd{\l_@@_fontname_up_tl} is the font specifically to be used as the upright font.
 % \item \cmd{\l_@@_basename_tl} is the (immutable) original argument used for |*|-replacing.
 % \item \cmd{\l_fontspec_font} is the plain \TeX{} font of the upright font requested.
 % \end{itemize}
 %    \begin{macrocode}
-\cs_set:Nn \fontspec_select:nn
+\cs_new_protected:Nn \@@_select_font_family:nn
  {
+%<debug>\typeout{^^J^^J::::::::::::::::::::::::::::::^^J:: fontspec_select:nn~ {#1}~ {#2} }
   \group_begin:
   \@@_font_suppress_not_found_error:
   \@@_init:
 
-  \tl_set:Nx \l_fontspec_fontname_tl    {#2}
-  \tl_set:Nx \l_fontspec_fontname_up_tl {#2}
-  \tl_set:Nx \l_@@_basename_tl          {#2}
+  \@@_sanitise_fontname:Nn \l_fontspec_fontname_tl    {#2}
+  \@@_sanitise_fontname:Nn \l_@@_fontname_up_tl {#2}
+  \@@_sanitise_fontname:Nn \l_@@_basename_tl          {#2}
+
+  \@@_if_detect_external:nT {#2}
+   { \keys_set:nn {fontspec-preparse-external} {Path} }
 
+  \@@_init_ttc:n {#2}
   \@@_load_external_fontoptions:Nn \l_fontspec_fontname_tl {#2}
+
   \@@_extract_all_features:n {#1}
-  \@@_preparse_features:
+  \tl_set:Nx \l_@@_fontid_tl { \tl_to_str:N \l_fontspec_fontname_tl-:-\tl_to_str:N \l_@@_all_features_clist }
+
+%<debug>\typeout{fontid: \l_@@_fontid_tl}
 
+  \@@_preparse_features:
   \@@_load_font:
   \@@_set_scriptlang:
   \@@_get_features:Nn \l_@@_rawfeatures_sclist {}
   \bool_set_false:N \l_@@_firsttime_bool
 
-  \@@_save_family:nTF {#2}
+  \@@_save_family_needed:nTF {#2}
    {
-    \@@_save_fontinfo:
-    \@@_find_autofonts:
-    \DeclareFontFamily{\l_@@_nfss_enc_tl}{\l_fontspec_family_tl}{}
-    \@@_set_faces:
-    \@@_info:nxx {defining-font} {#1} {#2}
-%<*debug>
-    \typeout{"\l_@@_fontid_tl"~ defined.}
-    \@@_warning:nxx {defining-font} {#1} {#2}
-%</debug>
+     \@@_save_family:nn {#1} {#2}
+%<debug>  \@@_warning:nxx {defining-font} {#1} {#2}
    }
    {
-%<*debug>
-    \typeout{"\l_@@_fontid_tl"~ already~ defined~ apparently.}
-%</debug>
+%<debug>  \typeout{Font~ family~ already~ defined.}
    }
   \group_end:
  }
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\fontspec_select:nn}
+% This old name has been used by 3rd party packages so for compatibility:
+%    \begin{macrocode}
+\cs_set_eq:NN \fontspec_select:nn \@@_select_font_family:nn
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_sanitise_fontname:Nn}
+% Assigns font name |#2| to token list variable |#1| and strips extension(s) from it in the case of an external font.
+% We strip spaces for luatex for consistency with luaotfload, although I'm not sure this is necessary any more.
+% At one stage this also lowercased the name, but this step has been removed unless someone can remind me why it was necessary.
+%    \begin{macrocode}
+\cs_new:Nn \@@_sanitise_fontname:Nn
+ {
+  \tl_set:Nx #1 {#2}
+%<luatex>  \tl_remove_all:Nn #1 {~}
+  \clist_map_inline:Nn \l_@@_extensions_clist
+   {
+     \tl_if_in:NnT #1 {##1}
+       {
+         \tl_remove_once:Nn #1 {##1}
+         \tl_set:Nn \l_@@_extension_tl {##1}
+         \clist_map_break:
+       }
+   }
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_if_detect_external:nT}
+% Check if either the fontname ends with a known font extension.
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \@@_if_detect_external:n {T}
+ {
+%<debug>  \typeout{:: @@_if_detect_external:n  { \exp_not:n {#1} } }
+  \clist_map_inline:Nn \l_@@_extensions_clist
+   {
+    \bool_set_false:N \l_@@_tmpa_bool
+    \exp_args:Nx % <- this should be handled earlier
+    \tl_if_in:nnT {#1 <= end_of_string} {##1 <= end_of_string}
+      { \bool_set_true:N \l_@@_tmpa_bool \clist_map_break: }
+   }
+  \bool_if:NTF \l_@@_tmpa_bool \prg_return_true: \prg_return_false:
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_init_ttc:n}
+% For TTC fonts we assume they will be loading the italic/bold fonts from the same file,
+% so prepopulate the fontnames to avoid needing to do it manually.
+%    \begin{macrocode}
+\cs_new:Nn \@@_init_ttc:n
+ {
+  \str_if_eq_x:nnT { \str_lower_case:f {\l_@@_extension_tl} } {.ttc}
+   {
+    \@@_sanitise_fontname:Nn \l_@@_fontname_it_tl   {#1}
+    \@@_sanitise_fontname:Nn \l_@@_fontname_bf_tl   {#1}
+    \@@_sanitise_fontname:Nn \l_@@_fontname_bfit_tl {#1}
+   }
+ }
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@@_load_external_fontoptions:Nn}
 % Load a possible \texttt{.fontspec} font configuration file.
 % This file could set font-specific options for the font about to be loaded.
 %    \begin{macrocode}
 \cs_new:Nn \@@_load_external_fontoptions:Nn
  {
+%<debug>  \typeout{:: @@_load_external_fontoptions:Nn \exp_not:N #1 {#2} }
   \@@_sanitise_fontname:Nn #1 {#2}
   \tl_set:Nx \l_@@_ext_filename_tl {#1.fontspec}
   \tl_remove_all:Nn \l_@@_ext_filename_tl {~}
@@ -94,10 +152,11 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_extract_features:}
+% \begin{macro}{\@@_extract_all_features:}
 %    \begin{macrocode}
 \cs_new:Nn \@@_extract_all_features:n
  {
+%<debug>  \typeout{:: @@_extract_all_features:n { \unexpanded {#1} } }
   \bool_if:NTF \l_@@_disable_defaults_bool
    {
     \clist_set:Nx \l_@@_all_features_clist {#1}
@@ -118,10 +177,6 @@
       #1
      }
    }
-  \tl_set:Nx \l_@@_fontid_tl { \tl_to_str:N \l_fontspec_fontname_tl-:-\tl_to_str:N \l_@@_all_features_clist }
-%<*debug>
-  \typeout{fontid: \l_@@_fontid_tl}
-%</debug>
  }
 %    \end{macrocode}
 % \end{macro}
@@ -138,25 +193,25 @@
 %    \begin{macrocode}
 \cs_new:Nn \@@_preparse_features:
  {
+%<debug>  \typeout{:: @@_preparse_features:}
 %    \end{macrocode}
 % Detect if external fonts are to be used, possibly automatically, and
 % parse fontspec features for bold/italic fonts and their features.
 %    \begin{macrocode}
-  \@@_if_detect_external:VT \l_@@_basename_tl
-   { \keys_set:nn {fontspec-preparse-external} {ExternalLocation} }
 
-  \keys_set_known:nxN {fontspec-preparse-external}
+  \@@_keys_set_known:nxN {fontspec-preparse-external}
    { \l_@@_all_features_clist }
    \l_@@_keys_leftover_clist
+
 %    \end{macrocode}
 % When \cmd{\l_fontspec_fontname_tl} is augmented with a prefix or whatever to create
-% the name of the upright font (\cmd{\l_fontspec_fontname_up_tl}), this latter is the new `general
+% the name of the upright font (\cmd{\l_@@_fontname_up_tl}), this latter is the new `general
 % font name' to use.
 %    \begin{macrocode}
-  \tl_set_eq:NN \l_fontspec_fontname_tl \l_fontspec_fontname_up_tl
-  \keys_set_known:nxN {fontspec-renderer} {\l_@@_keys_leftover_clist}
+  \tl_set_eq:NN \l_fontspec_fontname_tl \l_@@_fontname_up_tl
+  \@@_keys_set_known:nxN {fontspec-renderer} {\l_@@_keys_leftover_clist}
     \l_@@_keys_leftover_clist
-  \keys_set_known:nxN {fontspec-preparse} {\l_@@_keys_leftover_clist}
+  \@@_keys_set_known:nxN {fontspec-preparse} {\l_@@_keys_leftover_clist}
     \l_@@_fontfeat_clist
  }
 %    \end{macrocode}
@@ -166,46 +221,67 @@
 %    \begin{macrocode}
 \cs_new:Nn \@@_load_font:
  {
-  \@@_font_set:Nnn    \l_fontspec_font
-     { \@@_fullname:n {\l_fontspec_fontname_up_tl} } {\f@size pt}
-  \@@_font_if_null:NT \l_fontspec_font { \@@_error:nx {font-not-found} {\l_fontspec_fontname_up_tl} }
+%<debug>\typeout{:: @@_load_font}
+%<debug>\typeout{Set~ base~ font~ for~ preliminary~ analysis: \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} }
+  \@@_primitive_font_set:Nnn \l_fontspec_font
+     { \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} } {\f@size pt}
+  \@@_primitive_font_if_null:NT \l_fontspec_font { \@@_error:nx {font-not-found} {\l_@@_fontname_up_tl} }
   \@@_set_font_type:
-  \@@_font_gset:Nnn   \l_fontspec_font
-     { \@@_fullname:n {\l_fontspec_fontname_up_tl} } {\f@size pt}
+%<debug>\typeout{Set~ base~ font~ properly: \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} }
+  \@@_primitive_font_gset:Nnn \l_fontspec_font
+     { \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} } {\f@size pt}
   \l_fontspec_font % this is necessary for LuaLaTeX to check the scripts properly
  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_if_detect_external:nnT}
-% Check if either the fontname ends with a known font extension.
+% \begin{macro}{\@@_construct_font_call:nn}
+% Constructs the complete font invocation.
+% \darg{Base name}
+% \darg{Extension}
+% \darg{TTC Index}
+% \darg{Renderer}
+% \darg{Optical size}
+% \darg{Font features}
+% We check if \meta{Font features} are empty and if so don't add in the separator colon.
 %    \begin{macrocode}
-\prg_new_conditional:Nnn \@@_if_detect_external:n {T}
+\cs_set:Nn \@@_construct_font_call:nnnnnn
  {
-  \clist_map_inline:Nn \l_@@_extensions_clist
-   {
-    \bool_set_false:N \l_@@_tmpa_bool
-    \tl_if_in:nnT {#1 <= end_of_string} {##1 <= end_of_string}
-      { \bool_set_true:N \l_@@_tmpa_bool \clist_map_break: }
-   }
-  \bool_if:NTF \l_@@_tmpa_bool \prg_return_true: \prg_return_false:
+  " \@@_fontname_wrap:n { #1 #2 #3 } #4 #5
+    \str_if_eq_x:nnF {#6}{} {:#6} "
  }
-\cs_generate_variant:Nn \@@_if_detect_external:nT {V}
 %    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_fullname:n}
-% Constructs the complete font name based on a common piece of info.
+% In practice, we don't use the six-argument version, since most arguments are constructed on-the-fly:
 %    \begin{macrocode}
-\cs_set:Nn \@@_fullname:n
+\cs_set:Nn \@@_construct_font_call:nn
  {
-  \@@_namewrap:n { #1 \l_@@_extension_tl }
-  \l_fontspec_renderer_tl
-  \l_@@_optical_size_tl
+  \@@_construct_font_call:nnnnnn
+    {#1}
+    \l_@@_extension_tl
+    \l_@@_ttc_index_tl
+    \l_fontspec_renderer_tl
+    \l_@@_optical_size_tl
+    {#2}
  }
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\@@_font_is_file:,\@@_font_is_name:}
+% The \cs{@@_fontname_wrap:n} command takes the font name and either passes it through unchanged or wraps it in the syntax for loading a font `by filename'.
+% \XeTeX's syntax is followed since \pkg{luaotfload} provides compatibility.
+%    \begin{macrocode}
+\cs_new:Nn \@@_font_is_name:
+  {
+    \cs_set_eq:NN \@@_fontname_wrap:n \use:n
+  }
+\cs_new:Nn \@@_font_is_file:
+  {
+%<xetexx>    \cs_set:Npn \@@_fontname_wrap:n ##1 { [ \l_@@_font_path_tl ##1 ] }
+%<luatex>    \cs_set:Npn \@@_fontname_wrap:n ##1 { file:\l_@@_font_path_tl ##1 }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@@_set_scriptlang:}
 % Only necessary for OpenType fonts.
 % First check if the font supports scripts, then apply defaults if
@@ -217,15 +293,15 @@
    {
     \tl_if_empty:NTF \l_@@_script_name_tl
      {
-      \fontspec_check_script:nTF {latn}
+      \@@_check_script:nTF {latn}
        {
         \tl_set:Nn \l_@@_script_name_tl {Latin}
         \tl_if_empty:NT \l_@@_lang_name_tl
          {
           \tl_set:Nn \l_@@_lang_name_tl {Default}
          }
-        \keys_set:nx {fontspec} {Script=\l_@@_script_name_tl}
-        \keys_set:nx {fontspec} {Language=\l_@@_lang_name_tl}
+        \keys_set:nx {fontspec-opentype} {Script=\l_@@_script_name_tl}
+        \keys_set:nx {fontspec-opentype} {Language=\l_@@_lang_name_tl}
        }
        {
         \@@_info:n {no-scripts}
@@ -236,16 +312,58 @@
        {
         \tl_set:Nn \l_@@_lang_name_tl {Default}
        }
-      \keys_set:nx {fontspec} {Script=\l_@@_script_name_tl}
-      \keys_set:nx {fontspec} {Language=\l_@@_lang_name_tl}
+      \keys_set:nx {fontspec-opentype} {Script=\l_@@_script_name_tl}
+      \keys_set:nx {fontspec-opentype} {Language=\l_@@_lang_name_tl}
      }
    }
  }
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\@@_get_features:Nn}
+%   This macro is a wrapper for |\keys_set:nn| which expands and adds a
+%   default specification to the original passed options. It begins by
+%   initialising the commands used to hold font-feature specific
+%   strings.
+%   Its argument is any additional features to prepend to the default.
+%
+% Do not set the colour if not explicitly spec'd else \verb|\color| (using
+% specials) will not work.
+%    \begin{macrocode}
+\cs_set:Nn \@@_get_features:Nn
+ {
+%<debug>  \typeout{:: @@_get_features:Nn \exp_not:N #1 { \exp_not:n {#2} } }
+  \@@_init_fontface:
+  \@@_keys_set_known:nxN {fontspec-renderer} {\l_@@_fontfeat_clist,#2}
+    \l_@@_keys_leftover_clist
+  \@@_keys_set_known:nxN {fontspec} {\l_@@_keys_leftover_clist} \l_@@_keys_leftover_clist
+%<*xetexx>
+  \bool_if:NTF \l_@@_ot_bool
+    {
+%<debug>  \typeout{::: Setting~ keys~ for~ OpenType~ font~ features:~"\l_@@_keys_leftover_clist"}
+      \keys_set:nx {fontspec-opentype} {\l_@@_keys_leftover_clist}
+    }
+    {
+%<debug>  \typeout{::: Setting~ keys~ for~ AAT~ font~ features:~"\l_@@_keys_leftover_clist"}
+      \bool_if:NT \l_@@_atsui_bool
+        { \keys_set:nx {fontspec-aat} {\l_@@_keys_leftover_clist} }
+    }
+%</xetexx>
+%<*luatex>
+%<debug>  \typeout{::: Setting~ keys~ for~ OpenType~ font~ features:~"\l_@@_keys_leftover_clist"}
+  \keys_set:nx {fontspec-opentype} {\l_@@_keys_leftover_clist}
+%</luatex>
+
+  \str_if_eq_x:nnF { \l_@@_hexcol_tl \l_@@_opacity_tl }
+                   { \g_@@_hexcol_tl \g_@@_opacity_tl }
+    { \@@_update_featstr:n { color = \l_@@_hexcol_tl\l_@@_opacity_tl } }
+
+  \tl_set_eq:NN #1 \l_@@_rawfeatures_sclist
+ }
+%    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{\@@_save_family:nTF}
+% \begin{macro}{\@@_save_family_needed:nTF}
 % Check if the family is unique and, if so, save its information.
 % (\cs{addfontfeature} and other macros use this data.)
 % Then the font family and its shapes are defined in the NFSS.
@@ -256,9 +374,12 @@
 % selecting.
 %
 %    \begin{macrocode}
-\prg_new_conditional:Nnn \@@_save_family:n {TF}
+\prg_new_conditional:Nnn \@@_save_family_needed:n {TF}
  {
-%<debug>\typeout{save~ family:~ #1}
+
+%<debug>  \typeout{save~ family:~ #1}
+%<debug>  \typeout{== fontid_tl: "\l_@@_fontid_tl".}
+
   \cs_if_exist:NT \l_@@_nfss_fam_tl
    {
     \cs_set_eq:cN {g_@@_UID_\l_@@_fontid_tl} \l_@@_nfss_fam_tl
@@ -285,30 +406,42 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\@@_save_family:nn}
+% Saves the relevant font information for future processing.
+%    \begin{macrocode}
+\cs_new:Nn \@@_save_family:nn
+  {
+    \@@_save_fontinfo:n {#2}
+    \@@_find_autofonts:
+    \DeclareFontFamily{\l_@@_nfss_enc_tl}{\l_fontspec_family_tl}{}
+    \@@_set_faces:
+    \@@_info:nxx {defining-font} {#1} {#2}
+  }
+%    \end{macrocode}
+% \end{macro}
 %
-% \begin{macro}{\@@_save_fontinfo:nn}
+% \begin{macro}{\@@_save_fontinfo:n}
 % Saves the relevant font information for future processing.
 %    \begin{macrocode}
-\cs_new:Nn \@@_save_fontinfo:
+\cs_new:Nn \@@_save_fontinfo:n
  {
   \prop_new:c {g_@@_ \l_fontspec_family_tl _prop}
-  \prop_gput:cnx {g_@@_ \l_fontspec_family_tl _prop} {fontname} { \l_@@_basename_tl }
+  \prop_gput:cnx {g_@@_ \l_fontspec_family_tl _prop} {fontname} { #1 }
   \prop_gput:cnx {g_@@_ \l_fontspec_family_tl _prop} {options}  { \l_@@_all_features_clist }
   \prop_gput:cnx {g_@@_ \l_fontspec_family_tl _prop} {fontdef}
    {
-    \@@_fullname:n {\l_fontspec_fontname_tl} :
-    \l_@@_pre_feat_sclist \l_@@_rawfeatures_sclist
+    \@@_construct_font_call:nn {\l_fontspec_fontname_tl}
+      { \l_@@_pre_feat_sclist \l_@@_rawfeatures_sclist }
    }
-  \prop_gput:cnV {g_@@_ \l_fontspec_family_tl _prop} {script-num} \l_fontspec_script_int
-  \prop_gput:cnV {g_@@_ \l_fontspec_family_tl _prop} {lang-num} \l_fontspec_language_int
+  \prop_gput:cnV {g_@@_ \l_fontspec_family_tl _prop} {script-num} \l_@@_script_int
+  \prop_gput:cnV {g_@@_ \l_fontspec_family_tl _prop} {lang-num} \l_@@_language_int
   \prop_gput:cnV {g_@@_ \l_fontspec_family_tl _prop} {script-tag} \l_fontspec_script_tl
   \prop_gput:cnV {g_@@_ \l_fontspec_family_tl _prop} {lang-tag} \l_fontspec_lang_tl
-
  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \subsubsection{Setting font shapes in a family}
+% \subsection{Setting font shapes in a family}
 %
 % All NFSS specifications take their default values, so if any of them
 % are redefined, the shapes will be selected to fit in with the
@@ -325,22 +458,22 @@
  {
   \bool_if:nF {\l_@@_noit_bool || \l_@@_nobf_bool}
    {
-    \@@_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_it_tl} {/B}
-    \@@_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_bf_tl} {/I}
-    \@@_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_tl} {/BI}
+    \@@_set_autofont:Nnn \l_@@_fontname_bfit_tl {\l_@@_fontname_it_tl} {/B}
+    \@@_set_autofont:Nnn \l_@@_fontname_bfit_tl {\l_@@_fontname_bf_tl} {/I}
+    \@@_set_autofont:Nnn \l_@@_fontname_bfit_tl {\l_fontspec_fontname_tl} {/BI}
    }
 
   \bool_if:NF \l_@@_nobf_bool
    {
-    \@@_set_autofont:Nnn \l_fontspec_fontname_bf_tl {\l_fontspec_fontname_tl} {/B}
+    \@@_set_autofont:Nnn \l_@@_fontname_bf_tl {\l_fontspec_fontname_tl} {/B}
    }
 
   \bool_if:NF \l_@@_noit_bool
    {
-    \@@_set_autofont:Nnn \l_fontspec_fontname_it_tl {\l_fontspec_fontname_tl} {/I}
+    \@@_set_autofont:Nnn \l_@@_fontname_it_tl {\l_fontspec_fontname_tl} {/I}
    }
 
-  \@@_set_autofont:Nnn \l_fontspec_fontname_bfsl_tl {\l_fontspec_fontname_sl_tl} {/B}
+  \@@_set_autofont:Nnn \l_@@_fontname_bfsl_tl {\l_@@_fontname_sl_tl} {/B}
  }
 %    \end{macrocode}
 % \end{macro}
@@ -350,11 +483,11 @@
 \cs_new:Nn \@@_set_faces:
  {
   \@@_add_nfssfont:nnnn \mddefault \updefault \l_fontspec_fontname_tl      \l_@@_fontfeat_up_clist
-  \@@_add_nfssfont:nnnn \bfdefault \updefault \l_fontspec_fontname_bf_tl   \l_@@_fontfeat_bf_clist
-  \@@_add_nfssfont:nnnn \mddefault \itdefault \l_fontspec_fontname_it_tl   \l_@@_fontfeat_it_clist
-  \@@_add_nfssfont:nnnn \mddefault \sldefault \l_fontspec_fontname_sl_tl   \l_@@_fontfeat_sl_clist
-  \@@_add_nfssfont:nnnn \bfdefault \itdefault \l_fontspec_fontname_bfit_tl \l_@@_fontfeat_bfit_clist
-  \@@_add_nfssfont:nnnn \bfdefault \sldefault \l_fontspec_fontname_bfsl_tl \l_@@_fontfeat_bfsl_clist
+  \@@_add_nfssfont:nnnn \bfdefault \updefault \l_@@_fontname_bf_tl   \l_@@_fontfeat_bf_clist
+  \@@_add_nfssfont:nnnn \mddefault \itdefault \l_@@_fontname_it_tl   \l_@@_fontfeat_it_clist
+  \@@_add_nfssfont:nnnn \mddefault \sldefault \l_@@_fontname_sl_tl   \l_@@_fontfeat_sl_clist
+  \@@_add_nfssfont:nnnn \bfdefault \itdefault \l_@@_fontname_bfit_tl \l_@@_fontfeat_bfit_clist
+  \@@_add_nfssfont:nnnn \bfdefault \sldefault \l_@@_fontname_bfsl_tl \l_@@_fontfeat_bfsl_clist
 
   \prop_map_inline:Nn \l_@@_nfssfont_prop { \@@_set_faces_aux:nnnnn ##2 }
  }
@@ -366,6 +499,42 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\fontspec_complete_fontname:Nn}
+% This macro defines |#1| as the input with any |*| tokens of its input
+% replaced by the font name. This lets us define supplementary fonts in full
+% (``\texttt{Baskerville Semibold}'') or in abbreviation (``\texttt{* Semibold}'').
+%    \begin{macrocode}
+\cs_set:Nn \fontspec_complete_fontname:Nn
+ {
+  \tl_set:Nx #1 {#2}
+  \tl_replace_all:Nnx #1 {*} {\l_@@_basename_tl}
+%<luatex>  \tl_remove_all:Nn #1 {~}
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_add_nfssfont:nnnn}
+% \darg{series}
+% \darg{shape}
+% \darg{fontname}
+% \darg{fontspec features}
+%    \begin{macrocode}
+\cs_new:Nn \@@_add_nfssfont:nnnn
+ {
+  \tl_set:Nx \l_@@_this_font_tl {#3}
+
+  \tl_if_empty:xTF {#4}
+   { \clist_set:Nn \l_@@_sizefeat_clist {Size={-}} }
+   { \@@_keys_set_known:nxN {fontspec-preparse-nested} {#4} \l_@@_tmp_tl }
+
+  \tl_if_empty:NF \l_@@_this_font_tl
+   {
+    \prop_put:Nxx \l_@@_nfssfont_prop {#1/#2}
+     { {#1}{#2}{\l_@@_this_font_tl}{#4}{\l_@@_sizefeat_clist} }
+   }
+ }
+%    \end{macrocode}
+% \end{macro}
 %
 %
 % \subsubsection{Fonts}
@@ -380,8 +549,9 @@
 % Multiple Master), respectively.
 %    \begin{macrocode}
 \cs_new:Nn \@@_set_font_type:
-%<*xetexx>
  {
+%<debug>  \typeout{:: @@_set_font_type:}
+%<*xetexx>
   \bool_set_false:N \l_@@_tfm_bool
   \bool_set_false:N \l_@@_atsui_bool
   \bool_set_false:N \l_@@_ot_bool
@@ -412,17 +582,14 @@
         { \tl_set:Nn \l_fontspec_renderer_tl {/OT} }
      }
    }
- }
 %</xetexx>
 %<*luatex>
- {
   \bool_set_true:N \l_@@_ot_bool
- }
 %</luatex>
+ }
 %    \end{macrocode}
 % \end{macro}
 %
-%
 % \begin{macro}{\@@_set_autofont:Nnn}
 % \darg{Font name tl}
 % \darg{Base font name}
@@ -438,7 +605,6 @@
 % If not found, \meta{font name tl} remains empty.
 % Otherwise, we have a match.
 %    \begin{macrocode}
-\cs_generate_variant:Nn \tl_if_empty:nF {x}
 \cs_new:Nn \@@_set_autofont:Nnn
  {
   \bool_if:NF \l_@@_external_bool
@@ -457,8 +623,8 @@
 
 \prg_new_conditional:Nnn \@@_if_autofont:nn {T,TF}
  {
-  \@@_font_set:Nnn \l_tmpa_font { \@@_fullname:n {#1}   } {\f@size pt}
-  \@@_font_set:Nnn \l_tmpb_font { \@@_fullname:n {#1#2} } {\f@size pt}
+  \@@_primitive_font_set:Nnn \l_tmpa_font { \@@_construct_font_call:nn {#1} {}  } {\f@size pt}
+  \@@_primitive_font_set:Nnn \l_tmpb_font { \@@_construct_font_call:nn {#1#2} {} } {\f@size pt}
   \str_if_eq_x:nnTF { \fontname \l_tmpa_font } { \fontname \l_tmpb_font }
    { \prg_return_false: }
    { \prg_return_true: }
@@ -478,7 +644,7 @@
 \cs_new:Nn \@@_make_font_shapes:Nnnnn
  {
   \group_begin:
-    \keys_set_known:nxN {fontspec-preparse-external} { #4 } \l_@@_leftover_clist
+    \@@_keys_set_known:nxN {fontspec-preparse-external} { #4 } \l_@@_leftover_clist
     \@@_load_fontname:n {#1}
     \@@_declare_shape:nnxx {#2} {#3} { \l_@@_fontopts_clist, \l_@@_leftover_clist } {#5}
   \group_end:
@@ -486,11 +652,12 @@
 
 \cs_new:Nn \@@_load_fontname:n
  {
+%<debug>    \typeout{:: @@_load_fontname:n {#1} }
     \@@_load_external_fontoptions:Nn \l_fontspec_fontname_tl {#1}
     \prop_get:NVNF \g_@@_fontopts_prop \l_fontspec_fontname_tl \l_@@_fontopts_clist
      { \clist_clear:N \l_@@_fontopts_clist }
-    \@@_font_set:Nnn \l_fontspec_font {\@@_fullname:n {\l_fontspec_fontname_tl}} {\f@size pt}
-    \@@_font_if_null:NT \l_fontspec_font { \@@_error:nx {font-not-found} {#1} }
+    \@@_primitive_font_set:Nnn \l_fontspec_font { \@@_construct_font_call:nn {\l_fontspec_fontname_tl} {} } {\f@size pt}
+    \@@_primitive_font_if_null:NT \l_fontspec_font { \@@_error:nx {font-not-found} {#1} }
  }
 %    \end{macrocode}
 % \end{macro}
@@ -510,97 +677,122 @@
 %    \begin{macrocode}
 \cs_new:Nn \@@_declare_shape:nnnn
  {
+%<debug>\typeout{=~ declare_shape:~{\l_fontspec_fontname_tl}~{#1}~{#2}}
   \tl_clear:N \l_@@_nfss_tl
   \tl_clear:N \l_@@_nfss_sc_tl
   \tl_set_eq:NN \l_@@_saved_fontname_tl \l_fontspec_fontname_tl
 
-  \exp_args:Nx \clist_map_inline:nn {#4}
-   {
+  \exp_args:Nx \clist_map_inline:nn {#4} { \@@_setup_single_size:nn {#3} {##1} }
+
+  \@@_declare_shapes_normal:nn {#1} {#2}
+  \@@_declare_shapes_smcaps:nn {#1} {#2}
+  \@@_declare_shape_slanted:nn {#1} {#2}
+  \@@_declare_shape_loginfo:nn {#1} {#2}
+ }
+\cs_generate_variant:Nn \@@_declare_shape:nnnn {nnxx}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_setup_single_size:nn}
+%    \begin{macrocode}
+\cs_new:Nn \@@_setup_single_size:nn
+  {
     \tl_clear:N \l_@@_size_tl
     \tl_set_eq:NN \l_@@_sizedfont_tl \l_@@_saved_fontname_tl % in case not spec'ed
 
-    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n ##1 }
+    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n #2 }
       \l_@@_sizing_leftover_clist
     \tl_if_empty:NT \l_@@_size_tl { \@@_error:n {no-size-info} }
+%<debug>\typeout{==~ size:~\l_@@_size_tl}
 
     % "normal"
     \@@_load_fontname:n {\l_@@_sizedfont_tl}
-    \@@_setup_nfss:Nnn \l_@@_nfss_tl {#3} {}
+    \@@_setup_nfss:Nnnn \l_@@_nfss_tl {#1} {\l_@@_sizing_leftover_clist} {}
+%<debug>    \typeout{===~ sized~ font:~ \l_@@_sizedfont_tl}
 
     % small caps
     \clist_set_eq:NN \l_@@_fontfeat_curr_clist \l_@@_fontfeat_sc_clist
 
     \bool_if:NF \l_@@_nosc_bool
      {
-      \tl_if_empty:NTF \l_fontspec_fontname_sc_tl
+      \tl_if_empty:NTF \l_@@_fontname_sc_tl
        {
-%<debug>      \typeout{Attempting~ small~ caps?}
         \@@_make_smallcaps:TF
          {
-%<debug>      \typeout{Small~ caps~ found.}
+%<debug>\typeout{====~Small~ caps~ found.}
           \clist_put_left:Nn \l_@@_fontfeat_curr_clist {Letters=SmallCaps}
          }
          {
-%<debug>      \typeout{Small~ caps~ not~ found.}
+%<debug>\typeout{====~Small~ caps~ not~ found.}
           \bool_set_true:N \l_@@_nosc_bool
          }
        }
-       { \@@_load_fontname:n {\l_fontspec_fontname_sc_tl} }% local for each size
+       { \@@_load_fontname:n {\l_@@_fontname_sc_tl} }% local for each size
      }
 
     \bool_if:NF \l_@@_nosc_bool
      {
-      \@@_setup_nfss:Nnn \l_@@_nfss_sc_tl {#3} {\l_@@_fontfeat_curr_clist}
+      \@@_setup_nfss:Nnnn \l_@@_nfss_sc_tl
+        {#1} {\l_@@_sizing_leftover_clist} {\l_@@_fontfeat_curr_clist}
      }
-
-   }
-
-  \@@_declare_shapes_normal:nn {#1} {#2}
-  \@@_declare_shapes_smcaps:nn {#1} {#2}
-  \@@_declare_shape_slanted:nn {#1} {#2}
-  \@@_declare_shape_loginfo:nn {#1} {#2}
- }
-\cs_generate_variant:Nn \@@_declare_shape:nnnn {nnxx}
-
-\cs_new:Nn \@@_setup_nfss:Nnn
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_setup_nfss:Nnnn}
+%    \begin{macrocode}
+\cs_new:Nn \@@_setup_nfss:Nnnn
  {
-  \@@_get_features:Nn \l_@@_rawfeatures_sclist
-   { #2 , \l_@@_sizing_leftover_clist , #3 }
+%<debug>\typeout{====~Setup~NFSS~shape:~<\l_@@_size_tl>~\l_fontspec_fontname_tl}
+
+  \@@_get_features:Nn \l_@@_rawfeatures_sclist { #2 , #3 , #4 }
+%<debug>\typeout{====~Gathered~features:~\l_@@_rawfeatures_sclist}
 
   \tl_put_right:Nx #1
    {
     <\l_@@_size_tl> \l_@@_scale_tl
-    \@@_fontwrap:n
-     {
-      \@@_fullname:n { \l_fontspec_fontname_tl }
-      : \l_@@_pre_feat_sclist \l_@@_rawfeatures_sclist
-     }
+      \@@_construct_font_call:nn { \l_fontspec_fontname_tl }
+        { \l_@@_pre_feat_sclist \l_@@_rawfeatures_sclist }
    }
  }
-
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_declare_shapes_normal:nn}
+%    \begin{macrocode}
 \cs_new:Nn \@@_declare_shapes_normal:nn
   {
     \@@_DeclareFontShape:xxxxxx {\l_@@_nfss_enc_tl} {\l_fontspec_family_tl}
       {#1} {#2} {\l_@@_nfss_tl}{\l_@@_postadjust_tl}
   }
-
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_declare_shapes_smcaps:nn}
+%    \begin{macrocode}
 \cs_new:Nn \@@_declare_shapes_smcaps:nn
   {
-    \bool_if:NF \l_@@_nosc_bool
+    \tl_if_empty:NF \l_@@_nfss_sc_tl
      {
       \@@_DeclareFontShape:xxxxxx {\l_@@_nfss_enc_tl} {\l_fontspec_family_tl} {#1}
         { \@@_combo_sc_shape:n {#2} } {\l_@@_nfss_sc_tl} {\l_@@_postadjust_tl}
      }
   }
+
 \cs_new:Nn \@@_combo_sc_shape:n
   {
     \tl_if_exist:cTF { \@@_shape_merge:nn {#1} {\scdefault} }
          { \tl_use:c { \@@_shape_merge:nn {#1} {\scdefault} } }
          { \scdefault }
   }
-
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_DeclareFontShape:nnnnnn}
+%    \begin{macrocode}
 \cs_new:Nn \@@_DeclareFontShape:nnnnnn
  {
+%<debug>\typeout{DeclareFontShape:~{#1}{#2}{#3}{#4}...}
   \group_begin:
     \normalsize
     \cs_undefine:c {#1/#2/#3/#4/\f@size}
@@ -609,6 +801,8 @@
  }
 \cs_generate_variant:Nn \@@_DeclareFontShape:nnnnnn {xxxxxx}
 %    \end{macrocode}
+%
+% \begin{macro}{\@@_declare_shape_slanted:nn}
 % This extra stuff for the slanted shape substitution is a little bit awkward.
 % We define the slanted shape to be a synonym for it when (a)~we're defining an italic font, but also (b)~when the default slanted shape isn't `it'.
 % (Presumably this turned up once in a test and I realised it caused problems. I doubt this would happen much.)
@@ -628,12 +822,16 @@
    }
  }
 %    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_declare_shape_loginfo:nn}
 % Lastly some informative messaging.
 %    \begin{macrocode}
 \cs_new:Nn \@@_declare_shape_loginfo:nn
  {
   \tl_gput_right:Nx \l_fontspec_defined_shapes_tl
    {
+    \exp_not:n { \\ }
     -~ \exp_not:N \str_case:nn {#1/#2}
      {
        {\mddefault/\updefault} {'normal'~}
@@ -663,11 +861,13 @@
      }
    }
  }
-\cs_generate_variant:Nn \tl_if_empty:nF {f}
 %    \end{macrocode}
 % Maybe |\str_if_eq_x:nnF| would be better?
 % \end{macro}
 %
+%
+% \subsubsection{Features}
+%
 % \begin{macro}{\l_@@_pre_feat_sclist}
 % These are the features always applied to a font selection before other
 % features.
@@ -699,157 +899,29 @@
 % \end{macro}
 %
 %
-%
-%
-%
-% \subsubsection{Features}
-%
-% \begin{macro}{\@@_get_features:Nn}
-%
-%   This macro is a wrapper for |\keys_set:nn| which expands and adds a
-%   default specification to the original passed options. It begins by
-%   initialising the commands used to hold font-feature specific
-%   strings.
-%   Its argument is any additional features to prepend to the default.
-%    \begin{macrocode}
-\cs_set:Nn \@@_get_features:Nn
- {
-  \sclist_clear:N \l_@@_rawfeatures_sclist
-  \tl_clear:N \l_@@_scale_tl
-  \tl_set_eq:NN \l_@@_opacity_tl \g_@@_opacity_tl
-  \tl_set_eq:NN \l_@@_hexcol_tl \g_@@_hexcol_tl
-  \tl_set_eq:NN \l_@@_postadjust_tl \g_@@_postadjust_tl
-  \tl_clear:N \l_@@_wordspace_adjust_tl
-  \tl_clear:N \l_@@_punctspace_adjust_tl
-
-  \keys_set_known:nxN {fontspec-renderer} {\l_@@_fontfeat_clist,#2}
-    \l_@@_keys_leftover_clist
-  \keys_set:nx {fontspec} {\l_@@_keys_leftover_clist}
-%    \end{macrocode}
-% Finish the colour specification.
-% Do not set the colour if not explicitly spec'd else \verb|\color| (using
-% specials) will not work.
-%    \begin{macrocode}
-  \str_if_eq_x:nnF { \l_@@_hexcol_tl \l_@@_opacity_tl }
-                   { \g_@@_hexcol_tl \g_@@_opacity_tl }
-   {
-    \@@_update_featstr:n { color = \l_@@_hexcol_tl\l_@@_opacity_tl }
-   }
-
-  \tl_set_eq:NN #1 \l_@@_rawfeatures_sclist
- }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_init:}
-% Initialisations that either need to occur globally:
-% (all setting of these variables is done locally inside a group)
-%    \begin{macrocode}
-\tl_clear:N \l_@@_family_label_tl
-\tl_clear:N \l_fontspec_fontname_bf_tl
-\tl_clear:N \l_fontspec_fontname_it_tl
-\tl_clear:N \l_fontspec_fake_slant_tl
-\tl_clear:N \l_fontspec_fake_embolden_tl
-\tl_clear:N \l_fontspec_fontname_bfit_tl
-\tl_clear:N \l_fontspec_fontname_sl_tl
-\tl_clear:N \l_fontspec_fontname_bfsl_tl
-\tl_clear:N \l_fontspec_fontname_sc_tl
-\tl_clear:N \l_@@_fontfeat_up_clist
-\tl_clear:N \l_@@_fontfeat_bf_clist
-\tl_clear:N \l_@@_fontfeat_it_clist
-\tl_clear:N \l_@@_fontfeat_bfit_clist
-\tl_clear:N \l_@@_fontfeat_sl_clist
-\tl_clear:N \l_@@_fontfeat_bfsl_clist
-\tl_clear:N \l_@@_fontfeat_sc_clist
-\tl_clear:N \l_@@_script_name_tl
-\tl_clear:N \l_fontspec_script_tl
-\tl_clear:N \l_@@_lang_name_tl
-\tl_clear:N \l_fontspec_lang_tl
-\tl_set:Nn  \g_@@_postadjust_tl { \l_@@_wordspace_adjust_tl \l_@@_punctspace_adjust_tl }
-
-\clist_set:Nn \l_@@_sizefeat_clist {Size={-}}
-\tl_new:N  \g_@@_hexcol_tl
-\tl_new:N  \g_@@_opacity_tl
-\tl_set:Nn \g_@@_hexcol_tl {000000}
-\tl_set:Nn \g_@@_opacity_tl {FF~}
-%    \end{macrocode}
-% Or once per fontspec font invocation:
-% (Some of these may be redundant.
-% Check whether they're assigned to globally or not.)
-%    \begin{macrocode}
-\cs_set:Npn \@@_init:
- {
-  \bool_set_false:N \l_@@_ot_bool
-  \bool_set_true:N \l_@@_firsttime_bool
-  \cs_set:Npn \@@_namewrap:n ##1 { ##1 }
-  \tl_clear:N \l_@@_optical_size_tl
-  \tl_clear:N \l_fontspec_renderer_tl
-  \tl_clear:N \l_fontspec_defined_shapes_tl
-  \tl_clear:N \g_@@_curr_series_tl
-  \tl_gset_eq:NN \l_@@_nfss_enc_tl \g_fontspec_encoding_tl
-
-  % 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: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} }
-    {\ttdefault} { \tl_set:Nn \l_@@_family_label_tl {\g_@@_ttfamily_family} }
-   }{}
-
-%<*luatex>
-  \tl_set:Nn \l_fontspec_mode_tl {node}
-  \int_set:Nn \luatex_prehyphenchar:D { `\- } % fixme
-  \int_zero:N \luatex_posthyphenchar:D        % fixme
-  \int_zero:N \luatex_preexhyphenchar:D       % fixme
-  \int_zero:N \luatex_postexhyphenchar:D      % fixme
-%</luatex>
- }
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\@@_make_smallcaps:TF}
+% \begin{macro}{\@@_make_ot_smallcaps:TF}
 % \label{mac:makesmallcaps}
 % This macro checks if the font contains small caps.
 %    \begin{macrocode}
-\cs_set:Nn \fontspec_make_ot_smallcaps:TF
+%<luatex>\cs_set:Nn \@@_make_smallcaps:TF
+%<xetexx>\cs_set:Nn \@@_make_ot_smallcaps:TF
  {
-  \fontspec_check_ot_feat:nTF {+smcp} {#1} {#2}
+  \@@_check_ot_feat:nTF {smcp} {#1} {#2}
  }
 %<*xetexx>
 \cs_set:Nn \@@_make_smallcaps:TF
  {
   \bool_if:NTF \l_@@_ot_bool
-   { \fontspec_make_ot_smallcaps:TF {#1} {#2} }
+   { \@@_make_ot_smallcaps:TF {#1} {#2} }
    {
      \bool_if:NT \l_@@_atsui_bool
-      { \fontspec_make_AAT_feature_string:nnTF {3}{3} {#1} {#2} }
+      { \@@_make_AAT_feature_string:nnTF {3}{3} {#1} {#2} }
    }
  }
 %</xetexx>
-%<*luatex>
-\cs_set_eq:NN \@@_make_smallcaps:TF \fontspec_make_ot_smallcaps:TF
-%</luatex>
 %    \end{macrocode}
 % \end{macro}
 %
-%
-%
-% \begin{macro}{\sclist_put_right:Nn}
-% I'm hardly going to write an `sclist' module but a couple of functions are
-% useful. Here, items in semi-colon lists are always followed by a semi-colon
-% (as opposed to the s.-c's being placed between elements) so we can append
-% sclists without worrying about it.
-%    \begin{macrocode}
-\cs_set_eq:NN \sclist_clear:N \tl_clear:N
-\cs_new:Nn \sclist_gput_right:Nn
- { \tl_gput_right:Nn #1 {#2;} }
-\cs_generate_variant:Nn \sclist_gput_right:Nn {Nx}
-%    \end{macrocode}
-% \end{macro}
-%
-%
-%
 % \begin{macro}{\@@_update_featstr:n}
 % \cmd{\l_@@_rawfeatures_sclist} is the string used to define the list of specific
 % font features. Each time another font feature is requested, this
@@ -857,161 +929,87 @@
 % separated by semicolons.
 %    \begin{macrocode}
 \cs_new:Nn \@@_update_featstr:n
- {
-  \bool_if:NF \l_@@_firsttime_bool
-   {
-    \sclist_gput_right:Nx \l_@@_rawfeatures_sclist {#1}
-   }
- }
+  {
+%<debug>            \typeout{:::: @@_update_featstr:n {#1}}
+    \bool_if:NF \l_@@_firsttime_bool
+      {
+        \tl_gset:Nx \g_@@_single_feat_tl { #1 }
+%<debug>            \typeout{::::~ Adding~ feature.}
+        \tl_gput_right:Nx  \l_@@_rawfeatures_sclist {#1;}
+      }
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-%
-%
-% \begin{macro}{\fontspec_make_feature:nnn}
-%   This macro is called by each feature key selected, and runs
-%   according to which type of font is selected.
+% \begin{macro}{\@@_remove_clashing_featstr:n}
 %    \begin{macrocode}
-\cs_new:Nn \fontspec_make_feature:nnn
-%<*xetexx>
- {
-  \bool_if:NTF \l_@@_ot_bool
-   { \fontspec_make_OT_feature:n {#3} }
-   {
-     \bool_if:NT \l_@@_atsui_bool
-      { \fontspec_make_AAT_feature:nn {#1}{#2} }
-   }
- }
-%</xetexx>
-%<*luatex>
- { \fontspec_make_OT_feature:n {#3} }
-%</luatex>
-\cs_generate_variant:Nn \fontspec_make_feature:nnn {nnx}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\cs_new:Nn \fontspec_make_AAT_feature:nn
- {
-  \tl_if_empty:nTF {#1}
-   { \@@_warning:n {aat-feature-not-exist} }
-   {
-     \fontspec_make_AAT_feature_string:nnTF {#1}{#2}
-      {
-       \@@_update_featstr:n {\l_fontspec_feature_string_tl}
-     }
-     { \@@_warning:nx {aat-feature-not-exist-in-font} {#1,#2} }
-   }
- }
-\cs_new:Nn \fontspec_make_OT_feature:n
- {
-  \tl_if_empty:nTF {#1}
-   { \@@_warning:n {icu-feature-not-exist} }
-   {
-     \fontspec_check_ot_feat:nTF {#1}
+\cs_new:Nn \@@_remove_clashing_featstr:n
+  {
+%<debug>    \typeout{:::: @@_remove_clashing_featstr:n {#1}}
+    \clist_map_inline:nn {#1}
       {
-       \@@_update_featstr:n {#1}
+%<debug>        \typeout{::::~ Removing~ feature~ "##1;"}
+        \tl_gremove_all:Nn \l_@@_rawfeatures_sclist {##1;}
       }
-      { \@@_warning:nx {icu-feature-not-exist-in-font} {#1} }
-   }
- }
-\cs_new_protected:Nn \fontspec_make_numbered_feature:nn
- {
-  \fontspec_check_ot_feat:nTF {#1}
-   {
-    \@@_update_featstr:n { #1 = #2 }
-   }
-   { \@@_warning:nx {icu-feature-not-exist-in-font} {#1} }
- }
-\cs_generate_variant:Nn \fontspec_make_numbered_feature:nn {xn}
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@@_define_font_feature:n}
-% \begin{macro}{\@@_define_feature_option:nnnnn}
-% \begin{macro}{\fontspec_define_numbered_feat:nnnn}
-% These macros are used in order to simplify font feature definition later on.
+% \subsection{Initialisation}
+%
+% \begin{macro}{\@@_init:}
+% Initialisations that need to occur once per fontspec font invocation.
+% (Some of these may be redundant.
+% Check whether they're assigned to globally or not.)
 %    \begin{macrocode}
-\cs_new:Nn \@@_define_font_feature:n
- {
-  \keys_define:nn {fontspec} { #1 .multichoice: }
- }
-\cs_new:Nn \@@_define_feature_option:nnnnn
- {
-  \keys_define:nn {fontspec}
-   {
-    #1/#2 .code:n = { \fontspec_make_feature:nnn{#3}{#4}{#5} }
-   }
- }
-\cs_new:Nn \fontspec_define_numbered_feat:nnnn
+\cs_set:Npn \@@_init:
  {
-  \keys_define:nn {fontspec}
-   {
-    #1/#2 .code:n =
-      { \fontspec_make_numbered_feature:nn {#3}{#4} }
-   }
+%<debug>  \typeout{:: @@_init:}
+  \bool_set_false:N \l_@@_ot_bool
+  \bool_set_true:N \l_@@_firsttime_bool
+  \@@_font_is_name:
+  \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_fontspec_defined_shapes_tl
+  \tl_clear:N \g_@@_curr_series_tl
+  \tl_gset_eq:NN \l_@@_nfss_enc_tl \g_fontspec_encoding_tl
+
+%<*luatex>
+  \tl_set:Nn \l_fontspec_mode_tl {node}
+  \int_set:Nn \luatex_prehyphenchar:D { `\- } % fixme
+  \int_zero:N \luatex_posthyphenchar:D        % fixme
+  \int_zero:N \luatex_preexhyphenchar:D       % fixme
+  \int_zero:N \luatex_postexhyphenchar:D      % fixme
+%</luatex>
  }
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
-% \end{macro}
 %
-% \begin{macro}{\fontspec_make_AAT_feature_string:nnTF}
-%   This macro takes the numerical codes for a font feature and
-%   creates a specified macro containing the string required in the
-%   font definition to turn that feature on or off. Used primarily in
-%   [...], but also used to check if small caps
-%   exists in the requested font (see page~\pageref{mac:makesmallcaps}).
-%
-% For exclusive selectors, it's easy; just grab the string:
-% For \emph{non}-exclusive selectors, it's a little more complex.
-% If the selector is even, it corresponds to switching the feature on.
-% If the selector is \emph{odd}, it corresponds to switching the feature off.
-% But \XeTeX\ doesn't return a selector string for this number, since the
-% feature is defined for the `switching on' value. So we need to check the
-% selector of the previous number, and then prefix the feature string with |!|
-% to denote the switch.
-%
-% Finally, save out the complete feature string in \cmd\l_fontspec_feature_string_tl.
+% \begin{macro}{\@@_init_fontface:}
+% Executed in \cs{@@_get_features:Nn}.
 %    \begin{macrocode}
-\prg_new_conditional:Nnn \fontspec_make_AAT_feature_string:nn {TF,T,F}
- {
-  \tl_set:Nx \l_tmpa_tl { \XeTeXfeaturename \l_fontspec_font #1 }
-  \tl_if_empty:NTF \l_tmpa_tl
-   { \prg_return_false: }
-   {
-    \int_compare:nTF { \XeTeXisexclusivefeature\l_fontspec_font #1 > 0 }
-     {
-      \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
-     }
-     {
-      \int_if_even:nTF {#2}
-       {
-        \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
-       }
-       {
-        \tl_set:Nx \l_tmpb_tl
-         {
-          \XeTeXselectorname\l_fontspec_font #1\space \numexpr#2-1\relax
-         }
-        \tl_if_empty:NF \l_tmpb_tl { \tl_put_left:Nn \l_tmpb_tl {!} }
-       }
-    }
-    \tl_if_empty:NTF \l_tmpb_tl
-     { \prg_return_false: }
-     {
-      \tl_set:Nx \l_fontspec_feature_string_tl { \l_tmpa_tl = \l_tmpb_tl }
-      \prg_return_true:
-     }
-   }
- }
+\cs_new:Nn \@@_init_fontface:
+  {
+    \tl_clear:N \l_@@_rawfeatures_sclist
+    \tl_clear:N \l_@@_scale_tl
+    \tl_set_eq:NN \l_@@_opacity_tl \g_@@_opacity_tl
+    \tl_set_eq:NN \l_@@_hexcol_tl \g_@@_hexcol_tl
+    \tl_set_eq:NN \l_@@_postadjust_tl \g_@@_postadjust_tl
+    \tl_clear:N \l_@@_wordspace_adjust_tl
+    \tl_clear:N \l_@@_punctspace_adjust_tl
+  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\fontspec_iv_str_to_num:Nn}
-% \begin{macro}{\fontspec_v_str_to_num:Nn}
+%
+% \subsection{Miscellaneous}
+%
+% \begin{macro}{\@@_iv_str_to_num:Nn}
 % This macro takes a four character string and converts it to the
 % numerical representation required for \XeTeX\ OpenType script/language/feature
-% purposes. The output is stored in \cmd\l_fontspec_strnum_int.
+% purposes. The output is stored in |#1|.
 %
 % The reason it's ugly is because the input can be of the form of any of these:
 % `|abcd|', `|abc|', `|abc |', `|ab|', `|ab  |', \etc.
@@ -1019,16 +1017,12 @@
 % reads in the string, delimited by a space; this input is padded with \cmd\@empty s
 % and anything beyond four chars is snipped. The \cmd\@empty s then are used to reconstruct
 % the spaces in the string to number calculation.
-%
-% The variant \cmd\fontspec_v_str_to_num:n\ is used when looking at features, which are passed around
-% with prepended plus and minus signs (\eg, \texttt{+liga}, \texttt{-dlig}); it
-% simply strips off the first char of the input before calling the normal \cmd\fontspec_iv_str_to_num:n.
 %    \begin{macrocode}
-\cs_set:Nn \fontspec_iv_str_to_num:Nn
+\cs_set:Nn \@@_iv_str_to_num:Nn
  {
-  \fontspec_iv_str_to_num:w #1 \q_nil #2 \c_empty_tl \c_empty_tl \q_nil
+  \@@_iv_str_to_num:w #1 \q_nil #2 \c_empty_tl \c_empty_tl \q_nil
  }
-\cs_set:Npn \fontspec_iv_str_to_num:w #1 \q_nil #2#3#4#5#6 \q_nil
+\cs_set:Npn \@@_iv_str_to_num:w #1 \q_nil #2#3#4#5#6 \q_nil
  {
   \int_set:Nn #1
    {
@@ -1038,143 +1032,10 @@
     + \ifx \c_empty_tl #5 32 \else `#5 \fi
    }
  }
-\cs_generate_variant:Nn \fontspec_iv_str_to_num:Nn {No}
-\cs_set:Nn \fontspec_v_str_to_num:Nn
- {
-  \bool_if:nTF
-   {
-    \tl_if_head_eq_charcode_p:nN {#2} {+} ||
-    \tl_if_head_eq_charcode_p:nN {#2} {-}
-   }
-   { \fontspec_iv_str_to_num:No #1 { \use_none:n #2 } }
-   { \fontspec_iv_str_to_num:Nn #1 {#2} }
- }
+\cs_generate_variant:Nn \@@_iv_str_to_num:Nn {No}
 %    \end{macrocode}
 % \end{macro}
-% \end{macro}
-%
 %
-% \begin{macro}{\fontspec_check_script:nTF}
-% This macro takes an OpenType script tag and checks if it exists in the current
-% font. The output boolean is \cmd\@tempswatrue. \cmd\l_fontspec_strnum_int\ is used to store
-% the number corresponding to the script tag string.
-%    \begin{macrocode}
-\prg_new_conditional:Nnn \fontspec_check_script:n {TF}
-%<*xetexx>
- {
-  \fontspec_iv_str_to_num:Nn \l_fontspec_strnum_int {#1}
-  \int_set:Nn \l_tmpb_int { \XeTeXOTcountscripts \l_fontspec_font }
-  \int_zero:N \l_tmpa_int
-  \bool_set_false:N \l__fontspec_check_bool
-  \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
-   {
-    \ifnum \XeTeXOTscripttag\l_fontspec_font \l_tmpa_int = \l_fontspec_strnum_int
-      \bool_set_true:N \l__fontspec_check_bool
-      \int_set:Nn \l_tmpa_int {\l_tmpb_int}
-    \else
-      \int_incr:N \l_tmpa_int
-    \fi
-   }
-  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
- }
-%</xetexx>
-%<*luatex>
- {
-  \directlua{fontspec.check_ot_script("l_fontspec_font", "#1")}
-  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
- }
-%</luatex>
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\fontspec_check_lang:nTF}
-% This macro takes an OpenType language tag and checks if it exists in the current
-% font/script. The output boolean is \cmd\@tempswatrue. \cmd\l_fontspec_strnum_int\ is used to store
-% the number corresponding to the language tag string.
-% The script used is whatever's held in \cmd\l_fontspec_script_int. By default, that's the
-% number corresponding to `|latn|'.
-%    \begin{macrocode}
-\prg_new_conditional:Nnn \fontspec_check_lang:n {TF}
-%<*xetexx>
- {
-  \fontspec_iv_str_to_num:Nn \l_fontspec_strnum_int {#1}
-  \int_set:Nn \l_tmpb_int
-   { \XeTeXOTcountlanguages \l_fontspec_font \l_fontspec_script_int }
-  \int_zero:N \l_tmpa_int
-  \bool_set_false:N \l__fontspec_check_bool
-  \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
-   {
-    \ifnum\XeTeXOTlanguagetag\l_fontspec_font\l_fontspec_script_int \l_tmpa_int =\l_fontspec_strnum_int
-      \bool_set_true:N \l__fontspec_check_bool
-      \int_set:Nn \l_tmpa_int {\l_tmpb_int}
-    \else
-      \int_incr:N \l_tmpa_int
-    \fi
-   }
-  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
- }
-%</xetexx>
-%<*luatex>
- {
-  \directlua
-   {
-    fontspec.check_ot_lang( "l_fontspec_font", "#1", "\l_fontspec_script_tl" )
-   }
-  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
- }
-%</luatex>
-%    \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\fontspec_check_ot_feat:nTF}
-% \begin{macro}{\fontspec_check_ot_feat:nT}
-% This macro takes an OpenType feature tag and checks if it exists in the current
-% font/script/language.
-% \cmd\l_fontspec_strnum_int\ is used to store the number corresponding to the feature tag string.
-% The script used is whatever's held in \cmd\l_fontspec_script_int. By default, that's the
-% number corresponding to `|latn|'. The language used is \cmd\l_fontspec_language_int,
-% by default |0|, the `default language'.
-%    \begin{macrocode}
-\prg_new_conditional:Nnn \fontspec_check_ot_feat:n {TF,T}
-%<*xetexx>
- {
-  \int_set:Nn \l_tmpb_int
-   {
-    \XeTeXOTcountfeatures \l_fontspec_font
-                          \l_fontspec_script_int
-                          \l_fontspec_language_int
-   }
-  \fontspec_v_str_to_num:Nn \l_fontspec_strnum_int {#1}
-  \int_zero:N \l_tmpa_int
-  \bool_set_false:N \l__fontspec_check_bool
-  \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
-   {
-    \ifnum\XeTeXOTfeaturetag\l_fontspec_font\l_fontspec_script_int\l_fontspec_language_int
-         \l_tmpa_int =\l_fontspec_strnum_int
-      \bool_set_true:N \l__fontspec_check_bool
-      \int_set:Nn \l_tmpa_int {\l_tmpb_int}
-    \else
-      \int_incr:N \l_tmpa_int
-    \fi
-   }
-  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
- }
-%</xetexx>
-%<*luatex>
- {
-  \directlua
-   {
-    fontspec.check_ot_feat(
-                           "l_fontspec_font", "#1",
-                           "\l_fontspec_lang_tl", "\l_fontspec_script_tl"
-                          )
-   }
-  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
- }
-%</luatex>
-%    \end{macrocode}
-% \end{macro}
-% \end{macro}
 %
 % \iffalse
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx
index b68d73b169e..de3a804aabe 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx
@@ -10,12 +10,23 @@
 %    \end{macrocode}
 % \fi
 %
+%
+%    \begin{macrocode}
+\clist_set:Nn \g_@@_all_keyval_modules_clist
+  {
+    fontspec, fontspec-opentype, fontspec-aat,
+    fontspec-preparse, fontspec-preparse-external, fontspec-preparse-nested,
+    fontspec-renderer
+  }
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 \cs_new:Nn \@@_keys_define_code:nnn
- {
-  \keys_define:nn {#1} { #2 .code:n = {#3} }
- }
+  {
+   \keys_define:nn {#1} { #2 .code:n = {#3} }
+  }
 %    \end{macrocode}
+%
 % For catching features that cannot be used in |\addfontfeatures|:
 %    \begin{macrocode}
 \cs_new:Nn \@@_aff_error:n
@@ -29,24 +40,26 @@
 %
 % These features are extracted from the font feature list before all others.
 %
-% \paragraph{\feat{ExternalLocation}}
+% \begin{macro}{Path}
 % For fonts that aren't installed in the system. If no argument is given, the font is located
 % with |kpsewhich|; it's either in the current directory or the \TeX\ tree. Otherwise, the
 % argument given defines the file path of the font.
 %    \begin{macrocode}
-\bool_new:N \l_@@_external_bool
-\@@_keys_define_code:nnn {fontspec-preparse-external} {ExternalLocation}
+\@@_keys_define_code:nnn {fontspec-preparse-external} {Path}
  {
   \bool_set_true:N \l_@@_nobf_bool
   \bool_set_true:N \l_@@_noit_bool
   \bool_set_true:N \l_@@_external_bool
-  \cs_set:Npn \@@_namewrap:n ##1 { [ #1 ##1 ] }
+  \tl_set:Nn \l_@@_font_path_tl {#1}
+  \@@_font_is_file:
 %<*xetexx>
   \keys_set:nn {fontspec-renderer} {Renderer=OpenType}
 %</xetexx>
  }
-\aliasfontfeature{ExternalLocation}{Path}
+\aliasfontfeature{Path}{ExternalLocation}
+\@@_keys_define_code:nnn {fontspec} {Path} {}
 %    \end{macrocode}
+% \end{macro}
 %
 % \paragraph{\feat{Extension}}
 % For fonts that aren't installed in the system. Specifies the font extension
@@ -57,10 +70,11 @@
   \tl_set:Nn \l_@@_extension_tl {#1}
   \bool_if:NF \l_@@_external_bool
    {
-    \keys_set:nn {fontspec-preparse-external} {ExternalLocation}
+    \keys_set:nn {fontspec-preparse-external} {Path}
    }
  }
 \tl_clear:N \l_@@_extension_tl
+\@@_keys_define_code:nnn {fontspec} {Extension} {}
 %    \end{macrocode}
 %
 % \subsubsection{Pre-parsed features}
@@ -81,6 +95,7 @@
 %<*xetexx>
       \tl_set:Nv \l_fontspec_renderer_tl
         { g_fontspec_renderer_tag_ \l_keys_choice_tl }
+      \tl_gset:Nx \g_@@_single_feat_tl { \l_fontspec_renderer_tl }
 %</xetexx>
 %<*luatex>
       \@@_warning:nx {only-xetex-feature} {Renderer=AAT/OpenType/Graphite}
@@ -93,6 +108,7 @@
 %<*luatex>
       \tl_set:Nv \l_fontspec_mode_tl
         { g_fontspec_mode_tag_ \l_keys_choice_tl }
+      \tl_gset:Nx \g_@@_single_feat_tl { mode=\l_fontspec_mode_tl }
 %</luatex>
      }
    }
@@ -123,6 +139,22 @@
  }
 %    \end{macrocode}
 %
+% \paragraph{TTC font index}
+%    \begin{macrocode}
+\@@_keys_define_code:nnn {fontspec-preparse} {FontIndex}
+ {
+  \str_if_eq_x:nnF { \str_lower_case:f {\l_@@_extension_tl} } {.ttc}
+    { \@@_warning:n {font-index-needs-ttc} }
+%<xetexx>  \tl_set:Nn \l_@@_ttc_index_tl {:#1}
+%<luatex>  \tl_set:Nn \l_@@_ttc_index_tl {(#1)}
+ }
+\@@_keys_define_code:nnn {fontspec} {FontIndex}
+ {
+%<xetexx>  \tl_set:Nn \l_@@_ttc_index_tl {:#1}
+%<luatex>  \tl_set:Nn \l_@@_ttc_index_tl {(#1)}
+ }
+%    \end{macrocode}
+%
 % \subsubsection{Bold/italic choosing options}
 %
 % The \feat{Bold}, \feat{Italic}, and \feat{BoldItalic}
@@ -133,7 +165,6 @@
 % By default, \pkg{fontspec} uses the default bold series, \cs{bfdefault}.
 % We want to be able to make this extensible.
 %    \begin{macrocode}
-\seq_new:N \g_@@_bf_series_seq
 \@@_keys_define_code:nnn {fontspec-preparse-external} {BoldSeries}
  {
   \tl_gset:Nx \g_@@_curr_series_tl { #1 }
@@ -146,17 +177,15 @@
 %    \begin{macrocode}
 \@@_keys_define_code:nnn {fontspec-preparse-external} {UprightFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_up_tl {#1}
+  \fontspec_complete_fontname:Nn \l_@@_fontname_up_tl {#1}
  }
 \@@_keys_define_code:nnn {fontspec-preparse-external} {FontName}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_up_tl {#1}
+  \fontspec_complete_fontname:Nn \l_@@_fontname_up_tl {#1}
  }
 %    \end{macrocode}
 % Bold:
 %    \begin{macrocode}
-\cs_generate_variant:Nn \tl_if_eq:nnT {ox}
-\cs_generate_variant:Nn \prop_put:Nnn {NxV}
 \@@_keys_define_code:nnn {fontspec-preparse-external} {BoldFont}
  {
   \tl_if_empty:nTF {#1}
@@ -173,7 +202,7 @@
       \seq_put_right:Nx \g_@@_bf_series_seq {\bfdefault}
      }
     \tl_if_eq:oxT \g_@@_curr_series_tl {\bfdefault}
-     { \tl_set_eq:NN \l_fontspec_fontname_bf_tl \l_@@_curr_bfname_tl }
+     { \tl_set_eq:NN \l_@@_fontname_bf_tl \l_@@_curr_bfname_tl }
 
 %<debug>\typeout{Setting~bold~font~"\l_@@_curr_bfname_tl"~with~series~"\g_@@_curr_series_tl"}
 
@@ -182,7 +211,6 @@
 
    }
  }
-\prop_new:N \l_@@_nfss_prop
 %    \end{macrocode}
 % Same for italic:
 %    \begin{macrocode}
@@ -194,7 +222,7 @@
    }
    {
     \bool_set_false:N \l_@@_noit_bool
-    \fontspec_complete_fontname:Nn \l_fontspec_fontname_it_tl {#1}
+    \fontspec_complete_fontname:Nn \l_@@_fontname_it_tl {#1}
    }
  }
 %    \end{macrocode}
@@ -202,15 +230,15 @@
 %    \begin{macrocode}
 \@@_keys_define_code:nnn {fontspec-preparse-external} {BoldItalicFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_bfit_tl {#1}
+  \fontspec_complete_fontname:Nn \l_@@_fontname_bfit_tl {#1}
  }
 \@@_keys_define_code:nnn {fontspec-preparse-external} {SlantedFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_sl_tl {#1}
+  \fontspec_complete_fontname:Nn \l_@@_fontname_sl_tl {#1}
  }
 \@@_keys_define_code:nnn {fontspec-preparse-external} {BoldSlantedFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_bfsl_tl {#1}
+  \fontspec_complete_fontname:Nn \l_@@_fontname_bfsl_tl {#1}
  }
 %    \end{macrocode}
 % Small caps isn't pre-parsed because it can vary with others above:
@@ -223,25 +251,11 @@
    }
    {
     \bool_set_false:N \l_@@_nosc_bool
-    \fontspec_complete_fontname:Nn \l_fontspec_fontname_sc_tl {#1}
+    \fontspec_complete_fontname:Nn \l_@@_fontname_sc_tl {#1}
    }
  }
 %    \end{macrocode}
 %
-% \begin{macro}{\fontspec_complete_fontname:Nn}
-% This macro defines |#1| as the input with any |*| tokens of its input
-% replaced by the font name. This lets us define supplementary fonts in full
-% (``\texttt{Baskerville Semibold}'') or in abbreviation (``\texttt{* Semibold}'').
-%    \begin{macrocode}
-\cs_set:Nn \fontspec_complete_fontname:Nn
- {
-  \tl_set:Nx #1 {#2}
-  \tl_replace_all:Nnx #1 {*} {\l_@@_basename_tl}
-%<luatex>  \tl_remove_all:Nn #1 {~}
- }
-\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
-%    \end{macrocode}
-% \end{macro}
 %
 % \paragraph{Features}
 %
@@ -352,7 +366,6 @@
 % \paragraph{NFSS series/shape}
 % This option looks similar in name but has a very different function.
 %    \begin{macrocode}
-\prop_new:N \l_@@_nfssfont_prop
 \@@_keys_define_code:nnn {fontspec} {FontFace}
  {
   \tl_set:No \l_@@_arg_tl { \use_iii:nnn #1 }
@@ -379,28 +392,6 @@
 %    \end{macrocode}
 %
 %
-% \begin{macro}{\@@_add_nfssfont:nnnn}
-% \darg{series}
-% \darg{shape}
-% \darg{fontname}
-% \darg{fontspec features}
-%    \begin{macrocode}
-\cs_new:Nn \@@_add_nfssfont:nnnn
- {
-  \tl_set:Nx \l_@@_this_font_tl {#3}
-
-  \tl_if_empty:xTF {#4}
-   { \clist_set:Nn \l_@@_sizefeat_clist {Size={-}} }
-   { \keys_set_known:noN {fontspec-preparse-nested} {#4} \l_@@_tmp_tl }
-
-  \tl_if_empty:NF \l_@@_this_font_tl
-   {
-    \prop_put:Nxx \l_@@_nfssfont_prop {#1/#2}
-     { {#1}{#2}{\l_@@_this_font_tl}{#4}{\l_@@_sizefeat_clist} }
-   }
- }
-%    \end{macrocode}
-% \end{macro}
 %
 % \paragraph{Scale}
 % If the input isn't one of the pre-defined string options, then
@@ -463,7 +454,7 @@
     \settoheight #1
      {
       \str_if_eq:nnTF {#3} {\font} \rmfamily #3
-      \int_case:nnn #2
+      \int_case:nnF #2
        {
          {5} {x} % x-height
          {8} {X} % cap-height
@@ -578,7 +569,7 @@
     \tl_if_single:nTF {#1}
      { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} }
      { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} }
-    \font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
+    \@@_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
      {
       \tl_put_right:Nn \l_@@_postadjust_tl
 %<*xetexx>
@@ -619,6 +610,9 @@
      }
    }
  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \cs_set:Npn \fontspec_parse_colour:viii #1#2#3#4#5#6#7#8
  {
   \tl_set:Nn \l_@@_hexcol_tl {#1#2#3#4#5#6}
@@ -632,7 +626,6 @@
 \aliasfontfeature{Color}{Colour}
 %    \end{macrocode}
 %    \begin{macrocode}
-\int_new:N \l_@@_tmp_int
 \@@_keys_define_code:nnn {fontspec} {Opacity}
  {
   \int_set:Nn \l_@@_tmp_int {255}
@@ -665,21 +658,13 @@
    {
     \@@_warning:n {no-mapping-ligtex}
     \msg_redirect_name:nnn {fontspec} {no-mapping-ligtex} {none}
-    \keys_set:nn {fontspec} { Ligatures=TeX }
+    \keys_set:nn {fontspec-opentype} { Ligatures=TeX }
    }
    { \@@_warning:n {no-mapping} }
  }
 %</luatex>
 %    \end{macrocode}
 %
-% \paragraph{FeatureFile}
-%    \begin{macrocode}
-\@@_keys_define_code:nnn {fontspec} {FeatureFile}
- {
-  \@@_update_featstr:n { featurefile = #1 }
- }
-%    \end{macrocode}
-%
 %
 % \subsubsection{Continuous font axes}
 %
@@ -772,17 +757,17 @@
    {
     \bool_if:NT \l_@@_firsttime_bool
      {
-      \tl_set:Nn \l_fontspec_fake_slant_tl {#1}
+      \tl_set:Nn \l_@@_fake_slant_tl {#1}
       \clist_put_right:Nn \l_@@_fontfeat_it_clist {FakeSlant=#1}
-      \tl_set_eq:NN \l_fontspec_fontname_it_tl \l_fontspec_fontname_tl
+      \tl_set_eq:NN \l_@@_fontname_it_tl \l_fontspec_fontname_tl
       \bool_set_false:N \l_@@_noit_bool
 
-      \tl_if_empty:NF \l_fontspec_fake_embolden_tl
+      \tl_if_empty:NF \l_@@_fake_embolden_tl
        {
         \clist_put_right:Nx \l_@@_fontfeat_bfit_clist
-         {FakeBold=\l_fontspec_fake_embolden_tl}
+         {FakeBold=\l_@@_fake_embolden_tl}
         \clist_put_right:Nx \l_@@_fontfeat_bfit_clist {FakeSlant=#1}
-        \tl_set_eq:NN \l_fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
+        \tl_set_eq:NN \l_@@_fontname_bfit_tl \l_fontspec_fontname_tl
        }
      }
    },
@@ -797,17 +782,17 @@
    {
     \bool_if:NT \l_@@_firsttime_bool
      {
-      \tl_set:Nn \l_fontspec_fake_embolden_tl {#1}
+      \tl_set:Nn \l_@@_fake_embolden_tl {#1}
       \clist_put_right:Nn \l_@@_fontfeat_bf_clist {FakeBold=#1}
-      \tl_set_eq:NN \l_fontspec_fontname_bf_tl \l_fontspec_fontname_tl
+      \tl_set_eq:NN \l_@@_fontname_bf_tl \l_fontspec_fontname_tl
       \bool_set_false:N \l_@@_nobf_bool
 
-      \tl_if_empty:NF \l_fontspec_fake_slant_tl
+      \tl_if_empty:NF \l_@@_fake_slant_tl
        {
         \clist_put_right:Nx \l_@@_fontfeat_bfit_clist
-         {FakeSlant=\l_fontspec_fake_slant_tl}
+         {FakeSlant=\l_@@_fake_slant_tl}
         \clist_put_right:Nx \l_@@_fontfeat_bfit_clist {FakeBold=#1}
-        \tl_set_eq:NN \l_fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
+        \tl_set_eq:NN \l_@@_fontname_bfit_tl \l_fontspec_fontname_tl
        }
      }
    },
@@ -816,660 +801,6 @@
 %    \end{macrocode}
 %
 %
-% \subsubsection{Ligatures}
-% The call to the nested keyval family must be wrapped in braces to
-% hide the parent list (this later requires the use of global
-% definitions (|\xdef|) in [...]). Both \AAT\ and OpenType
-% names are offered to chose |Rare|/|Discretionary| ligatures.
-%    \begin{macrocode}
-\@@_define_font_feature:n{Ligatures}
-\@@_define_feature_option:nnnnn{Ligatures}{Required}       {1}{0}{+rlig}
-\@@_define_feature_option:nnnnn{Ligatures}{NoRequired}     {1}{1}{-rlig}
-\@@_define_feature_option:nnnnn{Ligatures}{Common}         {1}{2}{+liga}
-\@@_define_feature_option:nnnnn{Ligatures}{NoCommon}       {1}{3}{-liga}
-\@@_define_feature_option:nnnnn{Ligatures}{Rare}           {1}{4}{+dlig}
-\@@_define_feature_option:nnnnn{Ligatures}{NoRare}         {1}{5}{-dlig}
-\@@_define_feature_option:nnnnn{Ligatures}{Discretionary}  {1}{4}{+dlig}
-\@@_define_feature_option:nnnnn{Ligatures}{NoDiscretionary}{1}{5}{-dlig}
-\@@_define_feature_option:nnnnn{Ligatures}{Contextual}     {}{}  {+clig}
-\@@_define_feature_option:nnnnn{Ligatures}{NoContextual}   {}{}  {-clig}
-\@@_define_feature_option:nnnnn{Ligatures}{Historic}       {}{}  {+hlig}
-\@@_define_feature_option:nnnnn{Ligatures}{NoHistoric}     {}{}  {-hlig}
-\@@_define_feature_option:nnnnn{Ligatures}{Logos}          {1}{6} {}
-\@@_define_feature_option:nnnnn{Ligatures}{NoLogos}        {1}{7} {}
-\@@_define_feature_option:nnnnn{Ligatures}{Rebus}          {1}{8} {}
-\@@_define_feature_option:nnnnn{Ligatures}{NoRebus}        {1}{9} {}
-\@@_define_feature_option:nnnnn{Ligatures}{Diphthong}      {1}{10}{}
-\@@_define_feature_option:nnnnn{Ligatures}{NoDiphthong}    {1}{11}{}
-\@@_define_feature_option:nnnnn{Ligatures}{Squared}        {1}{12}{}
-\@@_define_feature_option:nnnnn{Ligatures}{NoSquared}      {1}{13}{}
-\@@_define_feature_option:nnnnn{Ligatures}{AbbrevSquared}  {1}{14}{}
-\@@_define_feature_option:nnnnn{Ligatures}{NoAbbrevSquared}{1}{15}{}
-\@@_define_feature_option:nnnnn{Ligatures}{Icelandic}      {1}{32}{}
-\@@_define_feature_option:nnnnn{Ligatures}{NoIcelandic}    {1}{33}{}
-%    \end{macrocode}
-% Emulate CM extra ligatures.
-%    \begin{macrocode}
-\keys_define:nn {fontspec}
- {
-  Ligatures / TeX .code:n =
-   {
-%<*xetexx>
-    \@@_update_featstr:n { mapping = tex-text }
-%</xetexx>
-%<*luatex>
-    \@@_update_featstr:n { +tlig }
-%</luatex>
-   }
- }
-%    \end{macrocode}
-%
-% \subsubsection{Letters}
-%    \begin{macrocode}
-\@@_define_font_feature:n{Letters}
-\@@_define_feature_option:nnnnn{Letters}{Normal}             {3}{0}{}
-\@@_define_feature_option:nnnnn{Letters}{Uppercase}          {3}{1}{+case}
-\@@_define_feature_option:nnnnn{Letters}{Lowercase}          {3}{2}{}
-\@@_define_feature_option:nnnnn{Letters}{SmallCaps}          {3}{3}{+smcp}
-\@@_define_feature_option:nnnnn{Letters}{PetiteCaps}         {} {} {+pcap}
-\@@_define_feature_option:nnnnn{Letters}{UppercaseSmallCaps} {} {} {+c2sc}
-\@@_define_feature_option:nnnnn{Letters}{UppercasePetiteCaps}{} {} {+c2pc}
-\@@_define_feature_option:nnnnn{Letters}{InitialCaps}        {3}{4}{}
-\@@_define_feature_option:nnnnn{Letters}{Unicase}            {} {} {+unic}
-\@@_define_feature_option:nnnnn{Letters}{Random}             {} {} {+rand}
-%    \end{macrocode}
-%
-% \subsubsection{Numbers}
-%
-% These were originally separated into \feat{NumberCase} and
-% \feat{NumberSpacing} following \AAT, but it makes more sense to
-% combine them.
-%
-% Both naming conventions are offered to select the number case.
-%
-%    \begin{macrocode}
-\@@_define_font_feature:n{Numbers}
-\@@_define_feature_option:nnnnn{Numbers}{Monospaced}   {6} {0}{+tnum}
-\@@_define_feature_option:nnnnn{Numbers}{Proportional} {6} {1}{+pnum}
-\@@_define_feature_option:nnnnn{Numbers}{Lowercase}    {21}{0}{+onum}
-\@@_define_feature_option:nnnnn{Numbers}{OldStyle}     {21}{0}{+onum}
-\@@_define_feature_option:nnnnn{Numbers}{Uppercase}    {21}{1}{+lnum}
-\@@_define_feature_option:nnnnn{Numbers}{Lining}       {21}{1}{+lnum}
-\@@_define_feature_option:nnnnn{Numbers}{SlashedZero}  {14}{5}{+zero}
-\@@_define_feature_option:nnnnn{Numbers}{NoSlashedZero}{14}{4}{-zero}
-%    \end{macrocode}
-%
-% |luaotload| provides a custom |anum| feature for replacing Latin
-% (AKA Arabic) numbers with Arabic (AKA Indic-Arabic). The same feature
-% maps to Farsi (Persian) numbers if font language is Farsi.
-%
-%    \begin{macrocode}
-\luatex_if_engine:T
- {
-  \@@_define_feature_option:nnnnn{Numbers}{Arabic}{}{}{+anum}
- }
-%    \end{macrocode}
-%
-% \subsubsection{Contextuals}
-%    \begin{macrocode}
-\@@_define_font_feature:n  {Contextuals}
-\@@_define_feature_option:nnnnn{Contextuals}{Swash}        {} {} {+cswh}
-\@@_define_feature_option:nnnnn{Contextuals}{NoSwash}      {} {} {-cswh}
-\@@_define_feature_option:nnnnn{Contextuals}{Alternate}    {} {} {+calt}
-\@@_define_feature_option:nnnnn{Contextuals}{NoAlternate}  {} {} {-calt}
-\@@_define_feature_option:nnnnn{Contextuals}{WordInitial}  {8}{0}{+init}
-\@@_define_feature_option:nnnnn{Contextuals}{NoWordInitial}{8}{1}{-init}
-\@@_define_feature_option:nnnnn{Contextuals}{WordFinal}    {8}{2}{+fina}
-\@@_define_feature_option:nnnnn{Contextuals}{NoWordFinal}  {8}{3}{-fina}
-\@@_define_feature_option:nnnnn{Contextuals}{LineInitial}  {8}{4}{}
-\@@_define_feature_option:nnnnn{Contextuals}{NoLineInitial}{8}{5}{}
-\@@_define_feature_option:nnnnn{Contextuals}{LineFinal}    {8}{6}{+falt}
-\@@_define_feature_option:nnnnn{Contextuals}{NoLineFinal}  {8}{7}{-falt}
-\@@_define_feature_option:nnnnn{Contextuals}{Inner}        {8}{8}{+medi}
-\@@_define_feature_option:nnnnn{Contextuals}{NoInner}      {8}{9}{-medi}
-%    \end{macrocode}
-%
-% \subsubsection{Diacritics}
-%    \begin{macrocode}
-\@@_define_font_feature:n{Diacritics}
-\@@_define_feature_option:nnnnn{Diacritics}{Show}        {9}{0}{}
-\@@_define_feature_option:nnnnn{Diacritics}{Hide}        {9}{1}{}
-\@@_define_feature_option:nnnnn{Diacritics}{Decompose}   {9}{2}{}
-\@@_define_feature_option:nnnnn{Diacritics}{MarkToBase}  {}{}{+mark}
-\@@_define_feature_option:nnnnn{Diacritics}{NoMarkToBase}{}{}{-mark}
-\@@_define_feature_option:nnnnn{Diacritics}{MarkToMark}  {}{}{+mkmk}
-\@@_define_feature_option:nnnnn{Diacritics}{NoMarkToMark}{}{}{-mkmk}
-\@@_define_feature_option:nnnnn{Diacritics}{AboveBase}   {}{}{+abvm}
-\@@_define_feature_option:nnnnn{Diacritics}{NoAboveBase} {}{}{-abvm}
-\@@_define_feature_option:nnnnn{Diacritics}{BelowBase}   {}{}{+blwm}
-\@@_define_feature_option:nnnnn{Diacritics}{NoBelowBase} {}{}{-blwm}
-%    \end{macrocode}
-%
-% \subsubsection{Kerning}
-%    \begin{macrocode}
-\@@_define_font_feature:n{Kerning}
-\@@_define_feature_option:nnnnn{Kerning}{Uppercase}{}{}{+cpsp}
-\@@_define_feature_option:nnnnn{Kerning}{On}       {}{}{+kern}
-\@@_define_feature_option:nnnnn{Kerning}{Off}      {}{}{-kern}
-%\@@_define_feature_option:nnnnn{Kerning}{Vertical}{}{}{+vkrn}
-%\@@_define_feature_option:nnnnn{Kerning}
-%    {VerticalAlternateProportional}{}{}{+vpal}
-%\@@_define_feature_option:nnnnn{Kerning}{VerticalAlternateHalfWidth}{}{}{+vhal}
-%    \end{macrocode}
-%
-% \subsubsection{Vertical position}
-%    \begin{macrocode}
-\@@_define_font_feature:n{VerticalPosition}
-\@@_define_feature_option:nnnnn{VerticalPosition}{Normal}     {10}{0}{}
-\@@_define_feature_option:nnnnn{VerticalPosition}{Superior}   {10}{1}{+sups}
-\@@_define_feature_option:nnnnn{VerticalPosition}{Inferior}   {10}{2}{+subs}
-\@@_define_feature_option:nnnnn{VerticalPosition}{Ordinal}    {10}{3}{+ordn}
-\@@_define_feature_option:nnnnn{VerticalPosition}{Numerator}  {}  {} {+numr}
-\@@_define_feature_option:nnnnn{VerticalPosition}{Denominator}{}  {} {+dnom}
-\@@_define_feature_option:nnnnn{VerticalPosition}{ScientificInferior}{}{}{+sinf}
-%    \end{macrocode}
-%
-% \subsubsection{Fractions}
-%    \begin{macrocode}
-\@@_define_font_feature:n{Fractions}
-\@@_define_feature_option:nnnnn{Fractions}{On}       {11}{1}{+frac}
-\@@_define_feature_option:nnnnn{Fractions}{Off}      {11}{0}{-frac}
-\@@_define_feature_option:nnnnn{Fractions}{Diagonal} {11}{2}{}
-\@@_define_feature_option:nnnnn{Fractions}{Alternate}{}  {} {+afrc}
-%    \end{macrocode}
-%
-% \subsubsection{Alternates and variants}
-% Selected numerically because they don't have standard names. Very
-% easy to process, very annoying for the user!
-%
-%    \begin{macrocode}
-\@@_define_font_feature:n { Alternate }
-\keys_define:nn {fontspec}
- {
-  Alternate .default:n = {0} ,
-  Alternate / unknown .code:n =
-   {
-    \clist_map_inline:nn {#1}
-      { \fontspec_make_feature:nnx {17}{##1} { \fontspec_salt:n {##1} } }
-   }
- }
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\cs_set:Nn \fontspec_salt:n { +salt = #1 }
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\@@_define_font_feature:n {Variant}
-\keys_define:nn {fontspec}
- {
-  Variant .default:n = {0} ,
-  Variant / unknown .code:n =
-   {
-    \clist_map_inline:nn {#1}
-      { \fontspec_make_feature:nnx {18}{##1} { +ss \two@digits {##1} } }
-   }
- }
-\aliasfontfeature{Variant}{StylisticSet}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\@@_define_font_feature:n { CharacterVariant }
-\use:x
- {
-  \cs_new:Npn \exp_not:N \fontspec_parse_cv:w
-      ##1 \c_colon_str ##2 \c_colon_str ##3 \exp_not:N \q_nil
-   {
-     \fontspec_make_numbered_feature:xn
-       { +cv \exp_not:N \two@digits {##1} } {##2}
-   }
-  \keys_define:nn {fontspec}
-   {
-    CharacterVariant / unknown .code:n =
-     {
-      \clist_map_inline:nn {##1}
-       {
-        \exp_not:N \fontspec_parse_cv:w
-          ####1 \c_colon_str 0 \c_colon_str \exp_not:N \q_nil
-       }
-     }
-   }
- }
-%    \end{macrocode}
-% Possibilities: \verb|a:0:\q_nil| or \verb|a:b:0:\q_nil|.
-%
-%
-%
-% \subsubsection{Style}
-%    \begin{macrocode}
-\@@_define_font_feature:n{Style}
-\@@_define_feature_option:nnnnn{Style}{Alternate}     {}  {} {+salt}
-\@@_define_feature_option:nnnnn{Style}{Italic}        {32}{2}{+ital}
-\@@_define_feature_option:nnnnn{Style}{Ruby}          {28}{2}{+ruby}
-\@@_define_feature_option:nnnnn{Style}{Swash}         {}  {} {+swsh}
-\@@_define_feature_option:nnnnn{Style}{Historic}      {}  {} {+hist}
-\@@_define_feature_option:nnnnn{Style}{Display}       {19}{1}{}
-\@@_define_feature_option:nnnnn{Style}{Engraved}      {19}{2}{}
-\@@_define_feature_option:nnnnn{Style}{TitlingCaps}   {19}{4}{+titl}
-\@@_define_feature_option:nnnnn{Style}{TallCaps}      {19}{5}{}
-\@@_define_feature_option:nnnnn{Style}{HorizontalKana}{}  {} {+hkna}
-\@@_define_feature_option:nnnnn{Style}{VerticalKana}  {}  {} {+vkna}
-\fontspec_define_numbered_feat:nnnn {Style} {MathScript}       {+ssty} {0}
-\fontspec_define_numbered_feat:nnnn {Style} {MathScriptScript} {+ssty} {1}
-%    \end{macrocode}
-%
-% \subsubsection{CJK shape}
-%    \begin{macrocode}
-\@@_define_font_feature:n{CJKShape}
-\@@_define_feature_option:nnnnn{CJKShape}{Traditional}{20}{0} {+trad}
-\@@_define_feature_option:nnnnn{CJKShape}{Simplified} {20}{1} {+smpl}
-\@@_define_feature_option:nnnnn{CJKShape}{JIS1978}    {20}{2} {+jp78}
-\@@_define_feature_option:nnnnn{CJKShape}{JIS1983}    {20}{3} {+jp83}
-\@@_define_feature_option:nnnnn{CJKShape}{JIS1990}    {20}{4} {+jp90}
-\@@_define_feature_option:nnnnn{CJKShape}{Expert}     {20}{10}{+expt}
-\@@_define_feature_option:nnnnn{CJKShape}{NLC}        {20}{13}{+nlck}
-%    \end{macrocode}
-%
-% \subsubsection{Character width}
-%    \begin{macrocode}
-\@@_define_font_feature:n{CharacterWidth}
-\@@_define_feature_option:nnnnn{CharacterWidth}{Proportional}{22}{0}{+pwid}
-\@@_define_feature_option:nnnnn{CharacterWidth}{Full}{22}{1}{+fwid}
-\@@_define_feature_option:nnnnn{CharacterWidth}{Half}{22}{2}{+hwid}
-\@@_define_feature_option:nnnnn{CharacterWidth}{Third}{22}{3}{+twid}
-\@@_define_feature_option:nnnnn{CharacterWidth}{Quarter}{22}{4}{+qwid}
-\@@_define_feature_option:nnnnn{CharacterWidth}{AlternateProportional}{22}{5}{+palt}
-\@@_define_feature_option:nnnnn{CharacterWidth}{AlternateHalf}{22}{6}{+halt}
-\@@_define_feature_option:nnnnn{CharacterWidth}{Default}{22}{7}{}
-%    \end{macrocode}
-%
-% \subsubsection{Annotation}
-%    \begin{macrocode}
-\@@_define_feature_option:nnnnn{Annotation}{Off}{24}{0}{}
-\@@_define_feature_option:nnnnn{Annotation}{Box}{24}{1}{}
-\@@_define_feature_option:nnnnn{Annotation}{RoundedBox}{24}{2}{}
-\@@_define_feature_option:nnnnn{Annotation}{Circle}{24}{3}{}
-\@@_define_feature_option:nnnnn{Annotation}{BlackCircle}{24}{4}{}
-\@@_define_feature_option:nnnnn{Annotation}{Parenthesis}{24}{5}{}
-\@@_define_feature_option:nnnnn{Annotation}{Period}{24}{6}{}
-\@@_define_feature_option:nnnnn{Annotation}{RomanNumerals}{24}{7}{}
-\@@_define_feature_option:nnnnn{Annotation}{Diamond}{24}{8}{}
-\@@_define_feature_option:nnnnn{Annotation}{BlackSquare}{24}{9}{}
-\@@_define_feature_option:nnnnn{Annotation}{BlackRoundSquare}{24}{10}{}
-\@@_define_feature_option:nnnnn{Annotation}{DoubleCircle}{24}{11}{}
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\@@_define_font_feature:n { Annotation }
-\keys_define:nn {fontspec}
- {
-  Annotation .default:n = {0} ,
-  Annotation / unknown .code:n =
-   {
-    \fontspec_make_feature:nnx {}{}{ +nalt=#1 }
-   }
- }
-%    \end{macrocode}
-%
-%
-% \subsubsection{Vertical}
-%    \begin{macrocode}
-\keys_define:nn {fontspec}
- {
-  Vertical .choice: ,
-  Vertical / RotatedGlyphs .code:n =
-   {
-    \bool_if:NTF \l_@@_ot_bool
-     {
-      \fontspec_make_feature:nnn{}{}{+vrt2}
-      \@@_update_featstr:n {vertical}
-     }
-     {
-      \@@_update_featstr:n {vertical}
-     }
-   }
- }
-%    \end{macrocode}
-%
-% \subsubsection{Script}
-%
-%    \begin{macrocode}
-\keys_define:nn { fontspec } { Script .choice: }
-\cs_new:Nn \fontspec_new_script:nn
- {
-  \keys_define:nn { fontspec } { Script / #1 .code:n =
-    \clist_map_inline:nn {#2}
-     {
-      \fontspec_check_script:nTF {####1}
-       {
-        \tl_set:Nn \l_fontspec_script_tl {####1}
-        \int_set:Nn \l_fontspec_script_int {\l_fontspec_strnum_int}
-        \clist_map_break:
-       }
-       {
-        \fontspec_check_script:nTF {latn}
-         {
-          \@@_warning:nx {script-not-exist-latn} {#1}
-          \keys_set:nn {fontspec} {Script=Latin}
-         }
-         {
-          \@@_warning:nx {script-not-exist} {#1}
-         }
-       }
-     }
-   }
- }
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\newfontscript{Arabic}{arab}            \newfontscript{Armenian}{armn}
-\newfontscript{Balinese}{bali}
-\newfontscript{Bengali}{bng2,beng}
-\newfontscript{Bopomofo}{bopo}          \newfontscript{Braille}{brai}
-\newfontscript{Buginese}{bugi}          \newfontscript{Buhid}{buhd}
-\newfontscript{Byzantine~Music}{byzm}
-\newfontscript{Canadian~Syllabics}{cans}
-\newfontscript{Cherokee}{cher}
-\newfontscript{CJK~Ideographic}{hani}   \newfontscript{Coptic}{copt}
-\newfontscript{Cypriot~Syllabary}{cprt} \newfontscript{Cyrillic}{cyrl}
-\newfontscript{Default}{DFLT}           \newfontscript{Deseret}{dsrt}
-\newfontscript{Devanagari}{dev2,deva}
-\newfontscript{Ethiopic}{ethi}
-\newfontscript{Georgian}{geor}          \newfontscript{Glagolitic}{glag}
-\newfontscript{Gothic}{goth}            \newfontscript{Greek}{grek}
-\newfontscript{Gujarati}{gjr2,gujr}
-\newfontscript{Gurmukhi}{gur2,guru}
-\newfontscript{Hangul~Jamo}{jamo}       \newfontscript{Hangul}{hang}
-\newfontscript{Hanunoo}{hano}           \newfontscript{Hebrew}{hebr}
-\newfontscript{Hiragana~and~Katakana}{kana}
-\newfontscript{Javanese}{java}
-\newfontscript{Kannada}{knd2,knda}
-\newfontscript{Kharosthi}{khar}         \newfontscript{Khmer}{khmr}
-\newfontscript{Lao}{lao~}               \newfontscript{Latin}{latn}
-\newfontscript{Limbu}{limb}             \newfontscript{Linear~B}{linb}
-\newfontscript{Malayalam}{mlm2,mlym}
-\newfontscript{Math}{math}
-\newfontscript{Mongolian}{mong}
-\newfontscript{Musical~Symbols}{musc}   \newfontscript{Myanmar}{mymr}
-\newfontscript{N'ko}{nko~}              \newfontscript{Ogham}{ogam}
-\newfontscript{Old~Italic}{ital}
-\newfontscript{Old~Persian~Cuneiform}{xpeo}
-\newfontscript{Oriya}{ory2,orya}
-\newfontscript{Osmanya}{osma}
-\newfontscript{Phags-pa}{phag}          \newfontscript{Phoenician}{phnx}
-\newfontscript{Runic}{runr}             \newfontscript{Shavian}{shaw}
-\newfontscript{Sinhala}{sinh}
-\newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
-\newfontscript{Syloti~Nagri}{sylo}      \newfontscript{Syriac}{syrc}
-\newfontscript{Tagalog}{tglg}           \newfontscript{Tagbanwa}{tagb}
-\newfontscript{Tai~Le}{tale}            \newfontscript{Tai~Lu}{talu}
-\newfontscript{Tamil}{tml2,taml}
-\newfontscript{Telugu}{tel2,telu}
-\newfontscript{Thaana}{thaa}            \newfontscript{Thai}{thai}
-\newfontscript{Tibetan}{tibt}           \newfontscript{Tifinagh}{tfng}
-\newfontscript{Ugaritic~Cuneiform}{ugar}\newfontscript{Yi}{yi~~}
-%    \end{macrocode}
-% For convenience:
-%    \begin{macrocode}
-\newfontscript{Kana}{kana}
-\newfontscript{Maths}{math}
-\newfontscript{CJK}{hani}
-%    \end{macrocode}
-%
-% \subsubsection{Language}
-%
-%    \begin{macrocode}
-\keys_define:nn { fontspec } { Language .choice: }
-\cs_new:Nn \fontspec_new_lang:nn
- {
-  \keys_define:nn { fontspec } { Language / #1 .code:n =
-    \fontspec_check_lang:nTF {#2}
-     {
-      \tl_set:Nn \l_fontspec_lang_tl {#2}
-      \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-     }
-     {
-      \@@_warning:nx {language-not-exist} {#1}
-      \keys_set:nn { fontspec } { Language = Default }
-     }
-  }
- }
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-\newfontlanguage{Abaza}{ABA}\newfontlanguage{Abkhazian}{ABK}
-\newfontlanguage{Adyghe}{ADY}\newfontlanguage{Afrikaans}{AFK}
-\newfontlanguage{Afar}{AFR}\newfontlanguage{Agaw}{AGW}
-\newfontlanguage{Altai}{ALT}\newfontlanguage{Amharic}{AMH}
-\newfontlanguage{Arabic}{ARA}\newfontlanguage{Aari}{ARI}
-\newfontlanguage{Arakanese}{ARK}\newfontlanguage{Assamese}{ASM}
-\newfontlanguage{Athapaskan}{ATH}\newfontlanguage{Avar}{AVR}
-\newfontlanguage{Awadhi}{AWA}\newfontlanguage{Aymara}{AYM}
-\newfontlanguage{Azeri}{AZE}\newfontlanguage{Badaga}{BAD}
-\newfontlanguage{Baghelkhandi}{BAG}\newfontlanguage{Balkar}{BAL}
-\newfontlanguage{Baule}{BAU}\newfontlanguage{Berber}{BBR}
-\newfontlanguage{Bench}{BCH}\newfontlanguage{Bible~Cree}{BCR}
-\newfontlanguage{Belarussian}{BEL}\newfontlanguage{Bemba}{BEM}
-\newfontlanguage{Bengali}{BEN}\newfontlanguage{Bulgarian}{BGR}
-\newfontlanguage{Bhili}{BHI}\newfontlanguage{Bhojpuri}{BHO}
-\newfontlanguage{Bikol}{BIK}\newfontlanguage{Bilen}{BIL}
-\newfontlanguage{Blackfoot}{BKF}\newfontlanguage{Balochi}{BLI}
-\newfontlanguage{Balante}{BLN}\newfontlanguage{Balti}{BLT}
-\newfontlanguage{Bambara}{BMB}\newfontlanguage{Bamileke}{BML}
-\newfontlanguage{Breton}{BRE}\newfontlanguage{Brahui}{BRH}
-\newfontlanguage{Braj~Bhasha}{BRI}\newfontlanguage{Burmese}{BRM}
-\newfontlanguage{Bashkir}{BSH}\newfontlanguage{Beti}{BTI}
-\newfontlanguage{Catalan}{CAT}\newfontlanguage{Cebuano}{CEB}
-\newfontlanguage{Chechen}{CHE}\newfontlanguage{Chaha~Gurage}{CHG}
-\newfontlanguage{Chattisgarhi}{CHH}\newfontlanguage{Chichewa}{CHI}
-\newfontlanguage{Chukchi}{CHK}\newfontlanguage{Chipewyan}{CHP}
-\newfontlanguage{Cherokee}{CHR}\newfontlanguage{Chuvash}{CHU}
-\newfontlanguage{Comorian}{CMR}\newfontlanguage{Coptic}{COP}
-\newfontlanguage{Cree}{CRE}\newfontlanguage{Carrier}{CRR}
-\newfontlanguage{Crimean~Tatar}{CRT}\newfontlanguage{Church~Slavonic}{CSL}
-\newfontlanguage{Czech}{CSY}\newfontlanguage{Danish}{DAN}
-\newfontlanguage{Dargwa}{DAR}\newfontlanguage{Woods~Cree}{DCR}
-\newfontlanguage{German}{DEU}
-\newfontlanguage{Dogri}{DGR}\newfontlanguage{Divehi}{DIV}
-\newfontlanguage{Djerma}{DJR}\newfontlanguage{Dangme}{DNG}
-\newfontlanguage{Dinka}{DNK}\newfontlanguage{Dungan}{DUN}
-\newfontlanguage{Dzongkha}{DZN}\newfontlanguage{Ebira}{EBI}
-\newfontlanguage{Eastern~Cree}{ECR}\newfontlanguage{Edo}{EDO}
-\newfontlanguage{Efik}{EFI}\newfontlanguage{Greek}{ELL}
-\newfontlanguage{English}{ENG}\newfontlanguage{Erzya}{ERZ}
-\newfontlanguage{Spanish}{ESP}\newfontlanguage{Estonian}{ETI}
-\newfontlanguage{Basque}{EUQ}\newfontlanguage{Evenki}{EVK}
-\newfontlanguage{Even}{EVN}\newfontlanguage{Ewe}{EWE}
-\newfontlanguage{French~Antillean}{FAN}
-\newfontlanguage{Farsi}{FAR}
-\newfontlanguage{Parsi}{FAR}
-\newfontlanguage{Persian}{FAR}
-\newfontlanguage{Finnish}{FIN}\newfontlanguage{Fijian}{FJI}
-\newfontlanguage{Flemish}{FLE}\newfontlanguage{Forest~Nenets}{FNE}
-\newfontlanguage{Fon}{FON}\newfontlanguage{Faroese}{FOS}
-\newfontlanguage{French}{FRA}\newfontlanguage{Frisian}{FRI}
-\newfontlanguage{Friulian}{FRL}\newfontlanguage{Futa}{FTA}
-\newfontlanguage{Fulani}{FUL}\newfontlanguage{Ga}{GAD}
-\newfontlanguage{Gaelic}{GAE}\newfontlanguage{Gagauz}{GAG}
-\newfontlanguage{Galician}{GAL}\newfontlanguage{Garshuni}{GAR}
-\newfontlanguage{Garhwali}{GAW}\newfontlanguage{Ge'ez}{GEZ}
-\newfontlanguage{Gilyak}{GIL}\newfontlanguage{Gumuz}{GMZ}
-\newfontlanguage{Gondi}{GON}\newfontlanguage{Greenlandic}{GRN}
-\newfontlanguage{Garo}{GRO}\newfontlanguage{Guarani}{GUA}
-\newfontlanguage{Gujarati}{GUJ}\newfontlanguage{Haitian}{HAI}
-\newfontlanguage{Halam}{HAL}\newfontlanguage{Harauti}{HAR}
-\newfontlanguage{Hausa}{HAU}\newfontlanguage{Hawaiin}{HAW}
-\newfontlanguage{Hammer-Banna}{HBN}\newfontlanguage{Hiligaynon}{HIL}
-\newfontlanguage{Hindi}{HIN}\newfontlanguage{High~Mari}{HMA}
-\newfontlanguage{Hindko}{HND}\newfontlanguage{Ho}{HO}
-\newfontlanguage{Harari}{HRI}\newfontlanguage{Croatian}{HRV}
-\newfontlanguage{Hungarian}{HUN}\newfontlanguage{Armenian}{HYE}
-\newfontlanguage{Igbo}{IBO}\newfontlanguage{Ijo}{IJO}
-\newfontlanguage{Ilokano}{ILO}\newfontlanguage{Indonesian}{IND}
-\newfontlanguage{Ingush}{ING}\newfontlanguage{Inuktitut}{INU}
-\newfontlanguage{Irish}{IRI}\newfontlanguage{Irish~Traditional}{IRT}
-\newfontlanguage{Icelandic}{ISL}\newfontlanguage{Inari~Sami}{ISM}
-\newfontlanguage{Italian}{ITA}\newfontlanguage{Hebrew}{IWR}
-\newfontlanguage{Javanese}{JAV}\newfontlanguage{Yiddish}{JII}
-\newfontlanguage{Japanese}{JAN}\newfontlanguage{Judezmo}{JUD}
-\newfontlanguage{Jula}{JUL}\newfontlanguage{Kabardian}{KAB}
-\newfontlanguage{Kachchi}{KAC}\newfontlanguage{Kalenjin}{KAL}
-\newfontlanguage{Kannada}{KAN}\newfontlanguage{Karachay}{KAR}
-\newfontlanguage{Georgian}{KAT}\newfontlanguage{Kazakh}{KAZ}
-\newfontlanguage{Kebena}{KEB}\newfontlanguage{Khutsuri~Georgian}{KGE}
-\newfontlanguage{Khakass}{KHA}\newfontlanguage{Khanty-Kazim}{KHK}
-\newfontlanguage{Khmer}{KHM}\newfontlanguage{Khanty-Shurishkar}{KHS}
-\newfontlanguage{Khanty-Vakhi}{KHV}\newfontlanguage{Khowar}{KHW}
-\newfontlanguage{Kikuyu}{KIK}\newfontlanguage{Kirghiz}{KIR}
-\newfontlanguage{Kisii}{KIS}\newfontlanguage{Kokni}{KKN}
-\newfontlanguage{Kalmyk}{KLM}\newfontlanguage{Kamba}{KMB}
-\newfontlanguage{Kumaoni}{KMN}\newfontlanguage{Komo}{KMO}
-\newfontlanguage{Komso}{KMS}\newfontlanguage{Kanuri}{KNR}
-\newfontlanguage{Kodagu}{KOD}\newfontlanguage{Korean~Old~Hangul}{KOH}
-\newfontlanguage{Konkani}{KOK}\newfontlanguage{Kikongo}{KON}
-\newfontlanguage{Komi-Permyak}{KOP}\newfontlanguage{Korean}{KOR}
-\newfontlanguage{Komi-Zyrian}{KOZ}\newfontlanguage{Kpelle}{KPL}
-\newfontlanguage{Krio}{KRI}\newfontlanguage{Karakalpak}{KRK}
-\newfontlanguage{Karelian}{KRL}\newfontlanguage{Karaim}{KRM}
-\newfontlanguage{Karen}{KRN}\newfontlanguage{Koorete}{KRT}
-\newfontlanguage{Kashmiri}{KSH}\newfontlanguage{Khasi}{KSI}
-\newfontlanguage{Kildin~Sami}{KSM}\newfontlanguage{Kui}{KUI}
-\newfontlanguage{Kulvi}{KUL}\newfontlanguage{Kumyk}{KUM}
-\newfontlanguage{Kurdish}{KUR}\newfontlanguage{Kurukh}{KUU}
-\newfontlanguage{Kuy}{KUY}\newfontlanguage{Koryak}{KYK}
-\newfontlanguage{Ladin}{LAD}\newfontlanguage{Lahuli}{LAH}
-\newfontlanguage{Lak}{LAK}\newfontlanguage{Lambani}{LAM}
-\newfontlanguage{Lao}{LAO}\newfontlanguage{Latin}{LAT}
-\newfontlanguage{Laz}{LAZ}\newfontlanguage{L-Cree}{LCR}
-\newfontlanguage{Ladakhi}{LDK}\newfontlanguage{Lezgi}{LEZ}
-\newfontlanguage{Lingala}{LIN}\newfontlanguage{Low~Mari}{LMA}
-\newfontlanguage{Limbu}{LMB}\newfontlanguage{Lomwe}{LMW}
-\newfontlanguage{Lower~Sorbian}{LSB}\newfontlanguage{Lule~Sami}{LSM}
-\newfontlanguage{Lithuanian}{LTH}\newfontlanguage{Luba}{LUB}
-\newfontlanguage{Luganda}{LUG}\newfontlanguage{Luhya}{LUH}
-\newfontlanguage{Luo}{LUO}\newfontlanguage{Latvian}{LVI}
-\newfontlanguage{Majang}{MAJ}\newfontlanguage{Makua}{MAK}
-\newfontlanguage{Malayalam~Traditional}{MAL}\newfontlanguage{Mansi}{MAN}
-\newfontlanguage{Marathi}{MAR}\newfontlanguage{Marwari}{MAW}
-\newfontlanguage{Mbundu}{MBN}\newfontlanguage{Manchu}{MCH}
-\newfontlanguage{Moose~Cree}{MCR}\newfontlanguage{Mende}{MDE}
-\newfontlanguage{Me'en}{MEN}\newfontlanguage{Mizo}{MIZ}
-\newfontlanguage{Macedonian}{MKD}\newfontlanguage{Male}{MLE}
-\newfontlanguage{Malagasy}{MLG}\newfontlanguage{Malinke}{MLN}
-\newfontlanguage{Malayalam~Reformed}{MLR}\newfontlanguage{Malay}{MLY}
-\newfontlanguage{Mandinka}{MND}\newfontlanguage{Mongolian}{MNG}
-\newfontlanguage{Manipuri}{MNI}\newfontlanguage{Maninka}{MNK}
-\newfontlanguage{Manx~Gaelic}{MNX}\newfontlanguage{Moksha}{MOK}
-\newfontlanguage{Moldavian}{MOL}\newfontlanguage{Mon}{MON}
-\newfontlanguage{Moroccan}{MOR}\newfontlanguage{Maori}{MRI}
-\newfontlanguage{Maithili}{MTH}\newfontlanguage{Maltese}{MTS}
-\newfontlanguage{Mundari}{MUN}\newfontlanguage{Naga-Assamese}{NAG}
-\newfontlanguage{Nanai}{NAN}\newfontlanguage{Naskapi}{NAS}
-\newfontlanguage{N-Cree}{NCR}\newfontlanguage{Ndebele}{NDB}
-\newfontlanguage{Ndonga}{NDG}\newfontlanguage{Nepali}{NEP}
-\newfontlanguage{Newari}{NEW}\newfontlanguage{Nagari}{NGR}
-\newfontlanguage{Norway~House~Cree}{NHC}\newfontlanguage{Nisi}{NIS}
-\newfontlanguage{Niuean}{NIU}\newfontlanguage{Nkole}{NKL}
-\newfontlanguage{N'ko}{NKO}\newfontlanguage{Dutch}{NLD}
-\newfontlanguage{Nogai}{NOG}\newfontlanguage{Norwegian}{NOR}
-\newfontlanguage{Northern~Sami}{NSM}\newfontlanguage{Northern~Tai}{NTA}
-\newfontlanguage{Esperanto}{NTO}\newfontlanguage{Nynorsk}{NYN}
-\newfontlanguage{Oji-Cree}{OCR}\newfontlanguage{Ojibway}{OJB}
-\newfontlanguage{Oriya}{ORI}\newfontlanguage{Oromo}{ORO}
-\newfontlanguage{Ossetian}{OSS}\newfontlanguage{Palestinian~Aramaic}{PAA}
-\newfontlanguage{Pali}{PAL}\newfontlanguage{Punjabi}{PAN}
-\newfontlanguage{Palpa}{PAP}\newfontlanguage{Pashto}{PAS}
-\newfontlanguage{Polytonic~Greek}{PGR}\newfontlanguage{Pilipino}{PIL}
-\newfontlanguage{Palaung}{PLG}\newfontlanguage{Polish}{PLK}
-\newfontlanguage{Provencal}{PRO}\newfontlanguage{Portuguese}{PTG}
-\newfontlanguage{Chin}{QIN}\newfontlanguage{Rajasthani}{RAJ}
-\newfontlanguage{R-Cree}{RCR}\newfontlanguage{Russian~Buriat}{RBU}
-\newfontlanguage{Riang}{RIA}\newfontlanguage{Rhaeto-Romanic}{RMS}
-\newfontlanguage{Romanian}{ROM}\newfontlanguage{Romany}{ROY}
-\newfontlanguage{Rusyn}{RSY}\newfontlanguage{Ruanda}{RUA}
-\newfontlanguage{Russian}{RUS}\newfontlanguage{Sadri}{SAD}
-\newfontlanguage{Sanskrit}{SAN}\newfontlanguage{Santali}{SAT}
-\newfontlanguage{Sayisi}{SAY}\newfontlanguage{Sekota}{SEK}
-\newfontlanguage{Selkup}{SEL}\newfontlanguage{Sango}{SGO}
-\newfontlanguage{Shan}{SHN}\newfontlanguage{Sibe}{SIB}
-\newfontlanguage{Sidamo}{SID}\newfontlanguage{Silte~Gurage}{SIG}
-\newfontlanguage{Skolt~Sami}{SKS}\newfontlanguage{Slovak}{SKY}
-\newfontlanguage{Slavey}{SLA}\newfontlanguage{Slovenian}{SLV}
-\newfontlanguage{Somali}{SML}\newfontlanguage{Samoan}{SMO}
-\newfontlanguage{Sena}{SNA}\newfontlanguage{Sindhi}{SND}
-\newfontlanguage{Sinhalese}{SNH}\newfontlanguage{Soninke}{SNK}
-\newfontlanguage{Sodo~Gurage}{SOG}\newfontlanguage{Sotho}{SOT}
-\newfontlanguage{Albanian}{SQI}\newfontlanguage{Serbian}{SRB}
-\newfontlanguage{Saraiki}{SRK}\newfontlanguage{Serer}{SRR}
-\newfontlanguage{South~Slavey}{SSL}\newfontlanguage{Southern~Sami}{SSM}
-\newfontlanguage{Suri}{SUR}\newfontlanguage{Svan}{SVA}
-\newfontlanguage{Swedish}{SVE}\newfontlanguage{Swadaya~Aramaic}{SWA}
-\newfontlanguage{Swahili}{SWK}\newfontlanguage{Swazi}{SWZ}
-\newfontlanguage{Sutu}{SXT}\newfontlanguage{Syriac}{SYR}
-\newfontlanguage{Tabasaran}{TAB}\newfontlanguage{Tajiki}{TAJ}
-\newfontlanguage{Tamil}{TAM}\newfontlanguage{Tatar}{TAT}
-\newfontlanguage{TH-Cree}{TCR}\newfontlanguage{Telugu}{TEL}
-\newfontlanguage{Tongan}{TGN}\newfontlanguage{Tigre}{TGR}
-\newfontlanguage{Tigrinya}{TGY}\newfontlanguage{Thai}{THA}
-\newfontlanguage{Tahitian}{THT}\newfontlanguage{Tibetan}{TIB}
-\newfontlanguage{Turkmen}{TKM}\newfontlanguage{Temne}{TMN}
-\newfontlanguage{Tswana}{TNA}\newfontlanguage{Tundra~Nenets}{TNE}
-\newfontlanguage{Tonga}{TNG}\newfontlanguage{Todo}{TOD}
-\newfontlanguage{Tsonga}{TSG}\newfontlanguage{Turoyo~Aramaic}{TUA}
-\newfontlanguage{Tulu}{TUL}\newfontlanguage{Tuvin}{TUV}
-\newfontlanguage{Twi}{TWI}\newfontlanguage{Udmurt}{UDM}
-\newfontlanguage{Ukrainian}{UKR}\newfontlanguage{Urdu}{URD}
-\newfontlanguage{Upper~Sorbian}{USB}\newfontlanguage{Uyghur}{UYG}
-\newfontlanguage{Uzbek}{UZB}\newfontlanguage{Venda}{VEN}
-\newfontlanguage{Vietnamese}{VIT}\newfontlanguage{Wa}{WA}
-\newfontlanguage{Wagdi}{WAG}\newfontlanguage{West-Cree}{WCR}
-\newfontlanguage{Welsh}{WEL}\newfontlanguage{Wolof}{WLF}
-\newfontlanguage{Tai~Lue}{XBD}\newfontlanguage{Xhosa}{XHS}
-\newfontlanguage{Yakut}{YAK}\newfontlanguage{Yoruba}{YBA}
-\newfontlanguage{Y-Cree}{YCR}\newfontlanguage{Yi~Classic}{YIC}
-\newfontlanguage{Yi~Modern}{YIM}\newfontlanguage{Chinese~Hong~Kong}{ZHH}
-\newfontlanguage{Chinese~Phonetic}{ZHP}
-\newfontlanguage{Chinese~Simplified}{ZHS}
-\newfontlanguage{Chinese~Traditional}{ZHT}\newfontlanguage{Zande}{ZND}
-\newfontlanguage{Zulu}{ZUL}
-%    \end{macrocode}
-%
-% \paragraph{Turkish} Turns out that many fonts use `TUR' as their Turkish language tag rather than the specified `TRK'. So we check for both:
-%    \begin{macrocode}
-\keys_define:nn {fontspec}
- {
-  Language / Turkish .code:n =
-   {
-    \fontspec_check_lang:nTF {TRK}
-     {
-      \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-      \tl_set:Nn \l_fontspec_lang_tl {TRK}
-     }
-     {
-      \fontspec_check_lang:nTF {TUR}
-       {
-        \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-        \tl_set:Nn \l_fontspec_lang_tl {TUR}
-       }
-       {
-        \@@_warning:nx {language-not-exist} {Turkish}
-        \keys_set:nn {fontspec} {Language=Default}
-       }
-     }
-   }
- }
-%    \end{macrocode}
-%
-% \paragraph{Default}
-%
-%    \begin{macrocode}
-\@@_keys_define_code:nnn {fontspec}{ Language / Default }
- {
-  \tl_set:Nn \l_fontspec_lang_tl {DFLT}
-  \int_zero:N \l_fontspec_language_int
- }
-%    \end{macrocode}
-%
 % \subsubsection{Raw feature string}
 % This allows savvy \XeTeX-ers to input font features manually if they have
 % already memorised the OpenType abbreviations and don't mind not having error checking.
@@ -1480,6 +811,9 @@
  }
 %    \end{macrocode}
 %
+%
+%
+%
 % \iffalse
 %    \begin{macrocode}
 %</fontspec&(xetexx|luatex)>
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-lang.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-lang.dtx
new file mode 100644
index 00000000000..b924a7312e3
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-lang.dtx
@@ -0,0 +1,399 @@
+
+% \subsection{Font language definitions}
+%
+% \iffalse
+%    \begin{macrocode}
+%<*fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
+%
+%    \begin{macrocode}
+\newfontlanguage{Abaza}{ABA}
+\newfontlanguage{Abkhazian}{ABK}
+\newfontlanguage{Adyghe}{ADY}
+\newfontlanguage{Afrikaans}{AFK}
+\newfontlanguage{Afar}{AFR}
+\newfontlanguage{Agaw}{AGW}
+\newfontlanguage{Altai}{ALT}
+\newfontlanguage{Amharic}{AMH}
+\newfontlanguage{Arabic}{ARA}
+\newfontlanguage{Aari}{ARI}
+\newfontlanguage{Arakanese}{ARK}
+\newfontlanguage{Assamese}{ASM}
+\newfontlanguage{Athapaskan}{ATH}
+\newfontlanguage{Avar}{AVR}
+\newfontlanguage{Awadhi}{AWA}
+\newfontlanguage{Aymara}{AYM}
+\newfontlanguage{Azeri}{AZE}
+\newfontlanguage{Badaga}{BAD}
+\newfontlanguage{Baghelkhandi}{BAG}
+\newfontlanguage{Balkar}{BAL}
+\newfontlanguage{Baule}{BAU}
+\newfontlanguage{Berber}{BBR}
+\newfontlanguage{Bench}{BCH}
+\newfontlanguage{Bible~Cree}{BCR}
+\newfontlanguage{Belarussian}{BEL}
+\newfontlanguage{Bemba}{BEM}
+\newfontlanguage{Bengali}{BEN}
+\newfontlanguage{Bulgarian}{BGR}
+\newfontlanguage{Bhili}{BHI}
+\newfontlanguage{Bhojpuri}{BHO}
+\newfontlanguage{Bikol}{BIK}
+\newfontlanguage{Bilen}{BIL}
+\newfontlanguage{Blackfoot}{BKF}
+\newfontlanguage{Balochi}{BLI}
+\newfontlanguage{Balante}{BLN}
+\newfontlanguage{Balti}{BLT}
+\newfontlanguage{Bambara}{BMB}
+\newfontlanguage{Bamileke}{BML}
+\newfontlanguage{Breton}{BRE}
+\newfontlanguage{Brahui}{BRH}
+\newfontlanguage{Braj~Bhasha}{BRI}
+\newfontlanguage{Burmese}{BRM}
+\newfontlanguage{Bashkir}{BSH}
+\newfontlanguage{Beti}{BTI}
+\newfontlanguage{Catalan}{CAT}
+\newfontlanguage{Cebuano}{CEB}
+\newfontlanguage{Chechen}{CHE}
+\newfontlanguage{Chaha~Gurage}{CHG}
+\newfontlanguage{Chattisgarhi}{CHH}
+\newfontlanguage{Chichewa}{CHI}
+\newfontlanguage{Chukchi}{CHK}
+\newfontlanguage{Chipewyan}{CHP}
+\newfontlanguage{Cherokee}{CHR}
+\newfontlanguage{Chuvash}{CHU}
+\newfontlanguage{Comorian}{CMR}
+\newfontlanguage{Coptic}{COP}
+\newfontlanguage{Cree}{CRE}
+\newfontlanguage{Carrier}{CRR}
+\newfontlanguage{Crimean~Tatar}{CRT}
+\newfontlanguage{Church~Slavonic}{CSL}
+\newfontlanguage{Czech}{CSY}
+\newfontlanguage{Danish}{DAN}
+\newfontlanguage{Dargwa}{DAR}
+\newfontlanguage{Woods~Cree}{DCR}
+\newfontlanguage{German}{DEU}
+\newfontlanguage{Dogri}{DGR}
+\newfontlanguage{Divehi}{DIV}
+\newfontlanguage{Djerma}{DJR}
+\newfontlanguage{Dangme}{DNG}
+\newfontlanguage{Dinka}{DNK}
+\newfontlanguage{Dungan}{DUN}
+\newfontlanguage{Dzongkha}{DZN}
+\newfontlanguage{Ebira}{EBI}
+\newfontlanguage{Eastern~Cree}{ECR}
+\newfontlanguage{Edo}{EDO}
+\newfontlanguage{Efik}{EFI}
+\newfontlanguage{Greek}{ELL}
+\newfontlanguage{English}{ENG}
+\newfontlanguage{Erzya}{ERZ}
+\newfontlanguage{Spanish}{ESP}
+\newfontlanguage{Estonian}{ETI}
+\newfontlanguage{Basque}{EUQ}
+\newfontlanguage{Evenki}{EVK}
+\newfontlanguage{Even}{EVN}
+\newfontlanguage{Ewe}{EWE}
+\newfontlanguage{French~Antillean}{FAN}
+\newfontlanguage{Farsi}{FAR}
+\newfontlanguage{Parsi}{FAR}
+\newfontlanguage{Persian}{FAR}
+\newfontlanguage{Finnish}{FIN}
+\newfontlanguage{Fijian}{FJI}
+\newfontlanguage{Flemish}{FLE}
+\newfontlanguage{Forest~Nenets}{FNE}
+\newfontlanguage{Fon}{FON}
+\newfontlanguage{Faroese}{FOS}
+\newfontlanguage{French}{FRA}
+\newfontlanguage{Frisian}{FRI}
+\newfontlanguage{Friulian}{FRL}
+\newfontlanguage{Futa}{FTA}
+\newfontlanguage{Fulani}{FUL}
+\newfontlanguage{Ga}{GAD}
+\newfontlanguage{Gaelic}{GAE}
+\newfontlanguage{Gagauz}{GAG}
+\newfontlanguage{Galician}{GAL}
+\newfontlanguage{Garshuni}{GAR}
+\newfontlanguage{Garhwali}{GAW}
+\newfontlanguage{Ge'ez}{GEZ}
+\newfontlanguage{Gilyak}{GIL}
+\newfontlanguage{Gumuz}{GMZ}
+\newfontlanguage{Gondi}{GON}
+\newfontlanguage{Greenlandic}{GRN}
+\newfontlanguage{Garo}{GRO}
+\newfontlanguage{Guarani}{GUA}
+\newfontlanguage{Gujarati}{GUJ}
+\newfontlanguage{Haitian}{HAI}
+\newfontlanguage{Halam}{HAL}
+\newfontlanguage{Harauti}{HAR}
+\newfontlanguage{Hausa}{HAU}
+\newfontlanguage{Hawaiin}{HAW}
+\newfontlanguage{Hammer-Banna}{HBN}
+\newfontlanguage{Hiligaynon}{HIL}
+\newfontlanguage{Hindi}{HIN}
+\newfontlanguage{High~Mari}{HMA}
+\newfontlanguage{Hindko}{HND}
+\newfontlanguage{Ho}{HO}
+\newfontlanguage{Harari}{HRI}
+\newfontlanguage{Croatian}{HRV}
+\newfontlanguage{Hungarian}{HUN}
+\newfontlanguage{Armenian}{HYE}
+\newfontlanguage{Igbo}{IBO}
+\newfontlanguage{Ijo}{IJO}
+\newfontlanguage{Ilokano}{ILO}
+\newfontlanguage{Indonesian}{IND}
+\newfontlanguage{Ingush}{ING}
+\newfontlanguage{Inuktitut}{INU}
+\newfontlanguage{Irish}{IRI}
+\newfontlanguage{Irish~Traditional}{IRT}
+\newfontlanguage{Icelandic}{ISL}
+\newfontlanguage{Inari~Sami}{ISM}
+\newfontlanguage{Italian}{ITA}
+\newfontlanguage{Hebrew}{IWR}
+\newfontlanguage{Javanese}{JAV}
+\newfontlanguage{Yiddish}{JII}
+\newfontlanguage{Japanese}{JAN}
+\newfontlanguage{Judezmo}{JUD}
+\newfontlanguage{Jula}{JUL}
+\newfontlanguage{Kabardian}{KAB}
+\newfontlanguage{Kachchi}{KAC}
+\newfontlanguage{Kalenjin}{KAL}
+\newfontlanguage{Kannada}{KAN}
+\newfontlanguage{Karachay}{KAR}
+\newfontlanguage{Georgian}{KAT}
+\newfontlanguage{Kazakh}{KAZ}
+\newfontlanguage{Kebena}{KEB}
+\newfontlanguage{Khutsuri~Georgian}{KGE}
+\newfontlanguage{Khakass}{KHA}
+\newfontlanguage{Khanty-Kazim}{KHK}
+\newfontlanguage{Khmer}{KHM}
+\newfontlanguage{Khanty-Shurishkar}{KHS}
+\newfontlanguage{Khanty-Vakhi}{KHV}
+\newfontlanguage{Khowar}{KHW}
+\newfontlanguage{Kikuyu}{KIK}
+\newfontlanguage{Kirghiz}{KIR}
+\newfontlanguage{Kisii}{KIS}
+\newfontlanguage{Kokni}{KKN}
+\newfontlanguage{Kalmyk}{KLM}
+\newfontlanguage{Kamba}{KMB}
+\newfontlanguage{Kumaoni}{KMN}
+\newfontlanguage{Komo}{KMO}
+\newfontlanguage{Komso}{KMS}
+\newfontlanguage{Kanuri}{KNR}
+\newfontlanguage{Kodagu}{KOD}
+\newfontlanguage{Korean~Old~Hangul}{KOH}
+\newfontlanguage{Konkani}{KOK}
+\newfontlanguage{Kikongo}{KON}
+\newfontlanguage{Komi-Permyak}{KOP}
+\newfontlanguage{Korean}{KOR}
+\newfontlanguage{Komi-Zyrian}{KOZ}
+\newfontlanguage{Kpelle}{KPL}
+\newfontlanguage{Krio}{KRI}
+\newfontlanguage{Karakalpak}{KRK}
+\newfontlanguage{Karelian}{KRL}
+\newfontlanguage{Karaim}{KRM}
+\newfontlanguage{Karen}{KRN}
+\newfontlanguage{Koorete}{KRT}
+\newfontlanguage{Kashmiri}{KSH}
+\newfontlanguage{Khasi}{KSI}
+\newfontlanguage{Kildin~Sami}{KSM}
+\newfontlanguage{Kui}{KUI}
+\newfontlanguage{Kulvi}{KUL}
+\newfontlanguage{Kumyk}{KUM}
+\newfontlanguage{Kurdish}{KUR}
+\newfontlanguage{Kurukh}{KUU}
+\newfontlanguage{Kuy}{KUY}
+\newfontlanguage{Koryak}{KYK}
+\newfontlanguage{Ladin}{LAD}
+\newfontlanguage{Lahuli}{LAH}
+\newfontlanguage{Lak}{LAK}
+\newfontlanguage{Lambani}{LAM}
+\newfontlanguage{Lao}{LAO}
+\newfontlanguage{Latin}{LAT}
+\newfontlanguage{Laz}{LAZ}
+\newfontlanguage{L-Cree}{LCR}
+\newfontlanguage{Ladakhi}{LDK}
+\newfontlanguage{Lezgi}{LEZ}
+\newfontlanguage{Lingala}{LIN}
+\newfontlanguage{Low~Mari}{LMA}
+\newfontlanguage{Limbu}{LMB}
+\newfontlanguage{Lomwe}{LMW}
+\newfontlanguage{Lower~Sorbian}{LSB}
+\newfontlanguage{Lule~Sami}{LSM}
+\newfontlanguage{Lithuanian}{LTH}
+\newfontlanguage{Luba}{LUB}
+\newfontlanguage{Luganda}{LUG}
+\newfontlanguage{Luhya}{LUH}
+\newfontlanguage{Luo}{LUO}
+\newfontlanguage{Latvian}{LVI}
+\newfontlanguage{Majang}{MAJ}
+\newfontlanguage{Makua}{MAK}
+\newfontlanguage{Malayalam~Traditional}{MAL}
+\newfontlanguage{Mansi}{MAN}
+\newfontlanguage{Marathi}{MAR}
+\newfontlanguage{Marwari}{MAW}
+\newfontlanguage{Mbundu}{MBN}
+\newfontlanguage{Manchu}{MCH}
+\newfontlanguage{Moose~Cree}{MCR}
+\newfontlanguage{Mende}{MDE}
+\newfontlanguage{Me'en}{MEN}
+\newfontlanguage{Mizo}{MIZ}
+\newfontlanguage{Macedonian}{MKD}
+\newfontlanguage{Male}{MLE}
+\newfontlanguage{Malagasy}{MLG}
+\newfontlanguage{Malinke}{MLN}
+\newfontlanguage{Malayalam~Reformed}{MLR}
+\newfontlanguage{Malay}{MLY}
+\newfontlanguage{Mandinka}{MND}
+\newfontlanguage{Mongolian}{MNG}
+\newfontlanguage{Manipuri}{MNI}
+\newfontlanguage{Maninka}{MNK}
+\newfontlanguage{Manx~Gaelic}{MNX}
+\newfontlanguage{Moksha}{MOK}
+\newfontlanguage{Moldavian}{MOL}
+\newfontlanguage{Mon}{MON}
+\newfontlanguage{Moroccan}{MOR}
+\newfontlanguage{Maori}{MRI}
+\newfontlanguage{Maithili}{MTH}
+\newfontlanguage{Maltese}{MTS}
+\newfontlanguage{Mundari}{MUN}
+\newfontlanguage{Naga-Assamese}{NAG}
+\newfontlanguage{Nanai}{NAN}
+\newfontlanguage{Naskapi}{NAS}
+\newfontlanguage{N-Cree}{NCR}
+\newfontlanguage{Ndebele}{NDB}
+\newfontlanguage{Ndonga}{NDG}
+\newfontlanguage{Nepali}{NEP}
+\newfontlanguage{Newari}{NEW}
+\newfontlanguage{Nagari}{NGR}
+\newfontlanguage{Norway~House~Cree}{NHC}
+\newfontlanguage{Nisi}{NIS}
+\newfontlanguage{Niuean}{NIU}
+\newfontlanguage{Nkole}{NKL}
+\newfontlanguage{N'ko}{NKO}
+\newfontlanguage{Dutch}{NLD}
+\newfontlanguage{Nogai}{NOG}
+\newfontlanguage{Norwegian}{NOR}
+\newfontlanguage{Northern~Sami}{NSM}
+\newfontlanguage{Northern~Tai}{NTA}
+\newfontlanguage{Esperanto}{NTO}
+\newfontlanguage{Nynorsk}{NYN}
+\newfontlanguage{Oji-Cree}{OCR}
+\newfontlanguage{Ojibway}{OJB}
+\newfontlanguage{Oriya}{ORI}
+\newfontlanguage{Oromo}{ORO}
+\newfontlanguage{Ossetian}{OSS}
+\newfontlanguage{Palestinian~Aramaic}{PAA}
+\newfontlanguage{Pali}{PAL}
+\newfontlanguage{Punjabi}{PAN}
+\newfontlanguage{Palpa}{PAP}
+\newfontlanguage{Pashto}{PAS}
+\newfontlanguage{Polytonic~Greek}{PGR}
+\newfontlanguage{Pilipino}{PIL}
+\newfontlanguage{Palaung}{PLG}
+\newfontlanguage{Polish}{PLK}
+\newfontlanguage{Provencal}{PRO}
+\newfontlanguage{Portuguese}{PTG}
+\newfontlanguage{Chin}{QIN}
+\newfontlanguage{Rajasthani}{RAJ}
+\newfontlanguage{R-Cree}{RCR}
+\newfontlanguage{Russian~Buriat}{RBU}
+\newfontlanguage{Riang}{RIA}
+\newfontlanguage{Rhaeto-Romanic}{RMS}
+\newfontlanguage{Romanian}{ROM}
+\newfontlanguage{Romany}{ROY}
+\newfontlanguage{Rusyn}{RSY}
+\newfontlanguage{Ruanda}{RUA}
+\newfontlanguage{Russian}{RUS}
+\newfontlanguage{Sadri}{SAD}
+\newfontlanguage{Sanskrit}{SAN}
+\newfontlanguage{Santali}{SAT}
+\newfontlanguage{Sayisi}{SAY}
+\newfontlanguage{Sekota}{SEK}
+\newfontlanguage{Selkup}{SEL}
+\newfontlanguage{Sango}{SGO}
+\newfontlanguage{Shan}{SHN}
+\newfontlanguage{Sibe}{SIB}
+\newfontlanguage{Sidamo}{SID}
+\newfontlanguage{Silte~Gurage}{SIG}
+\newfontlanguage{Skolt~Sami}{SKS}
+\newfontlanguage{Slovak}{SKY}
+\newfontlanguage{Slavey}{SLA}
+\newfontlanguage{Slovenian}{SLV}
+\newfontlanguage{Somali}{SML}
+\newfontlanguage{Samoan}{SMO}
+\newfontlanguage{Sena}{SNA}
+\newfontlanguage{Sindhi}{SND}
+\newfontlanguage{Sinhalese}{SNH}
+\newfontlanguage{Soninke}{SNK}
+\newfontlanguage{Sodo~Gurage}{SOG}
+\newfontlanguage{Sotho}{SOT}
+\newfontlanguage{Albanian}{SQI}
+\newfontlanguage{Serbian}{SRB}
+\newfontlanguage{Saraiki}{SRK}
+\newfontlanguage{Serer}{SRR}
+\newfontlanguage{South~Slavey}{SSL}
+\newfontlanguage{Southern~Sami}{SSM}
+\newfontlanguage{Suri}{SUR}
+\newfontlanguage{Svan}{SVA}
+\newfontlanguage{Swedish}{SVE}
+\newfontlanguage{Swadaya~Aramaic}{SWA}
+\newfontlanguage{Swahili}{SWK}
+\newfontlanguage{Swazi}{SWZ}
+\newfontlanguage{Sutu}{SXT}
+\newfontlanguage{Syriac}{SYR}
+\newfontlanguage{Tabasaran}{TAB}
+\newfontlanguage{Tajiki}{TAJ}
+\newfontlanguage{Tamil}{TAM}
+\newfontlanguage{Tatar}{TAT}
+\newfontlanguage{TH-Cree}{TCR}
+\newfontlanguage{Telugu}{TEL}
+\newfontlanguage{Tongan}{TGN}
+\newfontlanguage{Tigre}{TGR}
+\newfontlanguage{Tigrinya}{TGY}
+\newfontlanguage{Thai}{THA}
+\newfontlanguage{Tahitian}{THT}
+\newfontlanguage{Tibetan}{TIB}
+\newfontlanguage{Turkmen}{TKM}
+\newfontlanguage{Temne}{TMN}
+\newfontlanguage{Tswana}{TNA}
+\newfontlanguage{Tundra~Nenets}{TNE}
+\newfontlanguage{Tonga}{TNG}
+\newfontlanguage{Todo}{TOD}
+\newfontlanguage{Tsonga}{TSG}
+\newfontlanguage{Turoyo~Aramaic}{TUA}
+\newfontlanguage{Tulu}{TUL}
+\newfontlanguage{Tuvin}{TUV}
+\newfontlanguage{Twi}{TWI}
+\newfontlanguage{Udmurt}{UDM}
+\newfontlanguage{Ukrainian}{UKR}
+\newfontlanguage{Urdu}{URD}
+\newfontlanguage{Upper~Sorbian}{USB}
+\newfontlanguage{Uyghur}{UYG}
+\newfontlanguage{Uzbek}{UZB}
+\newfontlanguage{Venda}{VEN}
+\newfontlanguage{Vietnamese}{VIT}
+\newfontlanguage{Wa}{WA}
+\newfontlanguage{Wagdi}{WAG}
+\newfontlanguage{West-Cree}{WCR}
+\newfontlanguage{Welsh}{WEL}
+\newfontlanguage{Wolof}{WLF}
+\newfontlanguage{Tai~Lue}{XBD}
+\newfontlanguage{Xhosa}{XHS}
+\newfontlanguage{Yakut}{YAK}
+\newfontlanguage{Yoruba}{YBA}
+\newfontlanguage{Y-Cree}{YCR}
+\newfontlanguage{Yi~Classic}{YIC}
+\newfontlanguage{Yi~Modern}{YIM}
+\newfontlanguage{Chinese~Hong~Kong}{ZHH}
+\newfontlanguage{Chinese~Phonetic}{ZHP}
+\newfontlanguage{Chinese~Simplified}{ZHS}
+\newfontlanguage{Chinese~Traditional}{ZHT}
+\newfontlanguage{Zande}{ZND}
+\newfontlanguage{Zulu}{ZUL}
+%    \end{macrocode}
+%
+% \iffalse
+%    \begin{macrocode}
+%</fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx
index 74787a51ef9..20a2e97e070 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-lua.dtx
@@ -26,10 +26,20 @@ fontspec.warning = warn or (function (s) luatexbase.module_warning("fontspec", s
 fontspec.error   = err  or (function (s) luatexbase.module_error("fontspec", s)   end)
 %    \end{macrocode}
 %
+% We need a catcode table for tex.sprint(). See issue \#230.
+%    \begin{macrocode}
+local latex
+if luatexbase.registernumber then
+    latex = luatexbase.registernumber("catcodetable@latex")
+else
+    latex = luatexbase.catcodetables.CatcodeTableLaTeX
+end
+%    \end{macrocode}
+%
 % The following are the function that get called from \TeX\ end.
 %    \begin{macrocode}
-local function tempswatrue()  tex.sprint([[\FontspecSetCheckBoolTrue ]]) end
-local function tempswafalse() tex.sprint([[\FontspecSetCheckBoolFalse]]) end
+local function tempswatrue()  tex.sprint(latex,[[\FontspecSetCheckBoolTrue ]]) end
+local function tempswafalse() tex.sprint(latex,[[\FontspecSetCheckBoolFalse]]) end
 %    \end{macrocode}
 %
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx
index 0e2f712220f..69cde28a7e0 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-msg.dtx
@@ -2,12 +2,13 @@
 % \section{Error/warning/info messages}
 %
 %    \begin{macrocode}
-%<*msg>
+%<*fontspec>
 %    \end{macrocode}
 %
 % Shorthands for messages:
 %    \begin{macrocode}
 \cs_new:Npn \@@_error:n     { \msg_error:nn     {fontspec} }
+\cs_new:Npn \@@_error:nn    { \msg_error:nnn    {fontspec} }
 \cs_new:Npn \@@_error:nx    { \msg_error:nnx    {fontspec} }
 \cs_new:Npn \@@_warning:n   { \msg_warning:nn   {fontspec} }
 \cs_new:Npn \@@_warning:nx  { \msg_warning:nnx  {fontspec} }
@@ -18,203 +19,249 @@
 \cs_new:Npn \@@_trace:n     { \msg_trace:nn     {fontspec} }
 %    \end{macrocode}
 %
+% Allow messages to be written with spaces acting as normal:
+%    \begin{macrocode}
+\cs_generate_variant:Nn \msg_new:nnn  {nnx}
+\cs_generate_variant:Nn \msg_new:nnnn {nnxx}
+\cs_new:Nn \@@_msg_new:nnn
+  { \msg_new:nnx {#1} {#2} { \tl_trim_spaces:n {#3} } }
+\cs_new:Nn \@@_msg_new:nnnn
+  { \msg_new:nnxx {#1} {#2} { \tl_trim_spaces:n {#3} } { \tl_trim_spaces:n {#4} } }
+\char_set_catcode_space:n {32}
+%    \end{macrocode}
+%
 % \subsection{Errors}
 %
 %    \begin{macrocode}
-\msg_new:nnn {fontspec} {no-size-info}
+\@@_msg_new:nnn {fontspec} {only-inside-encdef}
+ {
+  \exp_not:N#1can only be used in the second argument
+  to \string\DeclareUnicodeEncoding.
+ }
+\@@_msg_new:nnn {fontspec} {only-import-tu}
  {
-  Size~ information~ must~ be~ supplied.\\
-  For~ example,~ SizeFeatures={Size={8-12},...}.
+  The "\string\ImportEncoding" command can only take "TU" as an argument at this stage.
  }
-\msg_new:nnnn {fontspec} {font-not-found}
+\@@_msg_new:nnn {fontspec} {no-size-info}
  {
-  The~ font~ "#1"~ cannot~ be~ found.
+  Size information must be supplied.\\
+  For example, SizeFeatures={Size={8-12},...}.
  }
+\@@_msg_new:nnnn {fontspec} {font-not-found}
  {
-  A~font~might~not~be~found~for~many~reasons.\\
-  Check~the~spelling,~where~the~font~is~installed~etc.~etc.\\\\
-  When~in~doubt,~ask~someone~for~help!
+  The font "#1" cannot be found.
  }
-\msg_new:nnnn {fontspec} {rename-feature-not-exist}
  {
-  The~ feature~ #1~ doesn't~ appear~ to~ be~ defined.
+  A font might not be found for many reasons.\\
+  Check the spelling, where the font is installed etc. etc.\\\\
+  When in doubt, ask someone for help!
  }
+\@@_msg_new:nnnn {fontspec} {rename-feature-not-exist}
  {
-  It~ looks~ like~ you're~ trying~ to~ rename~ a~ feature~ that~ doesn't~ exist.
+  The feature #1 doesn't appear to be defined.
  }
-\msg_new:nnn {fontspec} {no-glyph}
  {
-  '\l_fontspec_fontname_tl'~ does~ not~ contain~ glyph~ #1.
+  It looks like you're trying to rename a feature that doesn't exist.
  }
-\msg_new:nnnn {fontspec} {euler-too-late}
+\@@_msg_new:nnn {fontspec} {no-glyph}
  {
-  The~ euler~ package~ must~ be~ loaded~ BEFORE~ fontspec.
+  '\l_fontspec_fontname_tl' does not contain glyph #1.
  }
+\@@_msg_new:nnnn {fontspec} {euler-too-late}
  {
-  fontspec~ only~ overwrites~ euler's~ attempt~ to~
-  define~ the~ maths~ text~ fonts~ if~ fontspec~ is~
-  loaded~ after~ euler.~ Type~ <return>~ to~ proceed~
-  with~ incorrect~ \string\mathit,~ \string\mathbf,~ etc.
+  The euler package must be loaded BEFORE fontspec.
  }
-\msg_new:nnnn {fontspec} {no-xcolor}
  {
-  Cannot~ load~ named~ colours~ without~ the~ xcolor~ package.
+  fontspec only overwrites euler's attempt to
+  define the maths text fonts if fontspec is
+  loaded after euler. Type <return> to proceed
+  with incorrect \string\mathit, \string\mathbf, etc.
  }
+\@@_msg_new:nnnn {fontspec} {no-xcolor}
  {
-  Sorry,~ I~ can't~ do~ anything~ to~ help.~ Instead~ of~ loading~
-  the~ color~ package,~ use~ xcolor~ instead.~ It's~ better.
+  Cannot load named colours without the xcolor package.
  }
-\msg_new:nnnn {fontspec} {unknown-color-model}
  {
-  Error~ loading~ colour~ `#1';~ unknown~ colour~ model.
+  Sorry, I can't do anything to help. Instead of loading
+  the color package, use xcolor instead.
  }
+\@@_msg_new:nnnn {fontspec} {unknown-color-model}
  {
-  Sorry,~ I~ can't~ do~ anything~ to~ help.~ Please~ report~ this~ error~
-  to~ my~ developer~ with~ a~ minimal~ example~ that~ causes~ the~ problem.
+  Error loading colour `#1'; unknown colour model.
  }
-\msg_new:nnnn {fontspec} {not-in-addfontfeatures}
  {
-  The~ "#1"~ font~ feature~ cannot~ be~ used~ in~ \string\addfontfeatures.
+  Sorry, I can't do anything to help. Please report this error
+  to my developer with a minimal example that causes the problem.
  }
+\@@_msg_new:nnnn {fontspec} {not-in-addfontfeatures}
  {
-  This~ is~ due~ to~ how~ TeX~ loads~ fonts;~ such~ settings~
-  are~ global~ so~ adding~ them~ mid-document~ within~ a~ group~ causes~
-  confusion.~ You'll~ need~ to~ define~ multiple~ font~ families~ to~ achieve~
-  what~ you~ want.
+  The "#1" font feature cannot be used in \string\addfontfeatures.
+ }
+ {
+  This is due to how TeX loads fonts; such settings
+  are global so adding them mid-document within a group causes
+  confusion. You'll need to define multiple font families to achieve
+  what you want.
  }
 %    \end{macrocode}
 %
 % \subsection{Warnings}
 %
 %    \begin{macrocode}
-\msg_new:nnn {fontspec} {addfontfeatures-ignored}
+\@@_msg_new:nnn {fontspec} {tu-clash}
+ {
+  I have found the tuenc.def encoding definition file but the TU encoding is not
+  defined by the LaTeX2e kernel; attempting to correct but you really should update
+  to the latest version of LaTeX2e.
+ }
+\@@_msg_new:nnn {fontspec} {tu-missing}
+ {
+  The TU encoding seems to be missing; please update to the latest version of LaTeX2e.
+ }
+\@@_msg_new:nnn {fontspec} {addfontfeatures-ignored}
  {
-  \string\addfontfeature (s)~ ignored~ \msg_line_context:;~
-  it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ a~ fontspec~ command.\\
+  \string\addfontfeature (s) ignored \msg_line_context:;
+  it cannot be used with a font that wasn't selected by a fontspec command.\\
   \\
-  The~ current~ font~ is~ "\use:c{font@name}".\\
+  The current font is "\use:c{font@name}".\\
   \int_compare:nTF { \clist_count:n {#1} = 1 }
-    { The~ requested~ feature~ is~ "#1". }
-    { The~ requested~ features~ are~ "#1". }
+    { The requested feature is "#1". }
+    { The requested features are "#1". }
+ }
+\@@_msg_new:nnn {fontspec} {feature-option-overwrite}
+ {
+  Option '#2' of font feature '#1' overwritten.
+ }
+\@@_msg_new:nnn {fontspec} {script-not-exist-latn}
+ {
+  Font '\l_fontspec_fontname_tl' does not contain script '#1'.\\
+  'Latin' script used instead.
  }
-\msg_new:nnn {fontspec} {feature-option-overwrite}
+\@@_msg_new:nnn {fontspec} {script-not-exist}
  {
-  Option~ '#2'~ of~ font~ feature~ '#1'~ overwritten.
+  Font '\l_fontspec_fontname_tl' does not contain script '#1'.
  }
-\msg_new:nnn {fontspec} {script-not-exist-latn}
+\@@_msg_new:nnn {fontspec} {aat-feature-not-exist}
  {
-  Font~ '\l_fontspec_fontname_tl'~ does~ not~ contain~ script~ '#1'.\\
-  'Latin'~ script~ used~ instead.
+  '\l_keys_key_tl=\l_keys_value_tl' feature not supported
+  for AAT font '\l_fontspec_fontname_tl'.
  }
-\msg_new:nnn {fontspec} {script-not-exist}
+\@@_msg_new:nnn {fontspec} {aat-feature-not-exist-in-font}
  {
-  Font~ '\l_fontspec_fontname_tl'~ does~ not~ contain~ script~ '#1'.
+  AAT feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
+  in font '\l_fontspec_fontname_tl'.
  }
-\msg_new:nnn {fontspec} {aat-feature-not-exist}
+\@@_msg_new:nnn {fontspec} {icu-feature-not-exist}
  {
-  '\l_keys_key_tl=\l_keys_value_tl'~ feature~ not~ supported~
-  for~ AAT~ font~ '\l_fontspec_fontname_tl'.
+  '\l_keys_key_tl=\l_keys_value_tl' feature not supported
+  for OpenType font '\l_fontspec_fontname_tl'
  }
-\msg_new:nnn {fontspec} {aat-feature-not-exist-in-font}
+\@@_msg_new:nnn {fontspec} {icu-feature-not-exist-in-font}
  {
-  AAT~ feature~ '\l_keys_key_tl=\l_keys_value_tl'~ (#1)~ not~ available~
-  in~ font~ '\l_fontspec_fontname_tl'.
+  OpenType feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
+  for font '\l_fontspec_fontname_tl'
+  with script '\l_@@_script_name_tl' and language '\l_@@_lang_name_tl'.
  }
-\msg_new:nnn {fontspec} {icu-feature-not-exist}
+\@@_msg_new:nnn {fontspec} {no-opticals}
  {
-  '\l_keys_key_tl=\l_keys_value_tl'~ feature~ not~ supported~
-  for~ OpenType~ font~ '\l_fontspec_fontname_tl'
+  '\l_fontspec_fontname_tl' doesn't appear to have an Optical Size axis.
  }
-\msg_new:nnn {fontspec} {icu-feature-not-exist-in-font}
+\@@_msg_new:nnn {fontspec} {language-not-exist}
  {
-  OpenType~ feature~ '\l_keys_key_tl=\l_keys_value_tl'~ (#1)~ not~ available~
-  for~ font~ '\l_fontspec_fontname_tl'~
-  with~ script~ '\l_@@_script_name_tl'~ and~ language~ '\l_@@_lang_name_tl'.
+  Language '#1' not available
+  for font '\l_fontspec_fontname_tl'
+  with script '\l_@@_script_name_tl'.\\
+  'Default' language used instead.
  }
-\msg_new:nnn {fontspec} {no-opticals}
+\@@_msg_new:nnn {fontspec} {only-xetex-feature}
  {
-  '\l_fontspec_fontname_tl'~ doesn't~ appear~ to~ have~ an~ Optical~ Size~ axis.
+  Ignored XeTeX only feature: '#1'.
  }
-\msg_new:nnn {fontspec} {language-not-exist}
+\@@_msg_new:nnn {fontspec} {only-luatex-feature}
  {
-  Language~ '#1'~ not~ available~
-  for~ font~ '\l_fontspec_fontname_tl'~
-  with~ script~ '\l_@@_script_name_tl'.\\
-  'Default'~ language~ used~ instead.
+  Ignored LuaTeX only feature: '#1'.
  }
-\msg_new:nnn {fontspec} {only-xetex-feature}
+\@@_msg_new:nnn {fontspec} {no-mapping}
  {
-  Ignored~ XeTeX~ only~ feature:~ '#1'.
+  Input mapping not (yet?) supported in LuaTeX.
  }
-\msg_new:nnn {fontspec} {only-luatex-feature}
+\@@_msg_new:nnn {fontspec} {no-mapping-ligtex}
  {
-  Ignored~ LuaTeX~ only~ feature:~ '#1'.
+  Input mapping not (yet?) supported in LuaTeX.\\
+  Use "Ligatures=TeX" instead of "Mapping=tex-text".
  }
-\msg_new:nnn {fontspec} {no-mapping}
+\@@_msg_new:nnn {fontspec} {cm-default-obsolete}
  {
-  Input~ mapping~ not~ (yet?)~ supported~ in~ LuaTeX.
+  The "cm-default" package option is obsolete.
  }
-\msg_new:nnn {fontspec} {no-mapping-ligtex}
+\@@_msg_new:nnn {fontspec} {fakebold-only-xetex}
  {
-  Input~ mapping~ not~ (yet?)~ supported~ in~ LuaTeX.\\
-  Use~ "Ligatures=TeX"~ instead~ of~ "Mapping=tex-text".
+  The "FakeBold" and "AutoFakeBold" options are only available with XeLaTeX.\\
+  Option ignored.
  }
-\msg_new:nnn {fontspec} {cm-default-obsolete}
+\@@_msg_new:nnn {fontspec} {font-index-needs-ttc}
  {
-  The~ "cm-default"~ package~ option~ is~ obsolete.
+  The "FontIndex" feature is only supported by TTC (TrueType Collection) fonts.\\
+  Feature ignored.
  }
-\msg_new:nnn {fontspec} {fakebold-only-xetex}
+\@@_msg_new:nnn {fontspec} {feat-cannot-remove}
  {
-  The~ "FakeBold"~ and~ "AutoFakeBold"~ options~ are~ only~ available~ with~ XeLaTeX.\\
-  Option~ ignored.
+  The "#1" feature cannot be deactivated. Request ignored.
  }
 %    \end{macrocode}
-% Info messages:
+%
+% \subsection{Info messages}
+%
 %    \begin{macrocode}
-\msg_new:nnn {fontspec} {defining-font}
+\@@_msg_new:nnn {fontspec} {defining-font}
  {
-  Font~ family~'\l_fontspec_family_tl'~ created~ for~ font~ '#2'~
-  with~ options~ [\l_@@_all_features_clist].\\
+  Font family '\l_fontspec_family_tl' created for font '#2'
+  with options [\l_@@_all_features_clist].\\
   \\
-  This~ font~ family~ consists~ of~ the~ following~ NFSS~ series/shapes:\\
+  This font family consists of the following NFSS series/shapes:\\
   \l_fontspec_defined_shapes_tl
  }
-\msg_new:nnn {fontspec} {no-font-shape}
+\@@_msg_new:nnn {fontspec} {no-font-shape}
  {
-  Could~ not~ resolve~ font~ #1~ (it~ probably~ doesn't~ exist).
+  Could not resolve font "#1" (it probably doesn't exist).
  }
-\msg_new:nnn {fontspec} {set-scale}
+\@@_msg_new:nnn {fontspec} {set-scale}
  {
-  \l_fontspec_fontname_tl\space scale ~=~ \l_@@_scale_tl.
+  \l_fontspec_fontname_tl\space scale = \l_@@_scale_tl.
  }
-\msg_new:nnn {fontspec} {setup-math}
+\@@_msg_new:nnn {fontspec} {setup-math}
  {
-  Adjusting~ the~ maths~ setup~ (use~ [no-math]~ to~ avoid~ this).
+  Adjusting the maths setup (use [no-math] to avoid this).
  }
-\msg_new:nnn {fontspec} {no-scripts}
+\@@_msg_new:nnn {fontspec} {no-scripts}
  {
-  Font~ \l_fontspec_fontname_tl\space does~ not~ contain~ any~ OpenType~ `Script'~ information.
+  Font "\l_fontspec_fontname_tl" does not contain any OpenType `Script' information.
  }
-\msg_new:nnn {fontspec} {opa-twice}
+\@@_msg_new:nnn {fontspec} {opa-twice}
  {
-  Opacity~ set~ twice,~ in~ both~ Colour~ and~ Opacity.\\
-  Using~ specification~ "Opacity=#1".
+  Opacity set twice, in both Colour and Opacity.\\
+  Using specification "Opacity=#1".
  }
-\msg_new:nnn {fontspec} {opa-twice-col}
+\@@_msg_new:nnn {fontspec} {opa-twice-col}
  {
-  Opacity~ set~ twice,~ in~ both~ Opacity~ and~ Colour.\\
-  Using~ an~ opacity~ specification~ in~ hex~ of~ "#1/FF".
+  Opacity set twice, in both Opacity and Colour.\\
+  Using an opacity specification in hex of "#1/FF".
  }
-\msg_new:nnn {fontspec} {bad-colour}
+\@@_msg_new:nnn {fontspec} {bad-colour}
  {
-  Bad~ colour~ declaration~ "#1".~
-  Colour~ must~ be~ one~ of:\\
-  *~ a~ named~ xcolor~ colour\\
-  *~ a~ six-digit~ hex~ colour~ RRGGBB\\
-  *~ an~ eight-digit~ hex~ colour~ RRGGBBTT~ with~ opacity
+  Bad colour declaration "#1".
+  Colour must be one of:\\
+  * a named xcolor colour\\
+  * a six-digit hex colour RRGGBB\\
+  * an eight-digit hex colour RRGGBBTT with opacity
  }
 %    \end{macrocode}
 %
+% Reset `space' behaviour:
+%    \begin{macrocode}
+\char_set_catcode_ignore:n {32}
+%    \end{macrocode}
+%
 %    \begin{macrocode}
-%</msg>
+%</fontspec>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx
index 84975859eea..202b16e1b19 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-opening.dtx
@@ -28,7 +28,7 @@
   \msg_redirect_module:nnn { fontspec } { warning } { none }
   \msg_redirect_module:nnn { fontspec } { info } { none }
  }
-\ExecuteOptions{config,math,euenc}
+\ExecuteOptions{config,math,tuenc}
 \ProcessOptions*
 %    \end{macrocode}
 %
@@ -39,13 +39,28 @@
 %
 % Soon to be the default, with a just-in-case check:
 %    \begin{macrocode}
-\tl_set:Nn \g_fontspec_encoding_tl {TU}
-\file_if_exist:nF {tuenc.def} { \bool_set_true:N \g_@@_euenc_bool }
-\bool_if:NT \g_@@_euenc_bool
+\bool_if:NF \g_@@_euenc_bool
+  {
+    \file_if_exist:nTF {tuenc.def}
+      {
+        \cs_if_exist:cF {T@TU}
+          {
+            \@@_warning:n {tu-clash}
+            \DeclareFontEncoding{TU}{}{}
+            \DeclareFontSubstitution{TU}{lmr}{m}{n}
+          }
+      }
+      {
+        \@@_warning:n {tu-missing}
+        \bool_set_true:N \g_@@_euenc_bool
+      }
+  }
+\bool_if:NTF \g_@@_euenc_bool
   {
 %<xetexx>    \tl_set:Nn \g_fontspec_encoding_tl {EU1}
 %<luatex>    \tl_set:Nn \g_fontspec_encoding_tl {EU2}
   }
+  { \tl_set:Nn \g_fontspec_encoding_tl { TU } }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -54,7 +69,10 @@
 \tl_set:Nn \ttdefault {lmtt}
 \RequirePackage[\g_fontspec_encoding_tl]{fontenc}
 \tl_set_eq:NN \UTFencname \g_fontspec_encoding_tl % for xunicode if needed
-\normalsize % to overcome the encoding changing the current font size
+%    \end{macrocode}
+% To overcome the encoding changing the current font size, but only if a class has been loaded first:
+%    \begin{macrocode}
+\tl_if_in:NnT \@filelist {.cls} { \normalsize }
 %    \end{macrocode}
 % Dealing with a couple of the problems introduced by \pkg{babel}:
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-opentype.dtx
new file mode 100644
index 00000000000..cf655be78b2
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-opentype.dtx
@@ -0,0 +1,395 @@
+% \section{OpenType definitions code}
+%
+% \iffalse
+%    \begin{macrocode}
+%<*fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
+%
+%
+%
+% \begin{macro}{\@@_define_opentype_feature_group:n}
+%    \begin{macrocode}
+\cs_new:Nn \@@_define_opentype_feature_group:n
+  {
+    \keys_define:nn {fontspec-opentype} { #1 .multichoice: }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_define_opentype_feature:nnnnn}
+% \darg{Feature key}
+% \darg{Feature option val}
+% \darg{Check feature --- leave empty for no check}
+% \darg{Exact tag string to activate --- leave empty for disable only}
+% \darg{Tags to remove (clist)}
+%    \begin{macrocode}
+\cs_new:Nn \@@_feat_prop_add:nn
+  {
+    \tl_if_empty:nF {#1}
+     {
+      \prop_if_in:NnF \g_@@_OT_features_prop {#1}
+        {
+          \prop_gput:Nnn \g_@@_OT_features_prop {#1} {#2}
+        }
+     }
+  }
+\cs_new:Nn \@@_define_opentype_feature:nnnnn
+ {
+  \@@_feat_prop_add:nn {#3} {#1\,=\,#2}
+  \keys_define:nn {fontspec-opentype}
+   {
+    #1/#2 .code:n = { \@@_make_OT_feature:nnn {#3} {#4} {#5} }
+   }
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_define_opentype_onoffreset:nnnnn}
+% \darg{Feature key}
+% \darg{Feature option val}
+% \darg{Check feature}
+% \darg{Tag prefix to activate: \texttt{+\#4} = on, \texttt{-\#4} = off.}
+% \darg{Tags to remove in the on case (clist)}
+%    \begin{macrocode}
+\cs_new:Nn \@@_feat_off:n {#1Off}
+\cs_new:Nn \@@_feat_reset:n {#1Reset}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\cs_new:Nn \@@_define_opentype_onoffreset:nnnnn
+ {
+  \exp_args:Nnx \@@_define_opentype_feature:nnnnn {#1} {#2} {#3} {+#4} {#5}
+  \exp_args:Nnx \@@_define_opentype_feature:nnnnn {#1} { \@@_feat_off:n   {#2} } {#3} {-#4} {}
+  \exp_args:Nnx \@@_define_opentype_feature:nnnnn {#1} { \@@_feat_reset:n {#2} } {} {} {+#4,-#4}
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_define_opentype_onreset:nnnnn}
+% \darg{Feature key}
+% \darg{Feature option val}
+% \darg{Check feature}
+% \darg{Exact tag string to activate}
+% \darg{Tags to remove (clist)}
+%    \begin{macrocode}
+\cs_new:Nn \@@_define_opentype_onreset:nnnnn
+ {
+  \exp_args:Nnx \@@_define_opentype_feature:nnnnn {#1} {#2} {#3} {#4} {#5}
+  \exp_args:Nnx \@@_define_opentype_feature:nnnnn {#1} { \@@_feat_reset:n {#2} } {} {} {#4}
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{Adding features when loading fonts}
+%
+% When remove clashing features,
+% \begin{enumerate}
+% \item remove the feature being added (to avoid duplicates);
+% \item remove the inverse of the feature (to avoid cancellation);
+% \item finally remove all clashing features.
+% \end{enumerate}
+%    \begin{macrocode}
+\cs_new:Nn \@@_make_OT_feature:nnn
+  {
+%<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
+      {
+        \@@_check_ot_feat:nF {#1}
+          {
+            \@@_warning:nx {icu-feature-not-exist-in-font} {#1}
+            \bool_set_false:N \l_@@_proceed_bool
+          }
+      }
+
+    \bool_if:NT \l_@@_proceed_bool
+      {
+        \exp_args:Nx \@@_remove_clashing_featstr:n
+          { #2 , \@@_swap_plus_minus:n {#2} , #3 }
+
+        \@@_update_featstr:n {#2}
+      }
+  }
+\cs_generate_variant:Nn \@@_make_OT_feature:nnn {xxx}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\cs_new:Nn \@@_swap_plus_minus:n { \@@_swap_plus_minus_aux:NNNNN #1 }
+\cs_new:Nn \@@_swap_plus_minus_aux:NNNNN
+  { \str_case:nn {#1} { {+} {-#2#3#4#5} {-} {+#2#3#4#5} } }
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\@@_check_script:nTF}
+% This macro takes an OpenType script tag and checks if it exists in the current
+% font. The output boolean is \cmd\@tempswatrue. \cmd\l_@@_script_int\ is used to store
+% the number corresponding to the script tag string.
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \@@_check_script:n {TF}
+  {
+    \bool_if:NTF \l_@@_never_check_bool
+      { \prg_return_true: }
+%<*xetexx>
+ {
+  \@@_iv_str_to_num:Nn \l_@@_strnum_int {#1}
+  \int_set:Nn \l_tmpb_int { \XeTeXOTcountscripts \l_fontspec_font }
+  \int_zero:N \l_tmpa_int
+  \bool_set_false:N \l__fontspec_check_bool
+  \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
+   {
+    \ifnum \XeTeXOTscripttag\l_fontspec_font \l_tmpa_int = \l_@@_strnum_int
+      \bool_set_true:N \l__fontspec_check_bool
+      \int_set:Nn \l_tmpa_int {\l_tmpb_int}
+    \else
+      \int_incr:N \l_tmpa_int
+    \fi
+   }
+  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
+ }
+%</xetexx>
+%<*luatex>
+ {
+  \directlua{fontspec.check_ot_script("l_fontspec_font", "#1")}
+  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
+ }
+%</luatex>
+ }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_check_lang:nTF}
+% This macro takes an OpenType language tag and checks if it exists in the current
+% font/script. The output boolean is \cmd\@tempswatrue. \cmd\l_@@_language_int\ is used to store
+% the number corresponding to the language tag string.
+% The script used is whatever's held in \cmd\l_@@_script_int. By default, that's the
+% number corresponding to `|latn|'.
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \@@_check_lang:n {TF}
+  {
+    \bool_if:NTF \l_@@_never_check_bool
+      { \prg_return_true: }
+%<*xetexx>
+ {
+  \@@_iv_str_to_num:Nn \l_@@_strnum_int {#1}
+  \int_set:Nn \l_tmpb_int
+   { \XeTeXOTcountlanguages \l_fontspec_font \l_@@_script_int }
+  \int_zero:N \l_tmpa_int
+  \bool_set_false:N \l__fontspec_check_bool
+  \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
+   {
+    \ifnum\XeTeXOTlanguagetag\l_fontspec_font\l_@@_script_int \l_tmpa_int =\l_@@_strnum_int
+      \bool_set_true:N \l__fontspec_check_bool
+      \int_set:Nn \l_tmpa_int {\l_tmpb_int}
+    \else
+      \int_incr:N \l_tmpa_int
+    \fi
+   }
+  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
+ }
+%</xetexx>
+%<*luatex>
+ {
+  \directlua
+   {
+    fontspec.check_ot_lang( "l_fontspec_font", "#1", "\l_fontspec_script_tl" )
+   }
+  \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
+ }
+%</luatex>
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_check_ot_feat:nTF}
+% This macro takes an OpenType feature tag and checks if it exists in the current
+% font/script/language.
+% \cmd\l_@@_strnum_int\ is used to store the number corresponding to the feature tag string.
+% The script used is whatever's held in \cmd\l_@@_script_int. By default, that's the
+% number corresponding to `|latn|'. The language used is \cmd\l_@@_language_int,
+% by default |0|, the `default language'.
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \@@_check_ot_feat:n {TF,F}
+  {
+    \bool_if:NTF \l_@@_never_check_bool
+      { \prg_return_true: }
+%<*xetexx>
+ {
+%<debug>\typeout{::~ fontspec_check_ot_feat:n~ {#1}}
+  \int_set:Nn \l_tmpb_int
+   {
+    \XeTeXOTcountfeatures \l_fontspec_font
+                          \l_@@_script_int
+                          \l_@@_language_int
+   }
+  \@@_iv_str_to_num:Nn \l_@@_strnum_int {#1}
+  \int_zero:N \l_tmpa_int
+  \bool_set_false:N \l_@@_check_bool
+  \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
+   {
+    \ifnum\XeTeXOTfeaturetag\l_fontspec_font\l_@@_script_int\l_@@_language_int
+         \l_tmpa_int =\l_@@_strnum_int
+      \bool_set_true:N \l_@@_check_bool
+      \int_set:Nn \l_tmpa_int {\l_tmpb_int}
+    \else
+      \int_incr:N \l_tmpa_int
+    \fi
+   }
+  \bool_if:NTF \l_@@_check_bool \prg_return_true: \prg_return_false:
+ }
+%</xetexx>
+%<*luatex>
+ {
+%<debug>\typeout{::~ fontspec_check_ot_feat:n~ {#1}}
+  \directlua
+   {
+    fontspec.check_ot_feat(
+                           "l_fontspec_font", "#1",
+                           "\l_fontspec_lang_tl", "\l_fontspec_script_tl"
+                          )
+   }
+  \bool_if:NTF \l_@@_check_bool \prg_return_true: \prg_return_false:
+ }
+%</luatex>
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \subsection{OpenType feature information}
+%
+%    \begin{macrocode}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {aalt}{Access~All~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {abvf}{Above-base~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {abvm}{Above-base~Mark~Positioning}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {abvs}{Above-base~Substitutions}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {afrc}{Alternative~Fractions}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {akhn}{Akhands}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {blwf}{Below-base~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {blwm}{Below-base~Mark~Positioning}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {blws}{Below-base~Substitutions}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {calt}{Contextual~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {case}{Case-Sensitive~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ccmp}{Glyph~Composition~/~Decomposition}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {cfar}{Conjunct~Form~After~Ro}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {cjct}{Conjunct~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {clig}{Contextual~Ligatures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {cpct}{Centered~CJK~Punctuation}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {cpsp}{Capital~Spacing}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {cswh}{Contextual~Swash}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {curs}{Cursive~Positioning}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {cvNN}{Character~Variant~$N$}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {c2pc}{Petite~Capitals~From~Capitals}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {c2sc}{Small~Capitals~From~Capitals}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {dist}{Distances}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {dlig}{Discretionary~Ligatures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {dnom}{Denominators}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {dtls}{Dotless~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {expt}{Expert~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {falt}{Final~Glyph~on~Line~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {fin2}{Terminal~Forms~\#2}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {fin3}{Terminal~Forms~\#3}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {fina}{Terminal~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {flac}{Flattened~accent~forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {frac}{Fractions}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {fwid}{Full~Widths}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {half}{Half~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {haln}{Halant~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {halt}{Alternate~Half~Widths}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {hist}{Historical~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {hkna}{Horizontal~Kana~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {hlig}{Historical~Ligatures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {hngl}{Hangul}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {hojo}{Hojo~Kanji~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {hwid}{Half~Widths}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {init}{Initial~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {isol}{Isolated~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ital}{Italics}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {jalt}{Justification~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {jp78}{JIS78~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {jp83}{JIS83~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {jp90}{JIS90~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {jp04}{JIS2004~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {kern}{Kerning}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {lfbd}{Left~Bounds}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {liga}{Standard~Ligatures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ljmo}{Leading~Jamo~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {lnum}{Lining~Figures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {locl}{Localized~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ltra}{Left-to-right~alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ltrm}{Left-to-right~mirrored~forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {mark}{Mark~Positioning}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {med2}{Medial~Forms~\#2}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {medi}{Medial~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {mgrk}{Mathematical~Greek}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {mkmk}{Mark~to~Mark~Positioning}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {mset}{Mark~Positioning~via~Substitution}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {nalt}{Alternate~Annotation~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {nlck}{NLC~Kanji~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {nukt}{Nukta~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {numr}{Numerators}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {onum}{Oldstyle~Figures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {opbd}{Optical~Bounds}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ordn}{Ordinals}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ornm}{Ornaments}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {palt}{Proportional~Alternate~Widths}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {pcap}{Petite~Capitals}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {pkna}{Proportional~Kana}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {pnum}{Proportional~Figures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {pref}{Pre-Base~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {pres}{Pre-base~Substitutions}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {pstf}{Post-base~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {psts}{Post-base~Substitutions}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {pwid}{Proportional~Widths}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {qwid}{Quarter~Widths}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rand}{Randomize}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rclt}{Required~Contextual~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rkrf}{Rakar~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rlig}{Required~Ligatures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rphf}{Reph~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rtbd}{Right~Bounds}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rtla}{Right-to-left~alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rtlm}{Right-to-left~mirrored~forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ruby}{Ruby~Notation~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {rvrn}{Required~Variation~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {salt}{Stylistic~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {sinf}{Scientific~Inferiors}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {size}{Optical~size}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {smcp}{Small~Capitals}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {smpl}{Simplified~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ssNN}{Stylistic~Set~$N$}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {ssty}{Math~script~style~alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {stch}{Stretching~Glyph~Decomposition}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {subs}{Subscript}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {sups}{Superscript}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {swsh}{Swash}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {titl}{Titling}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {tjmo}{Trailing~Jamo~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {tnam}{Traditional~Name~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {tnum}{Tabular~Figures}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {trad}{Traditional~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {twid}{Third~Widths}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {unic}{Unicase}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {valt}{Alternate~Vertical~Metrics}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vatu}{Vattu~Variants}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vert}{Vertical~Writing}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vhal}{Alternate~Vertical~Half~Metrics}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vjmo}{Vowel~Jamo~Forms}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vkna}{Vertical~Kana~Alternates}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vkrn}{Vertical~Kerning}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vpal}{Proportional~Alternate~Vertical~Metrics}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vrt2}{Vertical~Alternates~and~Rotation}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {vrtr}{Vertical~Alternates~for~Rotation}
+\prop_gput:Nnn \g_@@_all_opentype_feature_names_prop {zero}{Slashed~Zero}
+%    \end{macrocode}
+%
+% \iffalse
+%    \begin{macrocode}
+%</fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
+
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx
index 15c5aa66c02..7114a8af2ea 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-patches.dtx
@@ -1,7 +1,7 @@
 % \section{Patching code}
 %
 %    \begin{macrocode}
-%<*patches>
+%<*fontspec>
 %    \end{macrocode}
 %
 %
@@ -97,29 +97,60 @@
 % \begin{macro}{\eminnershape}
 % \begin{macro}{\emfontdeclare}
 % Redefinition of |{\em ...}| and |\emph{...}| to allow nesting of emphases.
+%
 %    \begin{macrocode}
-\int_new:N \l_@@_em_int
-\int_new:N \l_@@_emdef_int
 \cs_new_protected:Npn \emfontdeclare #1
   {
-    \int_zero:N \l_@@_emdef_int
-    \clist_map_inline:nn {#1}
-      {
-        \int_incr:N \l_@@_emdef_int
-        \cs_set:cpn {@@_em_font_ \int_use:N \l_@@_emdef_int _switch:} {##1}
-      }
+    \prop_clear:N \g_@@_em_prop
+    \int_zero:N   \l_@@_emdef_int
+    \group_begin:
+      \normalfont
+      \clist_map_inline:nn {\emreset,#1}
+        {
+          ##1
+          \prop_gput:NxV \g_@@_em_prop { \f@series/\f@shape } { \l_@@_emdef_int }
+          \prop_gput:Nxn \g_@@_em_prop { switch-\int_use:N \l_@@_emdef_int } { ##1 }
+          \int_incr:N \l_@@_emdef_int
+        }
+    \group_end:
   }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \DeclareRobustCommand \em
   {
     \@nomath\em
+
+    \prop_get:NxNT \g_@@_em_prop { \f@series/\f@shape } \l_@@_em_tmp_tl
+      { \int_set:Nn \l_@@_em_int { \l_@@_em_tmp_tl } }
+
     \int_incr:N \l_@@_em_int
-    \use:c {@@_em_font_ \int_use:N \l_@@_em_int _switch:}
+
+    \prop_get:NxNTF \g_@@_em_prop { switch-\int_use:N \l_@@_em_int } \l_@@_em_switch_tl
+      { \l_@@_em_switch_tl }
+      {
+        \int_zero:N \l_@@_em_int
+        \emreset
+      }
+
   }
+%    \end{macrocode}
+% Document commands:
+%    \begin{macrocode}
 \DeclareTextFontCommand{\emph}{\em}
+\cs_set:Npn \emreset { \upshape }
 \cs_set:Npn \emshape { \itshape }
 \cs_set:Npn \eminnershape { \upshape }
 \emfontdeclare{ \emshape, \eminnershape }
 %    \end{macrocode}
+% Ensure nesting resets when necessary:
+%    \begin{macrocode}
+\cs_set:Npn \reset@font { \normalfont \int_zero:N \l__fontspec_em_int }
+%    \end{macrocode}
+% Programmer's interface for setting nesting level:
+%    \begin{macrocode}
+\cs_new:Nn \fontspec_set_em_level:n { \int_set:Nn \l_@@_em_int {#1} }
+%    \end{macrocode}
 % \end{macro} \end{macro} \end{macro} \end{macro} \end{macro}
 %
 % \subsection{\cmd\-}
@@ -148,19 +179,19 @@
 % Many thanks to Apostolos Syropoulos for discovering this problem and writing the  redefinion of \LaTeX's |verbatim| environment and \cs{verb*} command.
 %
 % \begin{macro}{\fontspec_visible_space:}
-% Print \unichar{2434}{Open box}, which is used to visibly display a space character.
+% Print \unichar{2423}{Open box}, which is used to visibly display a space character.
 %    \begin{macrocode}
 \cs_new:Nn \fontspec_visible_space:
  {
-  \font_glyph_if_exist:NnTF \font {"2423}
+  \@@_primitive_font_glyph_if_exist:NnTF \font {"2423}
    { \char"2423\scan_stop: }
    { \fontspec_visible_space_fallback: }
  }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\fontspec_visible_space:@fallback}
-% If the current font doesn't have \unichar{2434}{Open box}, use Latin Modern Mono instead.
+% \begin{macro}{\fontspec_visible_space_fallback:}
+% If the current font doesn't have \unichar{2423}{Open box}, use Latin Modern Mono instead.
 %    \begin{macrocode}
 \cs_new:Nn \fontspec_visible_space_fallback:
  {
@@ -302,5 +333,5 @@
 %
 %
 %    \begin{macrocode}
-%</patches>
+%</fontspec>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx
new file mode 100644
index 00000000000..660b4187b79
--- /dev/null
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-scripts.dtx
@@ -0,0 +1,92 @@
+
+% \subsection{Font script definitions}
+%
+% \iffalse
+%    \begin{macrocode}
+%<*fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
+%
+%    \begin{macrocode}
+\newfontscript{Arabic}{arab}
+\newfontscript{Armenian}{armn}
+\newfontscript{Balinese}{bali}
+\newfontscript{Bengali}{bng2,beng}
+\newfontscript{Bopomofo}{bopo}
+\newfontscript{Braille}{brai}
+\newfontscript{Buginese}{bugi}
+\newfontscript{Buhid}{buhd}
+\newfontscript{Byzantine~Music}{byzm}
+\newfontscript{Canadian~Syllabics}{cans}
+\newfontscript{Cherokee}{cher}
+\newfontscript{CJK~Ideographic}{hani}
+\newfontscript{Coptic}{copt}
+\newfontscript{Cypriot~Syllabary}{cprt}
+\newfontscript{Cyrillic}{cyrl}
+\newfontscript{Default}{DFLT}
+\newfontscript{Deseret}{dsrt}
+\newfontscript{Devanagari}{dev2,deva}
+\newfontscript{Ethiopic}{ethi}
+\newfontscript{Georgian}{geor}
+\newfontscript{Glagolitic}{glag}
+\newfontscript{Gothic}{goth}
+\newfontscript{Greek}{grek}
+\newfontscript{Gujarati}{gjr2,gujr}
+\newfontscript{Gurmukhi}{gur2,guru}
+\newfontscript{Hangul~Jamo}{jamo}
+\newfontscript{Hangul}{hang}
+\newfontscript{Hanunoo}{hano}
+\newfontscript{Hebrew}{hebr}
+\newfontscript{Hiragana~and~Katakana}{kana}
+\newfontscript{Javanese}{java}
+\newfontscript{Kannada}{knd2,knda}
+\newfontscript{Kharosthi}{khar}
+\newfontscript{Khmer}{khmr}
+\newfontscript{Lao}{lao~}
+\newfontscript{Latin}{latn}
+\newfontscript{Limbu}{limb}
+\newfontscript{Linear~B}{linb}
+\newfontscript{Malayalam}{mlm2,mlym}
+\newfontscript{Math}{math}
+\newfontscript{Mongolian}{mong}
+\newfontscript{Musical~Symbols}{musc}
+\newfontscript{Myanmar}{mymr}
+\newfontscript{N'ko}{nko~}
+\newfontscript{Ogham}{ogam}
+\newfontscript{Old~Italic}{ital}
+\newfontscript{Old~Persian~Cuneiform}{xpeo}
+\newfontscript{Oriya}{ory2,orya}
+\newfontscript{Osmanya}{osma}
+\newfontscript{Phags-pa}{phag}
+\newfontscript{Phoenician}{phnx}
+\newfontscript{Runic}{runr}
+\newfontscript{Shavian}{shaw}
+\newfontscript{Sinhala}{sinh}
+\newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
+\newfontscript{Syloti~Nagri}{sylo}
+\newfontscript{Syriac}{syrc}
+\newfontscript{Tagalog}{tglg}
+\newfontscript{Tagbanwa}{tagb}
+\newfontscript{Tai~Le}{tale}
+\newfontscript{Tai~Lu}{talu}
+\newfontscript{Tamil}{tml2,taml}
+\newfontscript{Telugu}{tel2,telu}
+\newfontscript{Thaana}{thaa}
+\newfontscript{Thai}{thai}
+\newfontscript{Tibetan}{tibt}
+\newfontscript{Tifinagh}{tfng}
+\newfontscript{Ugaritic~Cuneiform}{ugar}
+\newfontscript{Yi}{yi~~}
+%    \end{macrocode}
+% For convenience:
+%    \begin{macrocode}
+\newfontscript{Kana}{kana}
+\newfontscript{Maths}{math}
+\newfontscript{CJK}{hani}
+%    \end{macrocode}
+%
+% \iffalse
+%    \begin{macrocode}
+%</fontspec&(xetexx|luatex)>
+%    \end{macrocode}
+% \fi
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx
index f9db2c2d2fc..cf9e95e1a17 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-user.dtx
@@ -11,18 +11,6 @@
 %    \end{macrocode}
 % \fi
 %
-% \subsubsection{Helper macros for argument mangling}
-%    \begin{macrocode}
-\cs_new:Nn \@@_pass_args:nnn
- {
-  \IfNoValueTF {#2}
-   { \@@_post_arg:w {#1} {#3} }
-   { #1 {#2} {#3} }
- }
-\NewDocumentCommand \@@_post_arg:w { m m O{} }
- { #1 {#3} {#2} }
-%    \end{macrocode}
-%
 % \subsubsection{Font selection}
 % \begin{macro}{\fontspec}
 %   This is the main command of the package that
@@ -30,12 +18,9 @@
 %   font name and the optional requested features of that
 %   font. Then this new font family is selected.
 %    \begin{macrocode}
-\NewDocumentCommand \fontspec { o m }
- { \@@_pass_args:nnn \@@_fontspec:nn {#1} {#2} }
-
-\cs_new:Nn \@@_fontspec:nn
+\NewDocumentCommand \fontspec { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \f@family {#1} {#2}
+  \fontspec_set_family:Nnn \f@family {#1,#3} {#2}
   \fontencoding { \l_@@_nfss_enc_tl }
   \selectfont
   \ignorespaces
@@ -44,50 +29,77 @@
 % \end{macro}
 %
 % \begin{macro}{\setmainfont}
-% \begin{macro}{\setsansfont}
-% \begin{macro}{\setmonofont}
 %     The following three macros perform equivalent operations setting
 %     the default font for a
 %     particular family: `roman', sans serif, or typewriter
 %     (monospaced). I end them with |\normalfont| so that if they're
 %     used in the document, the change registers immediately.
 %    \begin{macrocode}
-\DeclareDocumentCommand \setmainfont { o m }
- { \@@_pass_args:nnn \@@_setmainfont:nn {#1} {#2} }
-
-\cs_new:Nn \@@_setmainfont:nn
+\DeclareDocumentCommand \setmainfont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \rmdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g_@@_rmfamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \rmdefault \g_@@_rmfamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily }
+   {
+    \exp_not:N \fontencoding { \l_@@_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g_@@_rmfamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+    { \tl_set_eq:NN \encodingdefault \l_@@_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
-
-\DeclareDocumentCommand \setsansfont { o m }
- { \@@_pass_args:nnn \@@_setsansfont:nn {#1} {#2} }
-
-\cs_new:Nn \@@_setsansfont:nn
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\setsansfont}
+%    \begin{macrocode}
+\DeclareDocumentCommand \setsansfont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \sfdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g_@@_sffamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \sfdefault \g_@@_sffamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \sffamily }
+   {
+    \exp_not:N \fontencoding { \l_@@_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g_@@_sffamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+    { \tl_set_eq:NN \encodingdefault \l_@@_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
-
-\DeclareDocumentCommand \setmonofont { o m }
- { \@@_pass_args:nnn \@@_setmonofont:nn {#1} {#2} }
-
-\cs_new:Nn \@@_setmonofont:nn
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\setmonofont}
+%    \begin{macrocode}
+\DeclareDocumentCommand \setmonofont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \ttdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g_@@_ttfamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \ttdefault \g_@@_ttfamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily }
+   {
+    \exp_not:N \fontencoding { \l_@@_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g_@@_ttfamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+    { \tl_set_eq:NN \encodingdefault \l_@@_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
 %    \end{macrocode}
-% \end{macro} \end{macro} \end{macro}
+% \end{macro}
 %
 %
 % \begin{macro}{\setromanfont}
-% This is the old name for \cs{setmainfont}, retained
-% for backwards compatibility.
+% This is the old name for \cs{setmainfont}, retained \emph{ad infinitum}
+% for backwards compatibility. It was deprecated in 2010.
 %    \begin{macrocode}
 \cs_set_eq:NN \setromanfont \setmainfont
 %    \end{macrocode}
@@ -104,38 +116,22 @@
 % document. \cmd\setboldmathrm\ is used for specifying which
 % fonts should be used in \cmd\boldmath.
 %    \begin{macrocode}
-\tl_new:N \g_@@_mathrm_tl
-\tl_new:N \g_@@_bfmathrm_tl
-\tl_new:N \g_@@_mathsf_tl
-\tl_new:N \g_@@_mathtt_tl
-\DeclareDocumentCommand \setmathrm { o m }
- { \@@_pass_args:nnn \@@_setmathrm:nn {#1} {#2} }
-
-\cs_new:Nn \@@_setmathrm:nn
+\DeclareDocumentCommand \setmathrm { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g_@@_mathrm_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setboldmathrm { o m }
- { \@@_pass_args:nnn \@@_setboldmathrm:nn {#1} {#2} }
-
-\cs_new:Nn \@@_setboldmathrm:nn
+\DeclareDocumentCommand \setboldmathrm { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g_@@_bfmathrm_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setmathsf { o m }
- { \@@_pass_args:nnn \@@_setmathsf:nn {#1} {#2} }
-
-\cs_new:Nn \@@_setmathsf:nn
+\DeclareDocumentCommand \setmathsf { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g_@@_mathsf_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setmathtt { o m }
- { \@@_pass_args:nnn \@@_setmathtt:nn {#1} {#2} }
-
-\cs_new:Nn \@@_setmathtt:nn
+\DeclareDocumentCommand \setmathtt { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g_@@_mathtt_tl {#1} {#2}
  }
@@ -155,7 +151,6 @@
 % \end{macro}
 %
 % \begin{macro}{\newfontfamily}
-% \begin{macro}{\newfontface}
 %   This macro takes the arguments of \cs{fontspec} with a prepended
 %   \meta{instance cmd}. This command is used
 %   when a specific font instance needs to be referred to repetitively
@@ -167,12 +162,9 @@
 %   \cs{l_fontspec_family_tl}. This family is then used in a typical NFSS \cmd\fontfamily\
 %   declaration, saved in the macro name specified.
 %    \begin{macrocode}
-\DeclareDocumentCommand \newfontfamily { m o m }
- { \@@_pass_args:nnn { \@@_newfontfamily:Nnn #1 } {#2} {#3} }
-
-\cs_new:Nn \@@_newfontfamily:Nnn
+\DeclareDocumentCommand \newfontfamily { m O{} m O{} }
  {
-  \fontspec_set_family:cnn { g_@@_ \cs_to_str:N #1 _family } {#2} {#3}
+  \fontspec_set_family:cnn { g_@@_ \cs_to_str:N #1 _family } {#2,#4} {#3}
   \use:x
    {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1
@@ -184,17 +176,17 @@
    }
  }
 %    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\newfontface}
 % \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}
-\DeclareDocumentCommand \newfontface { m o m }
- { \@@_pass_args:nnn { \@@_newfontface:Nnn #1 } {#2} {#3} }
-
-\cs_new:Nn \@@_newfontface:Nnn
+\DeclareDocumentCommand \newfontface { m O{} m O{} }
  {
-  \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
+  \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
  }
 %    \end{macrocode}
-% \end{macro} \end{macro}
+% \end{macro}
 %
 % \subsubsection{Font feature selection}
 %
@@ -205,10 +197,6 @@
 %   \cs{g_fontspec_default_fontopts_tl} (initialised empty), which is
 %   concatenated with the individual macro choices in the
 %   [...] macro.
-%    \begin{macrocode}
-\clist_new:N \g_@@_default_fontopts_clist
-\prop_new:N \g_@@_fontopts_prop
-%    \end{macrocode}
 %
 %    \begin{macrocode}
 \DeclareDocumentCommand \defaultfontfeatures { t+ o m }
@@ -251,28 +239,6 @@
    }
  }
 %    \end{macrocode}
-%
-% \begin{macro}{\@@_sanitise_fontname:Nn}
-% Assigns font name |#2| to token list variable |#1| and strips extension(s) from it in the case of an external font.
-% We strip spaces for luatex for consistency with luaotfload, although I'm not sure this is necessary any more.
-% At one stage this also lowercased the name, but this step has been removed unless someone can remind me why it was necessary.
-%    \begin{macrocode}
-\cs_new:Nn \@@_sanitise_fontname:Nn
- {
-  \tl_set:Nx #1 {#2}
-%<luatex>  \tl_remove_all:Nn #1 {~}
-  \clist_map_inline:Nn \l_@@_extensions_clist
-   {
-     \tl_if_in:NnT #1 {##1}
-       {
-         \tl_remove_once:Nn #1 {##1}
-%         \keys_set:nn {fontspec-preparse-external} { Extension = ##1 }
-         \clist_map_break:
-       }
-   }
- }
-%    \end{macrocode}
-% \end{macro}
 % \end{macro}
 %
 %
@@ -290,16 +256,16 @@
 %
 %   The default options are \emph{not} applied (which is why
 %   \cs{g_fontspec_default_fontopts_tl} is emptied inside the group; this is allowed
-%   as \cmd\l_fontspec_family_tl\ is globally defined in \cmd\fontspec_select:nn), so this
+%   as \cmd\l_fontspec_family_tl\ is globally defined in \cmd\@@_select_font_family:nn), so this
 %   means that the only added features to the font are strictly those
 %   specified by this command.
 %
 %   \cs{addfontfeature} is defined as an alias, as I found that I
 %   often typed this instead when adding only a single font feature.
 %    \begin{macrocode}
-\bool_new:N \l_@@_disable_defaults_bool
 \DeclareDocumentCommand \addfontfeatures {m}
  {
+%<debug>  \typeout{^^J::::::::::::::::::::::::::::::::::^^J: addfontfeatures}
   \fontspec_if_fontspec_font:TF
    {
     \group_begin:
@@ -307,9 +273,10 @@
       \prop_get:cnN {g_@@_ \f@family _prop} {options} \l_@@_options_tl
       \prop_get:cnN {g_@@_ \f@family _prop} {fontname} \l_@@_fontname_tl
       \bool_set_true:N \l_@@_disable_defaults_bool
+%<debug>          \typeout{ \@@_select_font_family:nn { \l_@@_options_tl , #1 } {\l_@@_fontname_tl} }
       \use:x
        {
-        \exp_not:N \fontspec_select:nn
+        \@@_select_font_family:nn
           { \l_@@_options_tl , #1 } {\l_@@_fontname_tl}
        }
     \group_end:
@@ -324,8 +291,6 @@
 %    \end{macrocode}
 % \end{macro}
 %
-%
-%
 % \subsubsection{Defining new font features}
 %
 % \begin{macro}{\newfontfeature}
@@ -355,16 +320,15 @@
 \DeclareDocumentCommand \newAATfeature {mmmm}
  {
   \keys_if_exist:nnF { fontspec } {#1}
-    { \@@_define_font_feature:n {#1} }
+    { \@@_define_aat_feature_group:n {#1} }
   \keys_if_choice_exist:nnnT {fontspec} {#1} {#2}
     { \@@_warning:nxx {feature-option-overwrite} {#1} {#2} }
-  \@@_define_feature_option:nnnnn {#1}{#2}{#3}{#4}{}
+  \@@_define_aat_feature:nnnn {#1}{#2}{#3}{#4}
  }
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\newopentypefeature}
-% \begin{macro}{\newICUfeature}
 % This command assigns a new OpenType feature by its abbreviation (|#2|) to a new name (|#1|).
 % Better than \cmd\newfontfeature\ because it checks if the feature exists in the
 % font it's being used for.
@@ -372,52 +336,68 @@
 \DeclareDocumentCommand \newopentypefeature {mmm}
  {
   \keys_if_exist:nnF { fontspec / options } {#1}
-    { \@@_define_font_feature:n {#1} }
+    { \@@_define_opentype_feature_group:n {#1} }
   \keys_if_choice_exist:nnnT {fontspec} {#1} {#2}
     { \@@_warning:nxx {feature-option-overwrite} {#1} {#2} }
-  \@@_define_feature_option:nnnnn {#1}{#2}{}{}{#3}
+  \@@_define_opentype_feature:nnn {#1}{#2}{#3}
  }
-\cs_set_eq:NN \newICUfeature \newopentypefeature % deprecated
 %    \end{macrocode}
 % \end{macro}
+%
+% \begin{macro}{\newICUfeature}
+%    \begin{macrocode}
+\cs_set_eq:NN \newICUfeature \newopentypefeature % deprecated
+%    \end{macrocode}
 % \end{macro}
 %
 %
 % \begin{macro}{\aliasfontfeature}
-% \begin{macro}{\aliasfontfeatureoption}
 % User commands for renaming font features and font feature options.
 %    \begin{macrocode}
-\bool_new:N \l_@@_alias_bool
 \DeclareDocumentCommand \aliasfontfeature {mm}
  {
   \bool_set_false:N \l_@@_alias_bool
 
   \clist_map_inline:nn
-   { fontspec, fontspec-preparse, fontspec-preparse-external,
+   { fontspec, fontspec-opentype, fontspec-aat, fontspec-preparse, fontspec-preparse-external,
      fontspec-preparse-nested, fontspec-renderer }
    {
 
      \keys_if_exist:nnT {##1} {#1}
       {
         \bool_set_true:N \l_@@_alias_bool
-        \@@_alias_font_feature:nnn {##1} {#1} {#2}
+        \keys_define:nn {##1}
+          { #2 .code:n = { \keys_set:nn {##1} { #1 = {####1} } } }
       }
    }
 
   \bool_if:NF \l_@@_alias_bool
     { \@@_warning:nx {rename-feature-not-exist} {#1} }
  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\aliasfontfeatureoption}
+%    \begin{macrocode}
+\DeclareDocumentCommand \aliasfontfeatureoption {mmm}
+ {
+  \bool_set_false:N \l_@@_alias_bool
 
-\cs_set:Nn \@@_alias_font_feature:nnn
-  {
-    \keys_define:nn {#1}
-      { #3 .code:n = { \keys_set:nn {#1} { #2 = {##1} } } }
-  }
+  \clist_map_inline:Nn \g_@@_all_keyval_modules_clist
+   {
 
-\DeclareDocumentCommand \aliasfontfeatureoption {mmm}
-  { \keys_define:nn { fontspec / #1 } { #3 .meta:n = {#2} } }
+     \keys_if_exist:nnT {##1} {#1}
+      {
+        \bool_set_true:N \l_@@_alias_bool
+        \keys_define:nn { ##1 / #1 } { #3 .meta:n = {#2} }
+      }
+   }
+
+  \bool_if:NF \l_@@_alias_bool
+    { \@@_warning:nx {rename-feature-not-exist} {#1} }
+ }
 %    \end{macrocode}
-% \end{macro} \end{macro}
+% \end{macro}
 %
 % \begin{macro}{\newfontscript}
 % Mostly used internally, but also possibly useful for users, to define new OpenType
@@ -453,6 +433,43 @@
 \DeclareFontsExtensions{.otf,.ttf,.OTF,.TTF,.ttc,.TTC,.dfont}
 %    \end{macrocode}
 % \end{macro}
+
+
+% \begin{macro}{\IfFontFeaturesTF}
+%    \begin{macrocode}
+\DeclareDocumentCommand \IfFontFeatureActiveTF {mmm}
+  {
+%<debug>    \typeout{^^J:::::::::::::::::::::::::::::::::::::::::::::::}
+%<debug>    \typeout{:IfFontFeatureActiveTF \exp_not:n{{#1}{#2}{#3}}}
+    \@@_if_font_feature:nTF {#1} {#2} {#3}
+  }
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\prg_new_conditional:Nnn \@@_if_font_feature:n {TF}
+  {
+    \tl_gclear:N \g_@@_single_feat_tl
+    \group_begin:
+      \@@_font_suppress_not_found_error:
+      \@@_init:
+      \bool_set_true:N \l_@@_ot_bool
+      \bool_set_true:N \l_@@_never_check_bool
+      \bool_set_false:N \l_@@_firsttime_bool
+      \clist_clear:N \l_@@_fontfeat_clist
+      \@@_get_features:Nn \l_@@_rawfeatures_sclist {#1}
+    \group_end:
+
+%<debug>    \typeout{:::> \exp_not:N\l_@@_rawfeatures_sclist->~{\l_@@_rawfeatures_sclist}}
+%<debug>    \typeout{:::> \exp_not:N\g_@@_single_feat_tl->~{\g_@@_single_feat_tl}}
+
+    \tl_if_empty:NTF \g_@@_single_feat_tl { \prg_return_false: }
+      {
+        \exp_args:NV \fontspec_if_current_feature:nTF \g_@@_single_feat_tl
+          { \prg_return_true: } { \prg_return_false: }
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
 %
 % \iffalse
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx
index 77cba07f2be..9ce2b2e3a0f 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-vars.dtx
@@ -1,16 +1,16 @@
 %
-% \section{Declaration of variables}
+% \section{Declaration of variables and functions}
 %
 %    \begin{macrocode}
-%<*vars>
+%<*fontspec>
 %    \end{macrocode}
 %
-% \paragraph{Conditionals}
+% \paragraph{Booleans}
 % \subparagraph{firsttime} As \cs{keys_set:nn} is run multiple times, some of its
 % information storing only occurs once while we decide if the font family
 % has been defined or not. When the later processing is occuring per-shape
 % this no longer needs to happen; this is indicated by the `firsttime'
-% conditional (initialised true).
+% conditional.
 %    \begin{macrocode}
 \bool_new:N \l_@@_firsttime_bool
 %    \end{macrocode}
@@ -19,10 +19,11 @@
 \bool_new:N \l_@@_noit_bool
 \bool_new:N \l_@@_nosc_bool
 %    \end{macrocode}
+% These strange set functions are to simplify returning code from LuaTeX:
 %    \begin{macrocode}
-\bool_new:N \l__fontspec_check_bool
-\cs_new:Npn \FontspecSetCheckBoolTrue  { \bool_set_true:N  \l__fontspec_check_bool }
-\cs_new:Npn \FontspecSetCheckBoolFalse { \bool_set_false:N \l__fontspec_check_bool }
+\bool_new:N \l_@@_check_bool
+\cs_new:Npn \FontspecSetCheckBoolTrue  { \bool_set_true:N  \l_@@_check_bool }
+\cs_new:Npn \FontspecSetCheckBoolFalse { \bool_set_false:N \l_@@_check_bool }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -32,7 +33,7 @@
 \bool_new:N \l_@@_mm_bool
 \bool_new:N \l_@@_graphite_bool
 %    \end{macrocode}
-% For dealing with legacy maths
+% For dealing with legacy maths:
 %    \begin{macrocode}
 \bool_new:N \g_@@_math_euler_bool
 \bool_new:N \g_@@_math_lucida_bool
@@ -44,38 +45,132 @@
 \bool_new:N \g_@@_math_bool
 \bool_new:N \g_@@_euenc_bool
 %    \end{macrocode}
+%
+%    \begin{macrocode}
+\bool_new:N \l_@@_disable_defaults_bool
+\bool_new:N \l_@@_alias_bool
+\bool_new:N \l_@@_external_bool
+\bool_new:N \l_@@_never_check_bool
+\bool_new:N \l_@@_defining_encoding_bool
+\bool_new:N \l_@@_script_exist_bool
+%    \end{macrocode}
+%
 % \paragraph{Counters}
 %    \begin{macrocode}
-\int_new:N \l_fontspec_script_int
-\int_new:N \l_fontspec_language_int
-\int_new:N \l_fontspec_strnum_int
+\int_new:N \l_@@_script_int
+\int_new:N \l_@@_language_int
+\int_new:N \l_@@_strnum_int
+\int_new:N \l_@@_tmp_int
+\int_new:N \l_@@_em_int
+\int_new:N \l_@@_emdef_int
 %    \end{macrocode}
-% \paragraph{Other variables}
+%
+% \paragraph{Floating point}
 %    \begin{macrocode}
 \fp_new:N \l_@@_tmpa_fp
 \fp_new:N \l_@@_tmpb_fp
+%    \end{macrocode}
+%
+% \paragraph{Dimensions}
+%    \begin{macrocode}
 \dim_new:N \l_@@_tmpa_dim
 \dim_new:N \l_@@_tmpb_dim
 \dim_new:N \l_@@_tmpc_dim
+\seq_new:N \g_@@_bf_series_seq
 %    \end{macrocode}
 %
+% \paragraph{Comma lists}
 %    \begin{macrocode}
-\tl_set:Nx \c_colon_str { \tl_to_str:N : }
-\cs_set:Npn \use_v:nnnnn #1#2#3#4#5 {#5}
-\cs_set:Npn \use_iv:nnnnn #1#2#3#4#5 {#4}
+\clist_new:N \g_@@_default_fontopts_clist
+\clist_new:N \g_@@_all_keyval_modules_clist
+\clist_set:Nn \l_@@_sizefeat_clist {Size={-}}
 %    \end{macrocode}
 %
-% Need these:
+% \paragraph{Property lists}
 %    \begin{macrocode}
-\cs_generate_variant:Nn \str_if_eq:nnTF {nv}
-\cs_generate_variant:Nn \int_set:Nn {Nv}
-\cs_generate_variant:Nn \keys_set:nn {nx}
-\cs_generate_variant:Nn \keys_set_known:nnN {nx}
-\cs_generate_variant:Nn \tl_if_empty:nTF {x}
-\cs_generate_variant:Nn \tl_if_empty:nTF {x}
-\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
+\prop_new:N \g_@@_fontopts_prop
+\prop_new:N \l_@@_nfss_prop
+\prop_new:N \l_@@_nfssfont_prop
+\prop_new:N \g_@@_OT_features_prop
+\prop_new:N \g_@@_all_opentype_feature_names_prop
+\prop_new:N \g_@@_em_prop
+%    \end{macrocode}
+%
+% \paragraph{Token lists}
+%
+%    \begin{macrocode}
+\tl_new:N \g_@@_mathrm_tl
+\tl_new:N \g_@@_bfmathrm_tl
+\tl_new:N \g_@@_mathsf_tl
+\tl_new:N \g_@@_mathtt_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\tl_new:N \l_@@_family_label_tl
+\tl_new:N \l_@@_fake_slant_tl
+\tl_new:N \l_@@_fake_embolden_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\tl_new:N \l_@@_fontname_up_tl
+\tl_new:N \l_@@_fontname_bf_tl
+\tl_new:N \l_@@_fontname_it_tl
+\tl_new:N \l_@@_fontname_bfit_tl
+\tl_new:N \l_@@_fontname_sl_tl
+\tl_new:N \l_@@_fontname_bfsl_tl
+\tl_new:N \l_@@_fontname_sc_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\tl_new:N \l_@@_fontfeat_up_clist
+\tl_new:N \l_@@_fontfeat_bf_clist
+\tl_new:N \l_@@_fontfeat_it_clist
+\tl_new:N \l_@@_fontfeat_bfit_clist
+\tl_new:N \l_@@_fontfeat_sl_clist
+\tl_new:N \l_@@_fontfeat_bfsl_clist
+\tl_new:N \l_@@_fontfeat_sc_clist
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\tl_new:N \l_@@_script_name_tl
+\tl_new:N \l_fontspec_script_tl
+\tl_new:N \l_@@_lang_name_tl
+\tl_new:N \l_fontspec_lang_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\tl_new:N  \g_@@_hexcol_tl
+\tl_new:N  \g_@@_opacity_tl
+\tl_set:Nn \g_@@_hexcol_tl {000000}
+\tl_set:Nn \g_@@_opacity_tl {FF~}
+\tl_set:Nn \g_@@_postadjust_tl { \l_@@_wordspace_adjust_tl \l_@@_punctspace_adjust_tl }
 %    \end{macrocode}
 %
+%
+%
+% \subsection{Generic functions}
+%
+% \begin{macro}{\@@_keys_set_known:nnN}
+%    \begin{macrocode}
+\cs_new:Nn \@@_keys_set_known:nnN
+  {
+%<debug>  \typeout{:::: Keys~set:~{#1}~{#2} }
+    \keys_set_known:nnN {#1} {#2} #3
+%<debug>  \typeout{:::: Leftover:~{#3} }
+  }
+\cs_generate_variant:Nn \@@_keys_set_known:nnN {nx}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_head_ii:n}
+% Expands to the first two \meta{items} of |#1|.
+%    \begin{macrocode}
+\cs_set:Npn \@@_head_ii:n #1 { \@@_head_ii:w #1 *** \q_stop}
+\cs_set:Npn \@@_head_ii:w #1#2#3 \q_stop { #1#2 }
+\cs_generate_variant:Nn \@@_head_ii:n {o}
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{\@@_int_mult_truncate:Nn}
 % Missing in expl3, IMO.
 %    \begin{macrocode}
@@ -86,7 +181,28 @@
 %    \end{macrocode}
 % \end{macro}
 %
+%
+% \subsection{expl3 variants}
+%
+%    \begin{macrocode}
+\cs_generate_variant:Nn \int_set:Nn {Nv}
+\cs_generate_variant:Nn \keys_set:nn {nx}
+\cs_generate_variant:Nn \keys_set_known:nnN {nx}
+\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
+\cs_generate_variant:Nn \prop_put:Nnn {NxV}
+\cs_generate_variant:Nn \prop_gput:Nnn  {NxV}
+\cs_generate_variant:Nn \prop_gput:Nnn  {Nxn}
+\cs_generate_variant:Nn \prop_get:NnNT  {NxN}
+\cs_generate_variant:Nn \prop_get:NnNTF {NxN}
+\cs_generate_variant:Nn \str_if_eq:nnTF {nv}
+\cs_generate_variant:Nn \tl_if_empty:nTF {x}
+\cs_generate_variant:Nn \tl_if_empty:nF {x}
+\cs_generate_variant:Nn \tl_if_empty:nF {f}
+\cs_generate_variant:Nn \tl_if_eq:nnT {ox}
+\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
+%    \end{macrocode}
+%
 %    \begin{macrocode}
-%</vars>
+%</fontspec>
 %    \end{macrocode}
 
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index 8f2e1d796eb..deb3adbc1e0 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
@@ -8,21 +8,21 @@
 \preamble
 ------------------------------------------------
 The FONTSPEC package for XeLaTeX/LuaLaTeX
-(C)  2004--2016  Will Robertson and Khaled Hosny
+(C)  2004--2017  Will Robertson and Khaled Hosny
 License information appended.
 ------------------------------------------------
 \endpreamble
 \postamble
 ------------------------------------------------
-Copyright 2004--2016 Will Robertson <wspr81@gmail.com>
+Copyright 2004--2017 Will Robertson <wspr81@gmail.com>
 Copyright 2009--2013   Khaled Hosny <khaledhosny@eglug.org>
 
 Distributable under the LaTeX Project Public License, version 1.3c or higher.
 The latest version of this license is at: http://www.latex-project.org/lppl.txt
 
 This work is "maintained" by Will Robertson.
-It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec-example.tex.
-And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
+It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec*.tex.
+And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf.
 ------------------------------------------------
 \endpostamble
 \askforoverwritefalse
@@ -34,34 +34,34 @@ And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
 \generate{\file{fontspec.sty}{
   \from{fontspec.dtx}{fontspec,load\FSDEBUG}
 }}
-\generate{\file{fontspec-xetex.sty}{
-  \from{fontspec.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-vars.dtx}{vars\FSDEBUG}
-  \from{fontspec-msg.dtx}{msg\FSDEBUG}
-  \from{fontspec-opening.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-fontload.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-user.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-api.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-internal.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-keyval.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-math.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-closing.dtx}{fontspec,xetexx\FSDEBUG}
-  \from{fontspec-patches.dtx}{patches\FSDEBUG}
-}}
-\generate{\file{fontspec-luatex.sty}{
-  \from{fontspec.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-vars.dtx}{vars\FSDEBUG}
-  \from{fontspec-msg.dtx}{msg\FSDEBUG}
-  \from{fontspec-opening.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-fontload.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-user.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-api.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-internal.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-keyval.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-math.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-closing.dtx}{fontspec,luatex\FSDEBUG}
-  \from{fontspec-patches.dtx}{patches\FSDEBUG}
-}}
+
+\gdef\FONTSPECDTX{
+  \DTX{fontspec.dtx}
+  \DTX{fontspec-vars.dtx}
+  \DTX{fontspec-msg.dtx}
+  \DTX{fontspec-opening.dtx}
+  \DTX{fontspec-fontload.dtx}
+  \DTX{fontspec-user.dtx}
+  \DTX{fontspec-api.dtx}
+  \DTX{fontspec-internal.dtx}
+  \DTX{fontspec-opentype.dtx}
+  \DTX{fontspec-graphite.dtx}
+  \DTX{fontspec-keyval.dtx}
+  \DTX{fontspec-feat-opentype.dtx}
+  \DTX{fontspec-scripts.dtx}
+  \DTX{fontspec-lang.dtx}
+  \DTX{fontspec-feat-aat.dtx}
+  \DTX{fontspec-enc.dtx}
+  \DTX{fontspec-math.dtx}
+  \DTX{fontspec-closing.dtx}
+  \DTX{fontspec-patches.dtx}
+}
+
+\def\DTX#1{\from{#1}{fontspec,xetexx\FSDEBUG}}
+\generate{\file{fontspec-xetex.sty}{\FONTSPECDTX}}
+
+\def\DTX#1{\from{#1}{fontspec,luatex\FSDEBUG}}
+\generate{\file{fontspec-luatex.sty}{\FONTSPECDTX}}
 
 \def\tmpa{plain}
 \ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
@@ -78,7 +78,7 @@ And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
 %<fontspec&xetexx>\ProvidesExplPackage{fontspec-xetex}%
 %<fontspec&luatex>\ProvidesExplPackage{fontspec-luatex}%
 %<*fontspec>
-  {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/01/02}{2.5c}{Font selection for XeLaTeX and LuaLaTeX}
 %</fontspec>
 %
 %<*driver>
@@ -87,19 +87,14 @@ And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
 \input{fontspec-doc.tex}
 \StopEventually{}
 \part{Implementation}
-\DocInput{fontspec.dtx}
-\DocInput{fontspec-vars.dtx}
-\DocInput{fontspec-opening.dtx}
-\DocInput{fontspec-fontload.dtx}
-\DocInput{fontspec-user.dtx}
-\DocInput{fontspec-api.dtx}
-\DocInput{fontspec-internal.dtx}
-\DocInput{fontspec-keyval.dtx}
-\DocInput{fontspec-math.dtx}
-\DocInput{fontspec-closing.dtx}
-\DocInput{fontspec-lua.dtx}
-\DocInput{fontspec-patches.dtx}
-\DocInput{fontspec-msg.dtx}
+\def\DTX#1{\DocInput{#1}}
+\FONTSPECDTX
+\clearpage
+\PrintChanges
+\clearpage
+\setcounter{IndexColumns}{2}
+\PrintIndex
+\Finale
 \end{document}
 %</driver>
 % \fi
@@ -133,10 +128,4 @@ And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
 \endinput
 %</load>
 %    \end{macrocode}
-% \clearpage
-% \PrintChanges
-% \clearpage
-% \setcounter{IndexColumns}{2}
-% \PrintIndex
-% \Finale
 \endinput
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontrange-OT2.def b/Master/texmf-dist/tex/latex/fontspec/fontrange-OT2.def
new file mode 100644
index 00000000000..b18375da88a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontspec/fontrange-OT2.def
@@ -0,0 +1,7 @@
+
+\DeclareTextSymbol{\CYRIE}{\LastDeclaredEncoding}{"0404}
+\DeclareTextSymbol{\CYRDJE}{\LastDeclaredEncoding}{"0402}
+\DeclareTextSymbol{\CYRTSHE}{\LastDeclaredEncoding}{"040B}
+\DeclareTextSymbol{\cyrnje}{\LastDeclaredEncoding}{"045A}
+\DeclareTextSymbol{\cyrlje}{\LastDeclaredEncoding}{"0459}
+\DeclareTextSymbol{\cyrdzhe}{\LastDeclaredEncoding}{"045F}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontrange-T1.def b/Master/texmf-dist/tex/latex/fontspec/fontrange-T1.def
new file mode 100644
index 00000000000..d8fd90b23d8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontspec/fontrange-T1.def
@@ -0,0 +1,198 @@
+\ProvidesFile{fontrange-T1.def}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% T1 SYMBOLS
+
+\EncodingAccent{\`}{"0300}
+\EncodingAccent{\'}{"0301}
+\EncodingAccent{\^}{"0302}
+\EncodingAccent{\~}{"0303}
+\EncodingAccent{\"}{"0308}
+\EncodingAccent{\H}{"030B}
+\EncodingAccent{\r}{"030A}
+\EncodingAccent{\v}{"030C}
+\EncodingAccent{\u}{"0306}
+\EncodingAccent{\=}{"0304}
+\EncodingAccent{\.}{"0307}
+\EncodingAccent{\b}{"0332}
+\EncodingAccent{\c}{"0327}
+\EncodingAccent{\d}{"0323}
+\EncodingAccent{\k}{"0328}
+%% \textogonekcentered %% not in unicode?
+\EncodingSymbol{\textperthousand}{"2030}
+\EncodingSymbol{\textpertenthousand}{"2031}
+\EncodingSymbol{\AE}{"00C6}
+\EncodingSymbol{\DH}{"00D0}
+\EncodingSymbol{\DJ}{"0110}
+\EncodingSymbol{\L} {"0141}
+\EncodingSymbol{\NG}{"014A}
+\EncodingSymbol{\OE}{"0152}
+\EncodingSymbol{\O} {"00D8}
+\EncodingSymbol{\SS}{"1E9E}
+\EncodingSymbol{\TH}{"00DE}
+\EncodingSymbol{\ae}{"00E6}
+\EncodingSymbol{\dh}{"00F0}
+\EncodingSymbol{\dj}{"0111}
+\EncodingSymbol{\guillemotleft}{"00AB}
+\EncodingSymbol{\guillemotright}{"00BB}
+\EncodingSymbol{\guilsinglleft}{"2039}
+\EncodingSymbol{\guilsinglright}{"203A}
+\EncodingSymbol{\i} {"0131}
+\EncodingSymbol{\j} {"0237}
+\EncodingSymbol{\ij}{"0133}
+\EncodingSymbol{\IJ}{"0132}
+\EncodingSymbol{\l} {"0142}
+\EncodingSymbol{\ng}{"014B}
+\EncodingSymbol{\oe}{"0153}
+\EncodingSymbol{\o} {"00F8}
+\EncodingSymbol{\quotedblbase}{"201E}
+\EncodingSymbol{\quotesinglbase}{"201A}
+\EncodingSymbol{\ss}{"00DF}
+\EncodingSymbol{\textasciicircum}{`\^}
+\EncodingSymbol{\textasciitilde}{`\~}
+\EncodingSymbol{\textbackslash}{`\\}
+\EncodingSymbol{\textbar}{`\|}
+\EncodingSymbol{\textbraceleft}{`\{}
+\EncodingSymbol{\textbraceright}{`\}}
+\EncodingSymbol{\textcompwordmark}{"200C}
+\EncodingSymbol{\textdollar}{`\$}
+\EncodingSymbol{\textemdash}{"2014}
+\EncodingSymbol{\textendash}{"2013}
+\EncodingSymbol{\textexclamdown}{"00A1}
+\EncodingSymbol{\textgreater}{`\>}
+\EncodingSymbol{\textless}{`\<}
+\EncodingSymbol{\textquestiondown}{"00BF}
+\EncodingSymbol{\textquotedblleft}{"201C}
+\EncodingSymbol{\textquotedblright}{"201D}
+\EncodingSymbol{\textquotedbl}{`\"}
+\EncodingSymbol{\textquoteleft}{"2018}
+\EncodingSymbol{\textquoteright}{"2019}
+\EncodingSymbol{\textsection}{"00A7}
+\EncodingSymbol{\textsterling}{"00A3}
+\EncodingSymbol{\textunderscore}{`\_}
+\EncodingSymbol{\textvisiblespace}{"2423}
+\EncodingSymbol{\th}{"00FE}
+\EncodingComposite{\.}{i}{`\i}
+\EncodingComposite{\.}{\i}{`\i}
+\EncodingComposite{\u}{A}{"0102}
+\EncodingComposite{\k}{A}{"0104}
+\EncodingComposite{\'}{C}{"0106}
+\EncodingComposite{\v}{C}{"010C}
+\EncodingComposite{\v}{D}{"010E}
+\EncodingComposite{\v}{E}{"011A}
+\EncodingComposite{\k}{E}{"0118}
+\EncodingComposite{\u}{G}{"011E}
+\EncodingComposite{\'}{L}{"0139}
+\EncodingComposite{\v}{L}{"013D}
+\EncodingComposite{\'}{N}{"0143}
+\EncodingComposite{\v}{N}{"0147}
+\EncodingComposite{\H}{O}{"0150}
+\EncodingComposite{\'}{R}{"0154}
+\EncodingComposite{\v}{R}{"0158}
+\EncodingComposite{\'}{S}{"015A}
+\EncodingComposite{\v}{S}{"0160}
+\EncodingComposite{\c}{S}{"015F}
+\EncodingComposite{\v}{T}{"0164}
+\EncodingComposite{\c}{T}{"0162}
+\EncodingComposite{\H}{U}{"0170}
+\EncodingComposite{\r}{U}{"016E}
+\EncodingComposite{\"}{Y}{"0178}
+\EncodingComposite{\'}{Z}{"017A}
+\EncodingComposite{\v}{Z}{"017D}
+\EncodingComposite{\.}{Z}{"017B}
+\EncodingComposite{\.}{I}{"0130}
+\EncodingComposite{\u}{a}{"0103}
+\EncodingComposite{\k}{a}{"0105}
+\EncodingComposite{\'}{c}{"0107}
+\EncodingComposite{\v}{c}{"010D}
+\EncodingComposite{\v}{d}{"010F}
+\EncodingComposite{\v}{e}{"011B}
+\EncodingComposite{\k}{e}{"0119}
+\EncodingComposite{\u}{g}{"011F}
+\EncodingComposite{\'}{l}{"0139}
+\EncodingComposite{\v}{l}{"013E}
+\EncodingComposite{\'}{n}{"0144}
+\EncodingComposite{\v}{n}{"0148}
+\EncodingComposite{\H}{o}{"0151}
+\EncodingComposite{\'}{r}{"0155}
+\EncodingComposite{\v}{r}{"0159}
+\EncodingComposite{\'}{s}{"015B}
+\EncodingComposite{\v}{s}{"0161}
+\EncodingComposite{\c}{s}{"015F}
+\EncodingComposite{\v}{t}{"0165}
+\EncodingComposite{\c}{t}{"0163}
+\EncodingComposite{\H}{u}{"0171}
+\EncodingComposite{\r}{u}{"016F}
+\EncodingComposite{\"}{y}{"00FF}
+\EncodingComposite{\'}{z}{"00FD}
+\EncodingComposite{\v}{z}{"017E}
+\EncodingComposite{\.}{z}{"017C}
+\EncodingComposite{\`}{A}{"00C0}
+\EncodingComposite{\'}{A}{"00C1}
+\EncodingComposite{\^}{A}{"00C2}
+\EncodingComposite{\~}{A}{"00C3}
+\EncodingComposite{\"}{A}{"00C4}
+\EncodingComposite{\r}{A}{"00C5}
+\EncodingComposite{\c}{C}{"00C7}
+\EncodingComposite{\`}{E}{"00C8}
+\EncodingComposite{\'}{E}{"00C9}
+\EncodingComposite{\^}{E}{"00CA}
+\EncodingComposite{\"}{E}{"00CB}
+\EncodingComposite{\`}{I}{"00CC}
+\EncodingComposite{\'}{I}{"00CD}
+\EncodingComposite{\^}{I}{"00CE}
+\EncodingComposite{\"}{I}{"00CF}
+\EncodingComposite{\~}{N}{"00D1}
+\EncodingComposite{\`}{O}{"00D2}
+\EncodingComposite{\'}{O}{"00D3}
+\EncodingComposite{\^}{O}{"00D4}
+\EncodingComposite{\~}{O}{"00D5}
+\EncodingComposite{\"}{O}{"00D6}
+\EncodingComposite{\`}{U}{"00D9}
+\EncodingComposite{\'}{U}{"00DA}
+\EncodingComposite{\^}{U}{"00DB}
+\EncodingComposite{\"}{U}{"00DC}
+\EncodingComposite{\'}{Y}{"00DD}
+\EncodingComposite{\`}{a}{"00E0}
+\EncodingComposite{\'}{a}{"00E1}
+\EncodingComposite{\^}{a}{"00E2}
+\EncodingComposite{\~}{a}{"00E3}
+\EncodingComposite{\"}{a}{"00E4}
+\EncodingComposite{\r}{a}{"00E5}
+\EncodingComposite{\c}{c}{"00E7}
+\EncodingComposite{\`}{e}{"00E8}
+\EncodingComposite{\'}{e}{"00E9}
+\EncodingComposite{\^}{e}{"00EA}
+\EncodingComposite{\"}{e}{"00EB}
+\EncodingComposite{\`}{i} {"00EC}
+\EncodingComposite{\`}{\i}{"00EC}
+\EncodingComposite{\'}{i} {"00ED}
+\EncodingComposite{\'}{\i}{"00ED}
+\EncodingComposite{\^}{i} {"00EE}
+\EncodingComposite{\^}{\i}{"00EE}
+\EncodingComposite{\"}{i} {"00EF}
+\EncodingComposite{\"}{\i}{"00EF}
+\EncodingComposite{\~}{n}{"00F1}
+\EncodingComposite{\`}{o}{"00F2}
+\EncodingComposite{\'}{o}{"00F3}
+\EncodingComposite{\^}{o}{"00F4}
+\EncodingComposite{\~}{o}{"00F5}
+\EncodingComposite{\"}{o}{"00F6}
+\EncodingComposite{\`}{u}{"00F9}
+\EncodingComposite{\'}{u}{"00FA}
+\EncodingComposite{\^}{u}{"00FB}
+\EncodingComposite{\"}{u}{"00FC}
+\EncodingComposite{\'}{y}{"00FD}
+\EncodingComposite{\k}{o}{"01EB}
+\EncodingComposite{\k}{O}{"01EA}
+
+\EncodingComposite{\c}{G}{"0122}
+\EncodingComposite{\c}{g}{"0123} % note this cedilla is above not below :)
+\EncodingComposite{\c}{K}{"0136}
+\EncodingComposite{\c}{k}{"0137}
+\EncodingComposite{\c}{L}{"013B}
+\EncodingComposite{\c}{l}{"013C}
+\EncodingComposite{\c}{N}{"0145}
+\EncodingComposite{\c}{n}{"0146}
+\EncodingComposite{\c}{R}{"0156}
+\EncodingComposite{\c}{r}{"0157}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontrange-TS1.def b/Master/texmf-dist/tex/latex/fontspec/fontrange-TS1.def
new file mode 100644
index 00000000000..f7e3eb9ca81
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontspec/fontrange-TS1.def
@@ -0,0 +1,134 @@
+\ProvidesFile{fontrange-TS1.def}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% TS1 symbols
+
+\EncodingAccent{\capitalcedilla}{"0327}
+\EncodingAccent{\capitalogonek}{"0328}
+\EncodingAccent{\capitalgrave}{"0300}
+\EncodingAccent{\capitalacute}{"0301}
+\EncodingAccent{\capitalcircumflex}{"0302}
+\EncodingAccent{\capitaltilde}{"0303}
+\EncodingAccent{\capitaldieresis}{"0308}
+\EncodingAccent{\capitalhungarumlaut}{"030B}
+\EncodingAccent{\capitalring}{"030A}
+\EncodingAccent{\capitalcaron}{"030C}
+\EncodingAccent{\capitalbreve}{"0306}
+\EncodingAccent{\capitalmacron}{"0304}
+\EncodingAccent{\capitaldotaccent}{"0307}
+\EncodingAccent{\t}{"0361}
+\EncodingAccent{\capitaltie}{"0361}
+\EncodingAccent{\newtie}{"0311}
+\EncodingAccent{\capitalnewtie}{"0311}
+%%\EncodingSymbol{\textcapitalcompwordmark}{23}
+%%\EncodingSymbol{\textascendercompwordmark}{31}
+\EncodingSymbol{\textquotestraightbase}{"201A}
+\EncodingSymbol{\textquotestraightdblbase}{"201E}
+\EncodingSymbol{\texttwelveudash}{"2015}
+\EncodingSymbol{\textthreequartersemdash}{"2012}
+\EncodingSymbol{\textleftarrow}{"2190}
+\EncodingSymbol{\textrightarrow}{"2192}
+\EncodingSymbol{\textblank}{"2422}
+\EncodingSymbol{\textdollar}{`\$}
+\EncodingSymbol{\textquotesingle}{`\'}
+\EncodingSymbol{\textasteriskcentered}{"204E}
+%% \EncodingSymbol{\textdblhyphen}{45}
+\EncodingSymbol{\textfractionsolidus}{"2044}
+%%\EncodingSymbol{\textzerooldstyle}{48}
+%%\EncodingSymbol{\textoneoldstyle}{49}
+%%\EncodingSymbol{\texttwooldstyle}{50}
+%%\EncodingSymbol{\textthreeoldstyle}{51}
+%%\EncodingSymbol{\textfouroldstyle}{52}
+%%\EncodingSymbol{\textfiveoldstyle}{53}
+%%\EncodingSymbol{\textsixoldstyle}{54}
+%%\EncodingSymbol{\textsevenoldstyle}{55}
+%%\EncodingSymbol{\texteightoldstyle}{56}
+%%\EncodingSymbol{\textnineoldstyle}{57}
+\EncodingSymbol{\textlangle}{"27E8}
+\EncodingSymbol{\textminus}{"2212}
+\EncodingSymbol{\textrangle}{"27E9}
+\EncodingSymbol{\textmho}{"2127}
+\EncodingSymbol{\textbigcircle}{"25EF}
+\EncodingAccent{\textcircled}{"20DD}
+\EncodingSymbol{\textohm}{"2126}
+\EncodingSymbol{\textlbrackdbl}{"301A}
+\EncodingSymbol{\textrbrackdbl}{"301B}
+\EncodingSymbol{\textuparrow}{"2191}
+\EncodingSymbol{\textdownarrow}{"2193}
+\EncodingSymbol{\textasciigrave}{`\`}
+\EncodingSymbol{\textborn}{"2605} %% actually "black star" but close enough
+\EncodingSymbol{\textdivorced}{"26AE}
+\EncodingSymbol{\textdied}{"2020} %% different from "dagger"??
+%% \EncodingSymbol{\textleaf}{108}
+\EncodingSymbol{\textmarried}{"26AD}
+\EncodingSymbol{\textmusicalnote}{"266A}
+\EncodingSymbol{\texttildelow}{"02F7}
+%% \EncodingSymbol{\textdblhyphenchar}{127} %% can't obtain this without deactivating font mapping :(
+\EncodingSymbol{\textasciibreve}{"02D8}
+\EncodingSymbol{\textasciicaron}{"02C7}
+\EncodingSymbol{\textacutedbl}{"02DD}
+\EncodingSymbol{\textgravedbl}{"02F5}
+\EncodingSymbol{\textdagger}{"2020}
+\EncodingSymbol{\textdaggerdbl}{"2021}
+\EncodingSymbol{\textbardbl}{"2016}
+\EncodingSymbol{\textperthousand}{"2030}
+\EncodingSymbol{\textbullet}{"2022}
+\EncodingSymbol{\textcelsius}{"2103}
+%% \EncodingSymbol{\textdollaroldstyle}{138}
+%% \EncodingSymbol{\textcentoldstyle}{139}
+\EncodingSymbol{\textflorin}{"0192}
+\EncodingSymbol{\textcolonmonetary}{"20A1}
+\EncodingSymbol{\textwon}{"20A9}
+\EncodingSymbol{\textnaira}{"20A6}
+%% \EncodingSymbol{\textguarani}{144}
+\EncodingSymbol{\textpeso}{"20B1}
+\EncodingSymbol{\textlira}{"20A4}
+\EncodingSymbol{\textrecipe}{"211E}
+\EncodingSymbol{\textinterrobang}{"203D}
+\EncodingSymbol{\textinterrobangdown}{"2E18}
+\EncodingSymbol{\textdong}{"20AB}
+\EncodingSymbol{\texttrademark}{"2122}
+\EncodingSymbol{\textpertenthousand}{"2031}
+\EncodingSymbol{\textpilcrow}{"00B6}
+\EncodingSymbol{\textbaht}{"0E3F}
+\EncodingSymbol{\textnumero}{"2116}
+\EncodingSymbol{\textdiscount}{"2052}
+\EncodingSymbol{\textestimated}{"212E}
+\EncodingSymbol{\textopenbullet}{"25E6}
+\EncodingSymbol{\textservicemark}{"2120}
+\EncodingSymbol{\textlquill}{"2045}
+\EncodingSymbol{\textrquill}{"2046}
+\EncodingSymbol{\textcent}{"00A2}
+\EncodingSymbol{\textsterling}{"00A3}
+\EncodingSymbol{\textcurrency}{"00A4}
+\EncodingSymbol{\textyen}{"00A5}
+\EncodingSymbol{\textbrokenbar}{"00A6}
+\EncodingSymbol{\textsection}{"00A7}
+\EncodingSymbol{\textasciidieresis}{"00A8}
+\EncodingSymbol{\textcopyright}{"00A9}
+\EncodingSymbol{\textordfeminine}{"00AA}
+%% \EncodingSymbol{\textcopyleft}{171}
+\EncodingSymbol{\textlnot}{"00AC}
+\EncodingSymbol{\textcircledP}{"2117}
+\EncodingSymbol{\textregistered}{"00AE}
+\EncodingSymbol{\textasciimacron}{"00AF}
+\EncodingSymbol{\textdegree}{"00B0}
+\EncodingSymbol{\textpm}{"00B1}
+\EncodingSymbol{\texttwosuperior}{"00B2}
+\EncodingSymbol{\textthreesuperior}{"00B3}
+\EncodingSymbol{\textasciiacute}{"00B4}
+\EncodingSymbol{\textmu}{"00B5}
+\EncodingSymbol{\textparagraph}{"00B6}
+\EncodingSymbol{\textperiodcentered}{"00B7}
+\EncodingSymbol{\textreferencemark}{"203B}
+\EncodingSymbol{\textonesuperior}{"00B9}
+\EncodingSymbol{\textordmasculine}{"00BA}
+\EncodingSymbol{\textsurd}{"221A}
+\EncodingSymbol{\textonequarter}{"00BC}
+\EncodingSymbol{\textonehalf}{"00BD}
+\EncodingSymbol{\textthreequarters}{"00BE}
+\EncodingSymbol{\texteuro}{"20AC}
+\EncodingSymbol{\texttimes}{"00D7}
+\EncodingSymbol{\textdiv}{"00F7}
+
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-doc-style.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-doc-style.sty
new file mode 100644
index 00000000000..3d7fe1232a0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-doc-style.sty
@@ -0,0 +1,283 @@
+\ProvidesPackage{fontspec-doc-style}
+
+\usepackage{fontspec,booktabs,calc,caption,color,enumitem,flafter,fancyvrb,hologo,graphicx,
+  ifthen,url,varioref,varwidth,microtype,tocloft,framed,xparse,docmute}
+
+%% Various labelling commands:
+\newcommand*\name[1]{{#1}}
+\newcommand*\pkg[1]{\textsf{#1}}
+\newcommand*\opt[1]{\texttt{#1}}
+\newcommand*\feat[1]{\texttt{#1}}
+
+\let\latin\textit
+\def\eg{\latin{e.g.}}
+\def\ie{\latin{i.e.}}
+\def\Eg{\latin{E.g.}}
+\def\Ie{\latin{I.e.}}
+\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
+
+\newcommand\note[1]{\unskip\footnote{#1}}
+
+\def\MacOSX{Mac~OS~X}
+\def\AAT{\textsc{aat}}
+\def\ATSUI{\textsc{atsui}}
+
+\newcommand\NFSS{\textsc{nfss}}
+\newcommand\XeTeX{\hologo{XeTeX}}
+\newcommand\XeLaTeX{\hologo{XeLaTeX}}
+\newcommand\LuaTeX{\hologo{LuaTeX}}
+\newcommand\LuaLaTeX{\hologo{LuaLaTeX}}
+
+% ToC formatting:
+\setlength\cftsubsecnumwidth{1.4\cftsubsecnumwidth}
+%\def\@cfttocstart{\small\begin{multicols}{2}}
+%\def\@cfttocfinish{\end{multicols}}
+
+\fvset{gobble=0}
+
+\captionsetup[table]{position=above}
+\captionsetup[figure]{position=above}
+
+
+%% Fonts
+
+\defaultfontfeatures{Numbers=OldStyle}
+\IfFontExistsTF{AldusNovaPro-Book.otf}
+  {
+    \setmainfont{aldus-nova}
+    \setsansfont{palatino-sans-light}
+  }
+  {
+\setmainfont{texgyrepagella}[
+  Extension = .otf,
+  UprightFont = *-regular ,
+  ItalicFont  = *-italic  ,
+  BoldFont    = *-bold    ,
+  BoldItalicFont = *-bolditalic ,
+]
+\setsansfont{texgyreheros}[
+  Extension = .otf,
+  UprightFont = *-regular ,
+  ItalicFont  = *-italic  ,
+  BoldFont    = *-bold    ,
+  BoldItalicFont = *-bolditalic ,
+]
+  }
+\setmonofont{lmmonolt10-regular.otf}[BoldFont=lmmonolt10-bold.otf]
+\newfontfamily\ttcondensed{lmmonoltcond10-regular.otf}
+
+%% (La)TeX font-related declarations:
+\linespread{1.05}      % Pagella needs more space between lines
+\frenchspacing         % Remove ugly extra space after punctuation
+
+\usepackage[
+  bookmarks=true,
+  colorlinks=true,
+  linkcolor=niceblue,
+  urlcolor=niceblue,
+  citecolor=niceblue,
+  pdftitle={The fontspec package},
+  pdfsubject={Advanced font selection for XeLaTeX/LuaLaTeX},
+  pdfauthor={Will Robertson},
+  pdfkeywords={xetex, xelatex, luatex, lualatex, unicode, opentype, aat}
+  ]{hyperref}
+
+
+
+%% ToC
+\def\@dotsep{1000}
+\setcounter{tocdepth}{2}
+\setlength\columnseprule{0.4pt}
+\renewcommand\tableofcontents{\relax
+  \begin{multicols}{2}[\section*{\contentsname}]\relax
+    \@starttoc{toc}\relax
+  \end{multicols}}
+
+
+%% Index
+\setcounter{IndexColumns}{2}
+\renewenvironment{theglossary}
+  {\small\list{}{}
+     \item\relax
+     \glossary@prologue\GlossaryParms
+     \let\item\@idxitem \ignorespaces
+     \def\pfill{\hspace*{\fill}}}
+  {\endlist}
+
+
+
+%% varioref definitions:
+\labelformat{table}{Table~#1}
+\labelformat{section}{Section~#1}
+\labelformat{subsection}{Section~#1}
+
+\definecolor{niceblue}{rgb}{0.1,0.2,0.8}
+
+
+
+
+%% EXAMPLES
+
+\newsavebox\X
+\newsavebox\Y
+
+\newcounter{example}
+
+\newcommand\exref[1]{Example~\ref{ex:#1}}
+\newcommand\Exref[1]{Example~\ref{ex:#1}}
+
+\newenvironment{Xexample}[3][]
+  {\VerbatimEnvironment\begin{Fexample}[#1]{#2}{#3}{X}}
+  {\end{Fexample}}
+
+\newenvironment{Lexample}[3][]
+  {\VerbatimEnvironment\begin{Fexample}[#1]{#2}{#3}{L}}
+  {\end{Fexample}}
+
+\newenvironment{Fexample}[4][]
+  {%
+    \def\options{#1}%
+    \def\filename{#2}%
+    \def\captiontext{#3}%
+    \def\prefix{#4}
+    \refstepcounter{example}%
+    \label{ex:\filename}%
+    \IfFileExists{zzz-\theexample-\prefix-\filename.tex}{}{%
+      \immediate\write18{rm -f zzz-\theexample-* ;}%
+    }%
+    \VerbatimEnvironment
+    \begin{VerbatimOut}{zzz-\theexample-\prefix-\filename.tex}}
+% text in the environment
+  {\end{VerbatimOut}
+    \begin{figure}
+      \setlength\parindent{0pt}%
+      \edef\@tempa{[gobble=0,fontsize=\noexpand\small,\options]}%
+      \savebox\X{%
+                  \expandafter\BVerbatimInput
+                  \@tempa{zzz-\theexample-\prefix-\filename.tex}%
+                }%
+      \IfFileExists{zzz-\theexample-\prefix-\filename.pdf}{}
+         {%
+           \edef\XXcmd{%
+             \unexpanded{%
+               \RequirePackage{luatex85}
+               \documentclass[margin=0.2mm]{standalone}
+               \usepackage{booktabs,ifthen,graphicx,xcolor,varwidth}
+               \usepackage{fontspec}
+               \defaultfontfeatures{Ligatures=TeX}
+               \begin{document}
+               \begin{varwidth}{0.7\linewidth}
+               \input} zzz-\theexample-\prefix-\filename.tex
+             \unexpanded{
+               \end{varwidth}
+               \end{document}
+             }%
+           }%
+           \edef\1{%
+             \csname prog@\prefix\endcsname "\unexpanded\expandafter{\XXcmd}";
+             printf '\@percentchar s' '\unexpanded\expandafter{\XXcmd}' > zzz-\theexample-\prefix-\filename-test.tex;
+           }%
+           \immediate\write18{\unexpanded\expandafter{\1}}%
+         }%
+      \savebox\Y{%
+      \IfFileExists{zzz-\theexample-\prefix-\filename.pdf}
+          {\includegraphics{zzz-\theexample-\prefix-\filename.pdf}}
+          {\color{red}\itshape ---Graphic not generated---}%
+      }
+      % TYPESETTING
+      \rule[0.5\baselineskip]{\columnwidth}{1pt}%
+      \vspace{-1.2ex}%
+      \def\@tempa{\small\textsf{Example~\theexample:~}}%
+      \settowidth\@tempdima{\@tempa\captiontext}%
+      \par
+      \ifdim\@tempdima>\linewidth
+        \settowidth\@tempdima{\@tempa}%
+        \@tempa\parbox[t]{\linewidth-\@tempdima}{\small\captiontext}%
+        \vspace{0.4\baselineskip}%
+      \else
+        \parbox{\linewidth}{\centering\@tempa~\captiontext}%
+      \fi
+      \par\rule[0.4\baselineskip]{\columnwidth}{0.4pt}\par
+      \ifdim\dimexpr\wd\X+\wd\Y>\linewidth\relax
+        \null\hfill\makebox[0pt][r]{\usebox\Y}\usebox\X
+      \else
+        \hfill\usebox\Y\hfill\usebox\X
+      \fi
+      \par\rule[0.5\baselineskip]{\columnwidth}{1pt}
+    \end{figure}
+}
+
+\def\prog@X{xelatex
+               -jobname=zzz-\theexample-X-\filename\space}
+
+\def\prog@L{lualatex
+               -jobname=zzz-\theexample-L-\filename\space}
+
+%%%%%%%%%%%%%%%%%%%%%%
+
+\newcommand*\setexsize[1]{\let\examplesize#1}
+\newcommand*\setverbwidth[1]{\def\auxwidth{#1}}
+
+
+
+\newcounter{argument}
+\g@addto@macro\endmacro{\setcounter{argument}{0}}
+\newcommand*\darg[1]{%
+  \stepcounter{argument}%
+  \noindent{\ttfamily\char`\#\theargument~:~}#1\par}
+\newcommand*\doarg[1]{%
+  \stepcounter{argument}%
+  \noindent{\ttfamily\makebox[0pt][r]{[}\char`\#\theargument]:~}#1\par}
+
+\newcommand\unichar[2]{\textsc{\MakeLowercase{u+#1: #2}}}
+
+\newcommand\cmdbox[1]{%
+  \smallskip\par\noindent
+  \fbox{\begin{varwidth}{\linewidth}
+    #1%
+  \end{varwidth}}%
+  \smallskip
+}
+\def\CMD#1{\texttt{\null#1\unskip}}
+
+
+\NewDocumentCommand \otf {somm} {%
+  \featname & #3 & \texttt{#4}
+  \IfBooleanT #1 { & \textdagger }
+  \\
+}
+\newenvironment{features}[1]{%
+  \def\NOTE{}
+  \def\thisfeatname{#1}%
+  \def\featname{\thisfeatname~~\texttt=~~\null\gdef\featname{}}%
+  \begin{table}
+    \caption{Options for the OpenType font feature `\thisfeatname'.}
+    \edef\@tempa{\noexpand\label{feat:\thisfeatname}}\@tempa
+    \centering
+    \begin{tabular}{@{}l@{}l@{\hspace{0.5\tabcolsep}}l@{\hspace{0.5\tabcolsep}}l@{}}
+    \toprule
+    Feature & Option & Tag & \\
+    \midrule
+}{
+    \bottomrule
+    \end{tabular}
+    \par\smallskip
+    \footnotesize
+    \textdagger\ These feature options can be disabled with \texttt{..Off} variants, and reset \\ to default state (neither explicitly on nor off) with \texttt{..Reset}.
+    \NOTE
+  \end{table}
+}
+
+
+%%%%%%%%%%%
+
+\def \MakePrivateLetters {%
+  \catcode `\@ = 11
+  \catcode `\_ = 11
+  \catcode `\: = 11
+}
+
+%% for LaTeX3 csnames
+\catcode `\_= 11
+
+\renewcommand\partname{Part}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index da5b9ac1558..4679d8c63d5 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -5,26 +5,33 @@
 %% The original source files were:
 %%
 %% fontspec.dtx  (with options: `fontspec,luatex')
-%% fontspec-vars.dtx  (with options: `vars')
-%% fontspec-msg.dtx  (with options: `msg')
+%% fontspec-vars.dtx  (with options: `fontspec,luatex')
+%% fontspec-msg.dtx  (with options: `fontspec,luatex')
 %% fontspec-opening.dtx  (with options: `fontspec,luatex')
 %% fontspec-fontload.dtx  (with options: `fontspec,luatex')
 %% fontspec-user.dtx  (with options: `fontspec,luatex')
 %% fontspec-api.dtx  (with options: `fontspec,luatex')
 %% fontspec-internal.dtx  (with options: `fontspec,luatex')
+%% fontspec-opentype.dtx  (with options: `fontspec,luatex')
+%% fontspec-graphite.dtx  (with options: `fontspec,luatex')
 %% fontspec-keyval.dtx  (with options: `fontspec,luatex')
+%% fontspec-feat-opentype.dtx  (with options: `fontspec,luatex')
+%% fontspec-scripts.dtx  (with options: `fontspec,luatex')
+%% fontspec-lang.dtx  (with options: `fontspec,luatex')
+%% fontspec-feat-aat.dtx  (with options: `fontspec,luatex')
+%% fontspec-enc.dtx  (with options: `fontspec,luatex')
 %% fontspec-math.dtx  (with options: `fontspec,luatex')
 %% fontspec-closing.dtx  (with options: `fontspec,luatex')
-%% fontspec-patches.dtx  (with options: `patches')
+%% fontspec-patches.dtx  (with options: `fontspec,luatex')
 %% ------------------------------------------------
 %% The FONTSPEC package for XeLaTeX/LuaLaTeX
-%% (C)  2004--2016  Will Robertson and Khaled Hosny
+%% (C)  2004--2017  Will Robertson and Khaled Hosny
 %% License information appended.
 %% ------------------------------------------------
 \RequirePackage{expl3}
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec-luatex}%
-  {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/01/02}{2.5c}{Font selection for XeLaTeX and LuaLaTeX}
 \bool_new:N \l__fontspec_firsttime_bool
 \bool_new:N \l__fontspec_nobf_bool
 \bool_new:N \l__fontspec_noit_bool
@@ -43,30 +50,93 @@
 \bool_new:N \g__fontspec_cfg_bool
 \bool_new:N \g__fontspec_math_bool
 \bool_new:N \g__fontspec_euenc_bool
-\int_new:N \l_fontspec_script_int
-\int_new:N \l_fontspec_language_int
-\int_new:N \l_fontspec_strnum_int
+\bool_new:N \l__fontspec_disable_defaults_bool
+\bool_new:N \l__fontspec_alias_bool
+\bool_new:N \l__fontspec_external_bool
+\bool_new:N \l__fontspec_never_check_bool
+\bool_new:N \l__fontspec_defining_encoding_bool
+\bool_new:N \l__fontspec_script_exist_bool
+\int_new:N \l__fontspec_script_int
+\int_new:N \l__fontspec_language_int
+\int_new:N \l__fontspec_strnum_int
+\int_new:N \l__fontspec_tmp_int
+\int_new:N \l__fontspec_em_int
+\int_new:N \l__fontspec_emdef_int
 \fp_new:N \l__fontspec_tmpa_fp
 \fp_new:N \l__fontspec_tmpb_fp
 \dim_new:N \l__fontspec_tmpa_dim
 \dim_new:N \l__fontspec_tmpb_dim
 \dim_new:N \l__fontspec_tmpc_dim
-\tl_set:Nx \c_colon_str { \tl_to_str:N : }
-\cs_set:Npn \use_v:nnnnn #1#2#3#4#5 {#5}
-\cs_set:Npn \use_iv:nnnnn #1#2#3#4#5 {#4}
-\cs_generate_variant:Nn \str_if_eq:nnTF {nv}
-\cs_generate_variant:Nn \int_set:Nn {Nv}
-\cs_generate_variant:Nn \keys_set:nn {nx}
-\cs_generate_variant:Nn \keys_set_known:nnN {nx}
-\cs_generate_variant:Nn \tl_if_empty:nTF {x}
-\cs_generate_variant:Nn \tl_if_empty:nTF {x}
-\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
+\seq_new:N \g__fontspec_bf_series_seq
+\clist_new:N \g__fontspec_default_fontopts_clist
+\clist_new:N \g__fontspec_all_keyval_modules_clist
+\clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}}
+\prop_new:N \g__fontspec_fontopts_prop
+\prop_new:N \l__fontspec_nfss_prop
+\prop_new:N \l__fontspec_nfssfont_prop
+\prop_new:N \g__fontspec_OT_features_prop
+\prop_new:N \g__fontspec_all_opentype_feature_names_prop
+\prop_new:N \g__fontspec_em_prop
+\tl_new:N \g__fontspec_mathrm_tl
+\tl_new:N \g__fontspec_bfmathrm_tl
+\tl_new:N \g__fontspec_mathsf_tl
+\tl_new:N \g__fontspec_mathtt_tl
+\tl_new:N \l__fontspec_family_label_tl
+\tl_new:N \l__fontspec_fake_slant_tl
+\tl_new:N \l__fontspec_fake_embolden_tl
+\tl_new:N \l__fontspec_fontname_up_tl
+\tl_new:N \l__fontspec_fontname_bf_tl
+\tl_new:N \l__fontspec_fontname_it_tl
+\tl_new:N \l__fontspec_fontname_bfit_tl
+\tl_new:N \l__fontspec_fontname_sl_tl
+\tl_new:N \l__fontspec_fontname_bfsl_tl
+\tl_new:N \l__fontspec_fontname_sc_tl
+\tl_new:N \l__fontspec_fontfeat_up_clist
+\tl_new:N \l__fontspec_fontfeat_bf_clist
+\tl_new:N \l__fontspec_fontfeat_it_clist
+\tl_new:N \l__fontspec_fontfeat_bfit_clist
+\tl_new:N \l__fontspec_fontfeat_sl_clist
+\tl_new:N \l__fontspec_fontfeat_bfsl_clist
+\tl_new:N \l__fontspec_fontfeat_sc_clist
+\tl_new:N \l__fontspec_script_name_tl
+\tl_new:N \l_fontspec_script_tl
+\tl_new:N \l__fontspec_lang_name_tl
+\tl_new:N \l_fontspec_lang_tl
+\tl_new:N  \g__fontspec_hexcol_tl
+\tl_new:N  \g__fontspec_opacity_tl
+\tl_set:Nn \g__fontspec_hexcol_tl {000000}
+\tl_set:Nn \g__fontspec_opacity_tl {FF~}
+\tl_set:Nn \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl }
+\cs_new:Nn \__fontspec_keys_set_known:nnN
+  {
+    \keys_set_known:nnN {#1} {#2} #3
+  }
+\cs_generate_variant:Nn \__fontspec_keys_set_known:nnN {nx}
+\cs_set:Npn \__fontspec_head_ii:n #1 { \__fontspec_head_ii:w #1 *** \q_stop}
+\cs_set:Npn \__fontspec_head_ii:w #1#2#3 \q_stop { #1#2 }
+\cs_generate_variant:Nn \__fontspec_head_ii:n {o}
 \cs_new:Nn \__fontspec_int_mult_truncate:Nn
   {
     \int_set:Nn #1 { \__dim_eval:w #2 #1 \__dim_eval_end: }
   }
+\cs_generate_variant:Nn \int_set:Nn {Nv}
+\cs_generate_variant:Nn \keys_set:nn {nx}
+\cs_generate_variant:Nn \keys_set_known:nnN {nx}
+\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
+\cs_generate_variant:Nn \prop_put:Nnn {NxV}
+\cs_generate_variant:Nn \prop_gput:Nnn  {NxV}
+\cs_generate_variant:Nn \prop_gput:Nnn  {Nxn}
+\cs_generate_variant:Nn \prop_get:NnNT  {NxN}
+\cs_generate_variant:Nn \prop_get:NnNTF {NxN}
+\cs_generate_variant:Nn \str_if_eq:nnTF {nv}
+\cs_generate_variant:Nn \tl_if_empty:nTF {x}
+\cs_generate_variant:Nn \tl_if_empty:nF {x}
+\cs_generate_variant:Nn \tl_if_empty:nF {f}
+\cs_generate_variant:Nn \tl_if_eq:nnT {ox}
+\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
 
 \cs_new:Npn \__fontspec_error:n     { \msg_error:nn     {fontspec} }
+\cs_new:Npn \__fontspec_error:nn    { \msg_error:nnn    {fontspec} }
 \cs_new:Npn \__fontspec_error:nx    { \msg_error:nnx    {fontspec} }
 \cs_new:Npn \__fontspec_warning:n   { \msg_warning:nn   {fontspec} }
 \cs_new:Npn \__fontspec_warning:nx  { \msg_warning:nnx  {fontspec} }
@@ -75,190 +145,226 @@
 \cs_new:Npn \__fontspec_info:nx     { \msg_info:nnx     {fontspec} }
 \cs_new:Npn \__fontspec_info:nxx    { \msg_info:nnxx    {fontspec} }
 \cs_new:Npn \__fontspec_trace:n     { \msg_trace:nn     {fontspec} }
-\msg_new:nnn {fontspec} {no-size-info}
+\cs_generate_variant:Nn \msg_new:nnn  {nnx}
+\cs_generate_variant:Nn \msg_new:nnnn {nnxx}
+\cs_new:Nn \__fontspec_msg_new:nnn
+  { \msg_new:nnx {#1} {#2} { \tl_trim_spaces:n {#3} } }
+\cs_new:Nn \__fontspec_msg_new:nnnn
+  { \msg_new:nnxx {#1} {#2} { \tl_trim_spaces:n {#3} } { \tl_trim_spaces:n {#4} } }
+\char_set_catcode_space:n {32}
+\__fontspec_msg_new:nnn {fontspec} {only-inside-encdef}
+ {
+  \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.\\
+  For example, SizeFeatures={Size={8-12},...}.
+ }
+\__fontspec_msg_new:nnnn {fontspec} {font-not-found}
+ {
+  The font "#1" cannot be found.
+ }
  {
-  Size~ information~ must~ be~ supplied.\\
-  For~ example,~ SizeFeatures={Size={8-12},...}.
+  A font might not be found for many reasons.\\
+  Check the spelling, where the font is installed etc. etc.\\\\
+  When in doubt, ask someone for help!
  }
-\msg_new:nnnn {fontspec} {font-not-found}
+\__fontspec_msg_new:nnnn {fontspec} {rename-feature-not-exist}
  {
-  The~ font~ "#1"~ cannot~ be~ found.
+  The feature #1 doesn't appear to be defined.
  }
  {
-  A~font~might~not~be~found~for~many~reasons.\\
-  Check~the~spelling,~where~the~font~is~installed~etc.~etc.\\\\
-  When~in~doubt,~ask~someone~for~help!
+  It looks like you're trying to rename a feature that doesn't exist.
  }
-\msg_new:nnnn {fontspec} {rename-feature-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {no-glyph}
  {
-  The~ feature~ #1~ doesn't~ appear~ to~ be~ defined.
+  '\l_fontspec_fontname_tl' does not contain glyph #1.
  }
+\__fontspec_msg_new:nnnn {fontspec} {euler-too-late}
  {
-  It~ looks~ like~ you're~ trying~ to~ rename~ a~ feature~ that~ doesn't~ exist.
+  The euler package must be loaded BEFORE fontspec.
  }
-\msg_new:nnn {fontspec} {no-glyph}
  {
-  '\l_fontspec_fontname_tl'~ does~ not~ contain~ glyph~ #1.
+  fontspec only overwrites euler's attempt to
+  define the maths text fonts if fontspec is
+  loaded after euler. Type <return> to proceed
+  with incorrect \string\mathit, \string\mathbf, etc.
  }
-\msg_new:nnnn {fontspec} {euler-too-late}
+\__fontspec_msg_new:nnnn {fontspec} {no-xcolor}
  {
-  The~ euler~ package~ must~ be~ loaded~ BEFORE~ fontspec.
+  Cannot load named colours without the xcolor package.
  }
  {
-  fontspec~ only~ overwrites~ euler's~ attempt~ to~
-  define~ the~ maths~ text~ fonts~ if~ fontspec~ is~
-  loaded~ after~ euler.~ Type~ <return>~ to~ proceed~
-  with~ incorrect~ \string\mathit,~ \string\mathbf,~ etc.
+  Sorry, I can't do anything to help. Instead of loading
+  the color package, use xcolor instead.
  }
-\msg_new:nnnn {fontspec} {no-xcolor}
+\__fontspec_msg_new:nnnn {fontspec} {unknown-color-model}
  {
-  Cannot~ load~ named~ colours~ without~ the~ xcolor~ package.
+  Error loading colour `#1'; unknown colour model.
  }
  {
-  Sorry,~ I~ can't~ do~ anything~ to~ help.~ Instead~ of~ loading~
-  the~ color~ package,~ use~ xcolor~ instead.~ It's~ better.
+  Sorry, I can't do anything to help. Please report this error
+  to my developer with a minimal example that causes the problem.
  }
-\msg_new:nnnn {fontspec} {unknown-color-model}
+\__fontspec_msg_new:nnnn {fontspec} {not-in-addfontfeatures}
  {
-  Error~ loading~ colour~ `#1';~ unknown~ colour~ model.
+  The "#1" font feature cannot be used in \string\addfontfeatures.
  }
  {
-  Sorry,~ I~ can't~ do~ anything~ to~ help.~ Please~ report~ this~ error~
-  to~ my~ developer~ with~ a~ minimal~ example~ that~ causes~ the~ problem.
+  This is due to how TeX loads fonts; such settings
+  are global so adding them mid-document within a group causes
+  confusion. You'll need to define multiple font families to achieve
+  what you want.
  }
-\msg_new:nnnn {fontspec} {not-in-addfontfeatures}
+\__fontspec_msg_new:nnn {fontspec} {tu-clash}
  {
-  The~ "#1"~ font~ feature~ cannot~ be~ used~ in~ \string\addfontfeatures.
+  I have found the tuenc.def encoding definition file but the TU encoding is not
+  defined by the LaTeX2e kernel; attempting to correct but you really should update
+  to the latest version of LaTeX2e.
  }
+\__fontspec_msg_new:nnn {fontspec} {tu-missing}
  {
-  This~ is~ due~ to~ how~ TeX~ loads~ fonts;~ such~ settings~
-  are~ global~ so~ adding~ them~ mid-document~ within~ a~ group~ causes~
-  confusion.~ You'll~ need~ to~ define~ multiple~ font~ families~ to~ achieve~
-  what~ you~ want.
+  The TU encoding seems to be missing; please update to the latest version of LaTeX2e.
  }
-\msg_new:nnn {fontspec} {addfontfeatures-ignored}
+\__fontspec_msg_new:nnn {fontspec} {addfontfeatures-ignored}
  {
-  \string\addfontfeature (s)~ ignored~ \msg_line_context:;~
-  it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ a~ fontspec~ command.\\
+  \string\addfontfeature (s) ignored \msg_line_context:;
+  it cannot be used with a font that wasn't selected by a fontspec command.\\
   \\
-  The~ current~ font~ is~ "\use:c{font@name}".\\
+  The current font is "\use:c{font@name}".\\
   \int_compare:nTF { \clist_count:n {#1} = 1 }
-    { The~ requested~ feature~ is~ "#1". }
-    { The~ requested~ features~ are~ "#1". }
+    { The requested feature is "#1". }
+    { The requested features are "#1". }
+ }
+\__fontspec_msg_new:nnn {fontspec} {feature-option-overwrite}
+ {
+  Option '#2' of font feature '#1' overwritten.
  }
-\msg_new:nnn {fontspec} {feature-option-overwrite}
+\__fontspec_msg_new:nnn {fontspec} {script-not-exist-latn}
  {
-  Option~ '#2'~ of~ font~ feature~ '#1'~ overwritten.
+  Font '\l_fontspec_fontname_tl' does not contain script '#1'.\\
+  'Latin' script used instead.
  }
-\msg_new:nnn {fontspec} {script-not-exist-latn}
+\__fontspec_msg_new:nnn {fontspec} {script-not-exist}
  {
-  Font~ '\l_fontspec_fontname_tl'~ does~ not~ contain~ script~ '#1'.\\
-  'Latin'~ script~ used~ instead.
+  Font '\l_fontspec_fontname_tl' does not contain script '#1'.
  }
-\msg_new:nnn {fontspec} {script-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {aat-feature-not-exist}
  {
-  Font~ '\l_fontspec_fontname_tl'~ does~ not~ contain~ script~ '#1'.
+  '\l_keys_key_tl=\l_keys_value_tl' feature not supported
+  for AAT font '\l_fontspec_fontname_tl'.
  }
-\msg_new:nnn {fontspec} {aat-feature-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {aat-feature-not-exist-in-font}
  {
-  '\l_keys_key_tl=\l_keys_value_tl'~ feature~ not~ supported~
-  for~ AAT~ font~ '\l_fontspec_fontname_tl'.
+  AAT feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
+  in font '\l_fontspec_fontname_tl'.
  }
-\msg_new:nnn {fontspec} {aat-feature-not-exist-in-font}
+\__fontspec_msg_new:nnn {fontspec} {icu-feature-not-exist}
  {
-  AAT~ feature~ '\l_keys_key_tl=\l_keys_value_tl'~ (#1)~ not~ available~
-  in~ font~ '\l_fontspec_fontname_tl'.
+  '\l_keys_key_tl=\l_keys_value_tl' feature not supported
+  for OpenType font '\l_fontspec_fontname_tl'
  }
-\msg_new:nnn {fontspec} {icu-feature-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {icu-feature-not-exist-in-font}
  {
-  '\l_keys_key_tl=\l_keys_value_tl'~ feature~ not~ supported~
-  for~ OpenType~ font~ '\l_fontspec_fontname_tl'
+  OpenType feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
+  for font '\l_fontspec_fontname_tl'
+  with script '\l__fontspec_script_name_tl' and language '\l__fontspec_lang_name_tl'.
  }
-\msg_new:nnn {fontspec} {icu-feature-not-exist-in-font}
+\__fontspec_msg_new:nnn {fontspec} {no-opticals}
  {
-  OpenType~ feature~ '\l_keys_key_tl=\l_keys_value_tl'~ (#1)~ not~ available~
-  for~ font~ '\l_fontspec_fontname_tl'~
-  with~ script~ '\l__fontspec_script_name_tl'~ and~ language~ '\l__fontspec_lang_name_tl'.
+  '\l_fontspec_fontname_tl' doesn't appear to have an Optical Size axis.
  }
-\msg_new:nnn {fontspec} {no-opticals}
+\__fontspec_msg_new:nnn {fontspec} {language-not-exist}
  {
-  '\l_fontspec_fontname_tl'~ doesn't~ appear~ to~ have~ an~ Optical~ Size~ axis.
+  Language '#1' not available
+  for font '\l_fontspec_fontname_tl'
+  with script '\l__fontspec_script_name_tl'.\\
+  'Default' language used instead.
  }
-\msg_new:nnn {fontspec} {language-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {only-xetex-feature}
  {
-  Language~ '#1'~ not~ available~
-  for~ font~ '\l_fontspec_fontname_tl'~
-  with~ script~ '\l__fontspec_script_name_tl'.\\
-  'Default'~ language~ used~ instead.
+  Ignored XeTeX only feature: '#1'.
  }
-\msg_new:nnn {fontspec} {only-xetex-feature}
+\__fontspec_msg_new:nnn {fontspec} {only-luatex-feature}
  {
-  Ignored~ XeTeX~ only~ feature:~ '#1'.
+  Ignored LuaTeX only feature: '#1'.
  }
-\msg_new:nnn {fontspec} {only-luatex-feature}
+\__fontspec_msg_new:nnn {fontspec} {no-mapping}
  {
-  Ignored~ LuaTeX~ only~ feature:~ '#1'.
+  Input mapping not (yet?) supported in LuaTeX.
  }
-\msg_new:nnn {fontspec} {no-mapping}
+\__fontspec_msg_new:nnn {fontspec} {no-mapping-ligtex}
  {
-  Input~ mapping~ not~ (yet?)~ supported~ in~ LuaTeX.
+  Input mapping not (yet?) supported in LuaTeX.\\
+  Use "Ligatures=TeX" instead of "Mapping=tex-text".
  }
-\msg_new:nnn {fontspec} {no-mapping-ligtex}
+\__fontspec_msg_new:nnn {fontspec} {cm-default-obsolete}
  {
-  Input~ mapping~ not~ (yet?)~ supported~ in~ LuaTeX.\\
-  Use~ "Ligatures=TeX"~ instead~ of~ "Mapping=tex-text".
+  The "cm-default" package option is obsolete.
  }
-\msg_new:nnn {fontspec} {cm-default-obsolete}
+\__fontspec_msg_new:nnn {fontspec} {fakebold-only-xetex}
  {
-  The~ "cm-default"~ package~ option~ is~ obsolete.
+  The "FakeBold" and "AutoFakeBold" options are only available with XeLaTeX.\\
+  Option ignored.
  }
-\msg_new:nnn {fontspec} {fakebold-only-xetex}
+\__fontspec_msg_new:nnn {fontspec} {font-index-needs-ttc}
  {
-  The~ "FakeBold"~ and~ "AutoFakeBold"~ options~ are~ only~ available~ with~ XeLaTeX.\\
-  Option~ ignored.
+  The "FontIndex" feature is only supported by TTC (TrueType Collection) fonts.\\
+  Feature ignored.
  }
-\msg_new:nnn {fontspec} {defining-font}
+\__fontspec_msg_new:nnn {fontspec} {feat-cannot-remove}
  {
-  Font~ family~'\l_fontspec_family_tl'~ created~ for~ font~ '#2'~
-  with~ options~ [\l__fontspec_all_features_clist].\\
+  The "#1" feature cannot be deactivated. Request ignored.
+ }
+\__fontspec_msg_new:nnn {fontspec} {defining-font}
+ {
+  Font family '\l_fontspec_family_tl' created for font '#2'
+  with options [\l__fontspec_all_features_clist].\\
   \\
-  This~ font~ family~ consists~ of~ the~ following~ NFSS~ series/shapes:\\
+  This font family consists of the following NFSS series/shapes:\\
   \l_fontspec_defined_shapes_tl
  }
-\msg_new:nnn {fontspec} {no-font-shape}
+\__fontspec_msg_new:nnn {fontspec} {no-font-shape}
  {
-  Could~ not~ resolve~ font~ #1~ (it~ probably~ doesn't~ exist).
+  Could not resolve font "#1" (it probably doesn't exist).
  }
-\msg_new:nnn {fontspec} {set-scale}
+\__fontspec_msg_new:nnn {fontspec} {set-scale}
  {
-  \l_fontspec_fontname_tl\space scale ~=~ \l__fontspec_scale_tl.
+  \l_fontspec_fontname_tl\space scale = \l__fontspec_scale_tl.
  }
-\msg_new:nnn {fontspec} {setup-math}
+\__fontspec_msg_new:nnn {fontspec} {setup-math}
  {
-  Adjusting~ the~ maths~ setup~ (use~ [no-math]~ to~ avoid~ this).
+  Adjusting the maths setup (use [no-math] to avoid this).
  }
-\msg_new:nnn {fontspec} {no-scripts}
+\__fontspec_msg_new:nnn {fontspec} {no-scripts}
  {
-  Font~ \l_fontspec_fontname_tl\space does~ not~ contain~ any~ OpenType~ `Script'~ information.
+  Font "\l_fontspec_fontname_tl" does not contain any OpenType `Script' information.
  }
-\msg_new:nnn {fontspec} {opa-twice}
+\__fontspec_msg_new:nnn {fontspec} {opa-twice}
  {
-  Opacity~ set~ twice,~ in~ both~ Colour~ and~ Opacity.\\
-  Using~ specification~ "Opacity=#1".
+  Opacity set twice, in both Colour and Opacity.\\
+  Using specification "Opacity=#1".
  }
-\msg_new:nnn {fontspec} {opa-twice-col}
+\__fontspec_msg_new:nnn {fontspec} {opa-twice-col}
  {
-  Opacity~ set~ twice,~ in~ both~ Opacity~ and~ Colour.\\
-  Using~ an~ opacity~ specification~ in~ hex~ of~ "#1/FF".
+  Opacity set twice, in both Opacity and Colour.\\
+  Using an opacity specification in hex of "#1/FF".
  }
-\msg_new:nnn {fontspec} {bad-colour}
+\__fontspec_msg_new:nnn {fontspec} {bad-colour}
  {
-  Bad~ colour~ declaration~ "#1".~
-  Colour~ must~ be~ one~ of:\\
-  *~ a~ named~ xcolor~ colour\\
-  *~ a~ six-digit~ hex~ colour~ RRGGBB\\
-  *~ an~ eight-digit~ hex~ colour~ RRGGBBTT~ with~ opacity
+  Bad colour declaration "#1".
+  Colour must be one of:\\
+  * a named xcolor colour\\
+  * a six-digit hex colour RRGGBB\\
+  * an eight-digit hex colour RRGGBBTT with opacity
  }
+\char_set_catcode_ignore:n {32}
 \DeclareOption{cm-default}
  { \__fontspec_warning:n {cm-default-obsolete} }
 \DeclareOption{math}{\bool_set_true:N \g__fontspec_math_bool}
@@ -277,20 +383,35 @@
   \msg_redirect_module:nnn { fontspec } { warning } { none }
   \msg_redirect_module:nnn { fontspec } { info } { none }
  }
-\ExecuteOptions{config,math,euenc}
+\ExecuteOptions{config,math,tuenc}
 \ProcessOptions*
-\tl_set:Nn \g_fontspec_encoding_tl {TU}
-\file_if_exist:nF {tuenc.def} { \bool_set_true:N \g__fontspec_euenc_bool }
-\bool_if:NT \g__fontspec_euenc_bool
+\bool_if:NF \g__fontspec_euenc_bool
+  {
+    \file_if_exist:nTF {tuenc.def}
+      {
+        \cs_if_exist:cF {T@TU}
+          {
+            \__fontspec_warning:n {tu-clash}
+            \DeclareFontEncoding{TU}{}{}
+            \DeclareFontSubstitution{TU}{lmr}{m}{n}
+          }
+      }
+      {
+        \__fontspec_warning:n {tu-missing}
+        \bool_set_true:N \g__fontspec_euenc_bool
+      }
+  }
+\bool_if:NTF \g__fontspec_euenc_bool
   {
     \tl_set:Nn \g_fontspec_encoding_tl {EU2}
   }
+  { \tl_set:Nn \g_fontspec_encoding_tl { TU } }
 \tl_set:Nn \rmdefault {lmr}
 \tl_set:Nn \sfdefault {lmss}
 \tl_set:Nn \ttdefault {lmtt}
 \RequirePackage[\g_fontspec_encoding_tl]{fontenc}
 \tl_set_eq:NN \UTFencname \g_fontspec_encoding_tl % for xunicode if needed
-\normalsize % to overcome the encoding changing the current font size
+\tl_if_in:NnT \@filelist {.cls} { \normalsize }
 \tl_set_eq:NN \cyrillicencoding \g_fontspec_encoding_tl
 \tl_set_eq:NN \latinencoding    \g_fontspec_encoding_tl
 \AtBeginDocument
@@ -306,23 +427,19 @@
     \cs_set_eq:NN \XeTeXpicfile \fontspec_tmp:
   }
 
-\cs_set:Nn \__fontspec_fontwrap:n { "#1" }
 \cs_set:Npn \__fontspec_primitive_font_set:Nnn #1#2#3
   {
     \font #1 = #2 ~at~ #3 \scan_stop:
   }
-
 \cs_set:Npn \__fontspec_primitive_font_gset:Nnn #1#2#3
   {
     \global \font #1 = #2 ~at~ #3 \scan_stop:
   }
-
 \cs_set:Npn \__fontspec_font_suppress_not_found_error:
   {
     \int_set_eq:NN \xetex_suppressfontnotfounderror:D \c_one
   }
-
-\prg_set_conditional:Nnn \__fontspec_font_if_null:N {p,TF,T,F}
+\prg_set_conditional:Nnn \__fontspec_primitive_font_if_null:N {p,TF,T,F}
   {
     \ifx #1 \nullfont
       \prg_return_true:
@@ -330,102 +447,95 @@
       \prg_return_false:
     \fi
   }
-\cs_new:Nn \__fontspec_font_set:Nnn
- {
-  \__fontspec_primitive_font_set:Nnn  #1 { \__fontspec_fontwrap:n {#2} } {#3}
- }
-\cs_new:Nn \__fontspec_font_gset:Nnn
- {
-  \__fontspec_primitive_font_gset:Nnn #1 { \__fontspec_fontwrap:n {#2} } {#3}
- }
-\prg_new_conditional:Nnn \font_glyph_if_exist:Nn {p,TF,T,F}
- {
-  \etex_iffontchar:D #1 #2 \scan_stop:
-    \prg_return_true:
-  \else:
-    \prg_return_false:
-  \fi:
- }
-\cs_new:Nn \__fontspec_pass_args:nnn
- {
-  \IfNoValueTF {#2}
-   { \__fontspec_post_arg:w {#1} {#3} }
-   { #1 {#2} {#3} }
- }
-\NewDocumentCommand \__fontspec_post_arg:w { m m O{} }
- { #1 {#3} {#2} }
-\NewDocumentCommand \fontspec { o m }
- { \__fontspec_pass_args:nnn \__fontspec_fontspec:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_fontspec:nn
+\prg_set_conditional:Nnn \__fontspec_primitive_font_if_exist:n {TF,T,F}
+  {
+    \group_begin:
+      \__fontspec_font_suppress_not_found_error:
+      \__fontspec_primitive_font_set:Nnn \l__fontspec_primitive_font {#1} {10pt}
+      \__fontspec_primitive_font_if_null:NTF \l__fontspec_primitive_font
+        { \group_end: \prg_return_false: }
+        { \group_end: \prg_return_true:  }
+  }
+\prg_new_conditional:Nnn \__fontspec_primitive_font_glyph_if_exist:Nn {p,TF,T,F}
+  {
+    \etex_iffontchar:D #1 #2 \scan_stop:
+      \prg_return_true:
+    \else:
+      \prg_return_false:
+    \fi:
+  }
+\NewDocumentCommand \fontspec { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \f@family {#1} {#2}
+  \fontspec_set_family:Nnn \f@family {#1,#3} {#2}
   \fontencoding { \l__fontspec_nfss_enc_tl }
   \selectfont
   \ignorespaces
  }
-\DeclareDocumentCommand \setmainfont { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmainfont:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmainfont:nn
+\DeclareDocumentCommand \setmainfont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \rmdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily }
+   {
+    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g__fontspec_rmfamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
-
-\DeclareDocumentCommand \setsansfont { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setsansfont:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setsansfont:nn
+\DeclareDocumentCommand \setsansfont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \sfdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \sffamily }
+   {
+    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g__fontspec_sffamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
-
-\DeclareDocumentCommand \setmonofont { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmonofont:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmonofont:nn
+\DeclareDocumentCommand \setmonofont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \ttdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily }
+   {
+    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g__fontspec_ttfamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
 \cs_set_eq:NN \setromanfont \setmainfont
-\tl_new:N \g__fontspec_mathrm_tl
-\tl_new:N \g__fontspec_bfmathrm_tl
-\tl_new:N \g__fontspec_mathsf_tl
-\tl_new:N \g__fontspec_mathtt_tl
-\DeclareDocumentCommand \setmathrm { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmathrm:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmathrm:nn
+\DeclareDocumentCommand \setmathrm { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setboldmathrm { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setboldmathrm:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setboldmathrm:nn
+\DeclareDocumentCommand \setboldmathrm { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_bfmathrm_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setmathsf { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmathsf:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmathsf:nn
+\DeclareDocumentCommand \setmathsf { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setmathtt { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmathtt:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmathtt:nn
+\DeclareDocumentCommand \setmathtt { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {#1} {#2}
  }
@@ -436,12 +546,9 @@
 \tl_set:Nn \g__fontspec_mathrm_tl {\rmdefault}
 \tl_set:Nn \g__fontspec_mathsf_tl {\sfdefault}
 \tl_set:Nn \g__fontspec_mathtt_tl {\ttdefault}
-\DeclareDocumentCommand \newfontfamily { m o m }
- { \__fontspec_pass_args:nnn { \__fontspec_newfontfamily:Nnn #1 } {#2} {#3} }
-
-\cs_new:Nn \__fontspec_newfontfamily:Nnn
+\DeclareDocumentCommand \newfontfamily { m O{} m O{} }
  {
-  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3}
+  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2,#4} {#3}
   \use:x
    {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1
@@ -452,15 +559,10 @@
      }
    }
  }
-\DeclareDocumentCommand \newfontface { m o m }
- { \__fontspec_pass_args:nnn { \__fontspec_newfontface:Nnn #1 } {#2} {#3} }
-
-\cs_new:Nn \__fontspec_newfontface:Nnn
+\DeclareDocumentCommand \newfontface { m O{} m O{} }
  {
-  \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
+  \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
  }
-\clist_new:N \g__fontspec_default_fontopts_clist
-\prop_new:N \g__fontspec_fontopts_prop
 \DeclareDocumentCommand \defaultfontfeatures { t+ o m }
  {
   \IfNoValueTF {#2}
@@ -495,20 +597,6 @@
      }
    }
  }
-\cs_new:Nn \__fontspec_sanitise_fontname:Nn
- {
-  \tl_set:Nx #1 {#2}
-  \tl_remove_all:Nn #1 {~}
-  \clist_map_inline:Nn \l__fontspec_extensions_clist
-   {
-     \tl_if_in:NnT #1 {##1}
-       {
-         \tl_remove_once:Nn #1 {##1}
-         \clist_map_break:
-       }
-   }
- }
-\bool_new:N \l__fontspec_disable_defaults_bool
 \DeclareDocumentCommand \addfontfeatures {m}
  {
   \fontspec_if_fontspec_font:TF
@@ -520,7 +608,7 @@
       \bool_set_true:N \l__fontspec_disable_defaults_bool
       \use:x
        {
-        \exp_not:N \fontspec_select:nn
+        \__fontspec_select_font_family:nn
           { \l__fontspec_options_tl , #1 } {\l__fontspec_fontname_tl}
        }
     \group_end:
@@ -545,49 +633,57 @@
 \DeclareDocumentCommand \newAATfeature {mmmm}
  {
   \keys_if_exist:nnF { fontspec } {#1}
-    { \__fontspec_define_font_feature:n {#1} }
+    { \__fontspec_define_aat_feature_group:n {#1} }
   \keys_if_choice_exist:nnnT {fontspec} {#1} {#2}
     { \__fontspec_warning:nxx {feature-option-overwrite} {#1} {#2} }
-  \__fontspec_define_feature_option:nnnnn {#1}{#2}{#3}{#4}{}
+  \__fontspec_define_aat_feature:nnnn {#1}{#2}{#3}{#4}
  }
 \DeclareDocumentCommand \newopentypefeature {mmm}
  {
   \keys_if_exist:nnF { fontspec / options } {#1}
-    { \__fontspec_define_font_feature:n {#1} }
+    { \__fontspec_define_opentype_feature_group:n {#1} }
   \keys_if_choice_exist:nnnT {fontspec} {#1} {#2}
     { \__fontspec_warning:nxx {feature-option-overwrite} {#1} {#2} }
-  \__fontspec_define_feature_option:nnnnn {#1}{#2}{}{}{#3}
+  \__fontspec_define_opentype_feature:nnn {#1}{#2}{#3}
  }
 \cs_set_eq:NN \newICUfeature \newopentypefeature % deprecated
-\bool_new:N \l__fontspec_alias_bool
 \DeclareDocumentCommand \aliasfontfeature {mm}
  {
   \bool_set_false:N \l__fontspec_alias_bool
 
   \clist_map_inline:nn
-   { fontspec, fontspec-preparse, fontspec-preparse-external,
+   { fontspec, fontspec-opentype, fontspec-aat, fontspec-preparse, fontspec-preparse-external,
      fontspec-preparse-nested, fontspec-renderer }
    {
 
      \keys_if_exist:nnT {##1} {#1}
       {
         \bool_set_true:N \l__fontspec_alias_bool
-        \__fontspec_alias_font_feature:nnn {##1} {#1} {#2}
+        \keys_define:nn {##1}
+          { #2 .code:n = { \keys_set:nn {##1} { #1 = {####1} } } }
       }
    }
 
   \bool_if:NF \l__fontspec_alias_bool
     { \__fontspec_warning:nx {rename-feature-not-exist} {#1} }
  }
+\DeclareDocumentCommand \aliasfontfeatureoption {mmm}
+ {
+  \bool_set_false:N \l__fontspec_alias_bool
 
-\cs_set:Nn \__fontspec_alias_font_feature:nnn
-  {
-    \keys_define:nn {#1}
-      { #3 .code:n = { \keys_set:nn {#1} { #2 = {##1} } } }
-  }
+  \clist_map_inline:Nn \g__fontspec_all_keyval_modules_clist
+   {
 
-\DeclareDocumentCommand \aliasfontfeatureoption {mmm}
-  { \keys_define:nn { fontspec / #1 } { #3 .meta:n = {#2} } }
+     \keys_if_exist:nnT {##1} {#1}
+      {
+        \bool_set_true:N \l__fontspec_alias_bool
+        \keys_define:nn { ##1 / #1 } { #3 .meta:n = {#2} }
+      }
+   }
+
+  \bool_if:NF \l__fontspec_alias_bool
+    { \__fontspec_warning:nx {rename-feature-not-exist} {#1} }
+ }
 \DeclareDocumentCommand \newfontscript {mm}
  {
   \fontspec_new_script:nn {#1} {#2}
@@ -603,6 +699,31 @@
  }
 \DeclareFontsExtensions{.otf,.ttf,.OTF,.TTF,.ttc,.TTC,.dfont}
 
+\DeclareDocumentCommand \IfFontFeatureActiveTF {mmm}
+  {
+    \__fontspec_if_font_feature:nTF {#1} {#2} {#3}
+  }
+\prg_new_conditional:Nnn \__fontspec_if_font_feature:n {TF}
+  {
+    \tl_gclear:N \g__fontspec_single_feat_tl
+    \group_begin:
+      \__fontspec_font_suppress_not_found_error:
+      \__fontspec_init:
+      \bool_set_true:N \l__fontspec_ot_bool
+      \bool_set_true:N \l__fontspec_never_check_bool
+      \bool_set_false:N \l__fontspec_firsttime_bool
+      \clist_clear:N \l__fontspec_fontfeat_clist
+      \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist {#1}
+    \group_end:
+
+
+    \tl_if_empty:NTF \g__fontspec_single_feat_tl { \prg_return_false: }
+      {
+        \exp_args:NV \fontspec_if_current_feature:nTF \g__fontspec_single_feat_tl
+          { \prg_return_true: } { \prg_return_false: }
+      }
+  }
+
 \prg_new_conditional:Nnn \fontspec_if_fontspec_font: {TF,T,F}
  {
   \cs_if_exist:cTF {g__fontspec_ \f@family _prop} \prg_return_true: \prg_return_false:
@@ -612,10 +733,10 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \bool_if:NTF \l__fontspec_atsui_bool
      {
-      \fontspec_make_AAT_feature_string:nnTF {#1}{#2}
+      \__fontspec_make_AAT_feature_string:nnTF {#1}{#2}
         \prg_return_true: \prg_return_false:
      }
      {
@@ -631,7 +752,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool \prg_return_true: \prg_return_false:
    }
@@ -644,20 +765,20 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-num} \l__fontspec_tmp_tl
-      \int_set:Nn \l_fontspec_script_int {\l__fontspec_tmp_tl}
+      \int_set:Nn \l__fontspec_script_int {\l__fontspec_tmp_tl}
 
       \prop_get:cnN {g__fontspec_ \f@family _prop} {lang-num} \l__fontspec_tmp_tl
-      \int_set:Nn \l_fontspec_language_int {\l__fontspec_tmp_tl}
+      \int_set:Nn \l__fontspec_language_int {\l__fontspec_tmp_tl}
 
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
       \prop_get:cnN {g__fontspec_ \f@family _prop} {lang-tag}  \l_fontspec_lang_tl
 
-      \fontspec_check_ot_feat:nTF {#1} {\prg_return_true:} {\prg_return_false:}
+      \__fontspec_check_ot_feat:nTF {#1} {\prg_return_true:} {\prg_return_false:}
      }
      {
       \prg_return_false:
@@ -672,13 +793,13 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
-      \fontspec_iv_str_to_num:Nn \l_fontspec_script_int {#1}
-      \fontspec_iv_str_to_num:Nn \l_fontspec_language_int {#2}
-      \fontspec_check_ot_feat:nTF {#3} \prg_return_true: \prg_return_false:
+      \__fontspec_iv_str_to_num:Nn \l__fontspec_script_int {#1}
+      \__fontspec_iv_str_to_num:Nn \l__fontspec_language_int {#2}
+      \__fontspec_check_ot_feat:nTF {#3} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -689,11 +810,11 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
-      \fontspec_check_script:nTF {#1} \prg_return_true: \prg_return_false:
+      \__fontspec_check_script:nTF {#1} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -704,15 +825,15 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-num} \l__fontspec_tmp_tl
-      \int_set:Nn \l_fontspec_script_int {\l__fontspec_tmp_tl}
+      \int_set:Nn \l__fontspec_script_int {\l__fontspec_tmp_tl}
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
 
-      \fontspec_check_lang:nTF {#1} \prg_return_true: \prg_return_false:
+      \__fontspec_check_lang:nTF {#1} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -723,13 +844,13 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
       \tl_set:Nn \l_fontspec_script_tl {#1}
-      \fontspec_iv_str_to_num:Nn \l_fontspec_script_int {#1}
-      \fontspec_check_lang:nTF {#2} \prg_return_true: \prg_return_false:
+      \__fontspec_iv_str_to_num:Nn \l__fontspec_script_int {#1}
+      \__fontspec_check_lang:nTF {#2} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -740,7 +861,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
@@ -757,7 +878,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
@@ -772,48 +893,104 @@
 \cs_new:Nn \fontspec_set_family:Nnn
  {
   \tl_set:Nn \l__fontspec_family_label_tl { #1 }
-  \fontspec_select:nn {#2}{#3}
+  \__fontspec_select_font_family:nn {#2}{#3}
   \tl_set_eq:NN #1 \l_fontspec_family_tl
  }
 \cs_generate_variant:Nn \fontspec_set_family:Nnn {c}
 \cs_new:Nn \fontspec_set_fontface:NNnn
  {
   \tl_set:Nn \l__fontspec_family_label_tl { #1 }
-  \fontspec_select:nn {#3}{#4}
+  \__fontspec_select_font_family:nn {#3}{#4}
   \tl_set_eq:NN #1 \l_fontspec_font
   \tl_set_eq:NN #2 \l_fontspec_family_tl
  }
-\cs_set:Nn \fontspec_select:nn
+\prg_new_conditional:Nnn \fontspec_font_if_exist:n {TF,T,F}
+  {
+    \group_begin:
+      \__fontspec_init:
+      \__fontspec_if_detect_external:nT {#1} { \__fontspec_font_is_file: }
+      \__fontspec_primitive_font_if_exist:nTF { \__fontspec_construct_font_call:nn {#1} {} }
+        { \group_end: \prg_return_true: }
+        { \group_end: \prg_return_false:  }
+  }
+\cs_set_eq:NN \IfFontExistsTF \fontspec_font_if_exist:nTF
+
+\prg_new_conditional:Nnn \fontspec_if_current_feature:n {TF,T,F}
+  {
+    \exp_args:Nxx \tl_if_in:nnTF
+      { \fontname\font } { \tl_to_str:n {#1} }
+      { \prg_return_true: } { \prg_return_false: }%
+  }
+
+\cs_new_protected:Nn \__fontspec_select_font_family:nn
  {
   \group_begin:
   \__fontspec_font_suppress_not_found_error:
   \__fontspec_init:
 
-  \tl_set:Nx \l_fontspec_fontname_tl    {#2}
-  \tl_set:Nx \l_fontspec_fontname_up_tl {#2}
-  \tl_set:Nx \l__fontspec_basename_tl          {#2}
+  \__fontspec_sanitise_fontname:Nn \l_fontspec_fontname_tl    {#2}
+  \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_up_tl {#2}
+  \__fontspec_sanitise_fontname:Nn \l__fontspec_basename_tl          {#2}
+
+  \__fontspec_if_detect_external:nT {#2}
+   { \keys_set:nn {fontspec-preparse-external} {Path} }
 
+  \__fontspec_init_ttc:n {#2}
   \__fontspec_load_external_fontoptions:Nn \l_fontspec_fontname_tl {#2}
+
   \__fontspec_extract_all_features:n {#1}
-  \__fontspec_preparse_features:
+  \tl_set:Nx \l__fontspec_fontid_tl { \tl_to_str:N \l_fontspec_fontname_tl-:-\tl_to_str:N \l__fontspec_all_features_clist }
+
 
+  \__fontspec_preparse_features:
   \__fontspec_load_font:
   \__fontspec_set_scriptlang:
   \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist {}
   \bool_set_false:N \l__fontspec_firsttime_bool
 
-  \__fontspec_save_family:nTF {#2}
+  \__fontspec_save_family_needed:nTF {#2}
    {
-    \__fontspec_save_fontinfo:
-    \__fontspec_find_autofonts:
-    \DeclareFontFamily{\l__fontspec_nfss_enc_tl}{\l_fontspec_family_tl}{}
-    \__fontspec_set_faces:
-    \__fontspec_info:nxx {defining-font} {#1} {#2}
+     \__fontspec_save_family:nn {#1} {#2}
    }
    {
    }
   \group_end:
  }
+\cs_set_eq:NN \fontspec_select:nn \__fontspec_select_font_family:nn
+\cs_new:Nn \__fontspec_sanitise_fontname:Nn
+ {
+  \tl_set:Nx #1 {#2}
+  \tl_remove_all:Nn #1 {~}
+  \clist_map_inline:Nn \l__fontspec_extensions_clist
+   {
+     \tl_if_in:NnT #1 {##1}
+       {
+         \tl_remove_once:Nn #1 {##1}
+         \tl_set:Nn \l__fontspec_extension_tl {##1}
+         \clist_map_break:
+       }
+   }
+ }
+\prg_new_conditional:Nnn \__fontspec_if_detect_external:n {T}
+ {
+  \clist_map_inline:Nn \l__fontspec_extensions_clist
+   {
+    \bool_set_false:N \l__fontspec_tmpa_bool
+    \exp_args:Nx % <- this should be handled earlier
+    \tl_if_in:nnT {#1 <= end_of_string} {##1 <= end_of_string}
+      { \bool_set_true:N \l__fontspec_tmpa_bool \clist_map_break: }
+   }
+  \bool_if:NTF \l__fontspec_tmpa_bool \prg_return_true: \prg_return_false:
+ }
+\cs_new:Nn \__fontspec_init_ttc:n
+ {
+  \str_if_eq_x:nnT { \str_lower_case:f {\l__fontspec_extension_tl} } {.ttc}
+   {
+    \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_it_tl   {#1}
+    \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bf_tl   {#1}
+    \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bfit_tl {#1}
+   }
+ }
 \cs_new:Nn \__fontspec_load_external_fontoptions:Nn
  {
   \__fontspec_sanitise_fontname:Nn #1 {#2}
@@ -847,64 +1024,68 @@
       #1
      }
    }
-  \tl_set:Nx \l__fontspec_fontid_tl { \tl_to_str:N \l_fontspec_fontname_tl-:-\tl_to_str:N \l__fontspec_all_features_clist }
  }
 \cs_new:Nn \__fontspec_preparse_features:
  {
-  \__fontspec_if_detect_external:VT \l__fontspec_basename_tl
-   { \keys_set:nn {fontspec-preparse-external} {ExternalLocation} }
 
-  \keys_set_known:nxN {fontspec-preparse-external}
+  \__fontspec_keys_set_known:nxN {fontspec-preparse-external}
    { \l__fontspec_all_features_clist }
    \l__fontspec_keys_leftover_clist
-  \tl_set_eq:NN \l_fontspec_fontname_tl \l_fontspec_fontname_up_tl
-  \keys_set_known:nxN {fontspec-renderer} {\l__fontspec_keys_leftover_clist}
+
+  \tl_set_eq:NN \l_fontspec_fontname_tl \l__fontspec_fontname_up_tl
+  \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_keys_leftover_clist}
     \l__fontspec_keys_leftover_clist
-  \keys_set_known:nxN {fontspec-preparse} {\l__fontspec_keys_leftover_clist}
+  \__fontspec_keys_set_known:nxN {fontspec-preparse} {\l__fontspec_keys_leftover_clist}
     \l__fontspec_fontfeat_clist
  }
 \cs_new:Nn \__fontspec_load_font:
  {
-  \__fontspec_font_set:Nnn    \l_fontspec_font
-     { \__fontspec_fullname:n {\l_fontspec_fontname_up_tl} } {\f@size pt}
-  \__fontspec_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {\l_fontspec_fontname_up_tl} }
+  \__fontspec_primitive_font_set:Nnn \l_fontspec_font
+     { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } {} } {\f@size pt}
+  \__fontspec_primitive_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {\l__fontspec_fontname_up_tl} }
   \__fontspec_set_font_type:
-  \__fontspec_font_gset:Nnn   \l_fontspec_font
-     { \__fontspec_fullname:n {\l_fontspec_fontname_up_tl} } {\f@size pt}
+  \__fontspec_primitive_font_gset:Nnn \l_fontspec_font
+     { \__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
  }
-\prg_new_conditional:Nnn \__fontspec_if_detect_external:n {T}
+\cs_set:Nn \__fontspec_construct_font_call:nnnnnn
  {
-  \clist_map_inline:Nn \l__fontspec_extensions_clist
-   {
-    \bool_set_false:N \l__fontspec_tmpa_bool
-    \tl_if_in:nnT {#1 <= end_of_string} {##1 <= end_of_string}
-      { \bool_set_true:N \l__fontspec_tmpa_bool \clist_map_break: }
-   }
-  \bool_if:NTF \l__fontspec_tmpa_bool \prg_return_true: \prg_return_false:
+  " \__fontspec_fontname_wrap:n { #1 #2 #3 } #4 #5
+    \str_if_eq_x:nnF {#6}{} {:#6} "
  }
-\cs_generate_variant:Nn \__fontspec_if_detect_external:nT {V}
-\cs_set:Nn \__fontspec_fullname:n
+\cs_set:Nn \__fontspec_construct_font_call:nn
  {
-  \__fontspec_namewrap:n { #1 \l__fontspec_extension_tl }
-  \l_fontspec_renderer_tl
-  \l__fontspec_optical_size_tl
+  \__fontspec_construct_font_call:nnnnnn
+    {#1}
+    \l__fontspec_extension_tl
+    \l__fontspec_ttc_index_tl
+    \l_fontspec_renderer_tl
+    \l__fontspec_optical_size_tl
+    {#2}
  }
+\cs_new:Nn \__fontspec_font_is_name:
+  {
+    \cs_set_eq:NN \__fontspec_fontname_wrap:n \use:n
+  }
+\cs_new:Nn \__fontspec_font_is_file:
+  {
+    \cs_set:Npn \__fontspec_fontname_wrap:n ##1 { file:\l__fontspec_font_path_tl ##1 }
+  }
 \cs_new:Nn \__fontspec_set_scriptlang:
  {
   \bool_if:NT \l__fontspec_firsttime_bool
    {
     \tl_if_empty:NTF \l__fontspec_script_name_tl
      {
-      \fontspec_check_script:nTF {latn}
+      \__fontspec_check_script:nTF {latn}
        {
         \tl_set:Nn \l__fontspec_script_name_tl {Latin}
         \tl_if_empty:NT \l__fontspec_lang_name_tl
          {
           \tl_set:Nn \l__fontspec_lang_name_tl {Default}
          }
-        \keys_set:nx {fontspec} {Script=\l__fontspec_script_name_tl}
-        \keys_set:nx {fontspec} {Language=\l__fontspec_lang_name_tl}
+        \keys_set:nx {fontspec-opentype} {Script=\l__fontspec_script_name_tl}
+        \keys_set:nx {fontspec-opentype} {Language=\l__fontspec_lang_name_tl}
        }
        {
         \__fontspec_info:n {no-scripts}
@@ -915,13 +1096,29 @@
        {
         \tl_set:Nn \l__fontspec_lang_name_tl {Default}
        }
-      \keys_set:nx {fontspec} {Script=\l__fontspec_script_name_tl}
-      \keys_set:nx {fontspec} {Language=\l__fontspec_lang_name_tl}
+      \keys_set:nx {fontspec-opentype} {Script=\l__fontspec_script_name_tl}
+      \keys_set:nx {fontspec-opentype} {Language=\l__fontspec_lang_name_tl}
      }
    }
  }
-\prg_new_conditional:Nnn \__fontspec_save_family:n {TF}
+\cs_set:Nn \__fontspec_get_features:Nn
+ {
+  \__fontspec_init_fontface:
+  \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2}
+    \l__fontspec_keys_leftover_clist
+  \__fontspec_keys_set_known:nxN {fontspec} {\l__fontspec_keys_leftover_clist} \l__fontspec_keys_leftover_clist
+  \keys_set:nx {fontspec-opentype} {\l__fontspec_keys_leftover_clist}
+
+  \str_if_eq_x:nnF { \l__fontspec_hexcol_tl \l__fontspec_opacity_tl }
+                   { \g__fontspec_hexcol_tl \g__fontspec_opacity_tl }
+    { \__fontspec_update_featstr:n { color = \l__fontspec_hexcol_tl\l__fontspec_opacity_tl } }
+
+  \tl_set_eq:NN #1 \l__fontspec_rawfeatures_sclist
+ }
+\prg_new_conditional:Nnn \__fontspec_save_family_needed:n {TF}
  {
+
+
   \cs_if_exist:NT \l__fontspec_nfss_fam_tl
    {
     \cs_set_eq:cN {g__fontspec_UID_\l__fontspec_fontid_tl} \l__fontspec_nfss_fam_tl
@@ -945,51 +1142,58 @@
   \cs_if_exist:cTF {g__fontspec_ \l_fontspec_family_tl _prop}
     \prg_return_false: \prg_return_true:
  }
-\cs_new:Nn \__fontspec_save_fontinfo:
+\cs_new:Nn \__fontspec_save_family:nn
+  {
+    \__fontspec_save_fontinfo:n {#2}
+    \__fontspec_find_autofonts:
+    \DeclareFontFamily{\l__fontspec_nfss_enc_tl}{\l_fontspec_family_tl}{}
+    \__fontspec_set_faces:
+    \__fontspec_info:nxx {defining-font} {#1} {#2}
+  }
+\cs_new:Nn \__fontspec_save_fontinfo:n
  {
   \prop_new:c {g__fontspec_ \l_fontspec_family_tl _prop}
-  \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {fontname} { \l__fontspec_basename_tl }
+  \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {fontname} { #1 }
   \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {options}  { \l__fontspec_all_features_clist }
   \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {fontdef}
    {
-    \__fontspec_fullname:n {\l_fontspec_fontname_tl} :
-    \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist
+    \__fontspec_construct_font_call:nn {\l_fontspec_fontname_tl}
+      { \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist }
    }
-  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {script-num} \l_fontspec_script_int
-  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {lang-num} \l_fontspec_language_int
+  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {script-num} \l__fontspec_script_int
+  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {lang-num} \l__fontspec_language_int
   \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {script-tag} \l_fontspec_script_tl
   \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {lang-tag} \l_fontspec_lang_tl
-
  }
 \cs_new:Nn \__fontspec_find_autofonts:
  {
   \bool_if:nF {\l__fontspec_noit_bool || \l__fontspec_nobf_bool}
    {
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_it_tl} {/B}
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_bf_tl} {/I}
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_tl} {/BI}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfit_tl {\l__fontspec_fontname_it_tl} {/B}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfit_tl {\l__fontspec_fontname_bf_tl} {/I}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfit_tl {\l_fontspec_fontname_tl} {/BI}
    }
 
   \bool_if:NF \l__fontspec_nobf_bool
    {
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bf_tl {\l_fontspec_fontname_tl} {/B}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bf_tl {\l_fontspec_fontname_tl} {/B}
    }
 
   \bool_if:NF \l__fontspec_noit_bool
    {
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_it_tl {\l_fontspec_fontname_tl} {/I}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_it_tl {\l_fontspec_fontname_tl} {/I}
    }
 
-  \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfsl_tl {\l_fontspec_fontname_sl_tl} {/B}
+  \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfsl_tl {\l__fontspec_fontname_sl_tl} {/B}
  }
 \cs_new:Nn \__fontspec_set_faces:
  {
   \__fontspec_add_nfssfont:nnnn \mddefault \updefault \l_fontspec_fontname_tl      \l__fontspec_fontfeat_up_clist
-  \__fontspec_add_nfssfont:nnnn \bfdefault \updefault \l_fontspec_fontname_bf_tl   \l__fontspec_fontfeat_bf_clist
-  \__fontspec_add_nfssfont:nnnn \mddefault \itdefault \l_fontspec_fontname_it_tl   \l__fontspec_fontfeat_it_clist
-  \__fontspec_add_nfssfont:nnnn \mddefault \sldefault \l_fontspec_fontname_sl_tl   \l__fontspec_fontfeat_sl_clist
-  \__fontspec_add_nfssfont:nnnn \bfdefault \itdefault \l_fontspec_fontname_bfit_tl \l__fontspec_fontfeat_bfit_clist
-  \__fontspec_add_nfssfont:nnnn \bfdefault \sldefault \l_fontspec_fontname_bfsl_tl \l__fontspec_fontfeat_bfsl_clist
+  \__fontspec_add_nfssfont:nnnn \bfdefault \updefault \l__fontspec_fontname_bf_tl   \l__fontspec_fontfeat_bf_clist
+  \__fontspec_add_nfssfont:nnnn \mddefault \itdefault \l__fontspec_fontname_it_tl   \l__fontspec_fontfeat_it_clist
+  \__fontspec_add_nfssfont:nnnn \mddefault \sldefault \l__fontspec_fontname_sl_tl   \l__fontspec_fontfeat_sl_clist
+  \__fontspec_add_nfssfont:nnnn \bfdefault \itdefault \l__fontspec_fontname_bfit_tl \l__fontspec_fontfeat_bfit_clist
+  \__fontspec_add_nfssfont:nnnn \bfdefault \sldefault \l__fontspec_fontname_bfsl_tl \l__fontspec_fontfeat_bfsl_clist
 
   \prop_map_inline:Nn \l__fontspec_nfssfont_prop { \__fontspec_set_faces_aux:nnnnn ##2 }
  }
@@ -998,11 +1202,30 @@
   \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
+ {
+  \tl_set:Nx #1 {#2}
+  \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl}
+  \tl_remove_all:Nn #1 {~}
+ }
+\cs_new:Nn \__fontspec_add_nfssfont:nnnn
+ {
+  \tl_set:Nx \l__fontspec_this_font_tl {#3}
+
+  \tl_if_empty:xTF {#4}
+   { \clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}} }
+   { \__fontspec_keys_set_known:nxN {fontspec-preparse-nested} {#4} \l__fontspec_tmp_tl }
+
+  \tl_if_empty:NF \l__fontspec_this_font_tl
+   {
+    \prop_put:Nxx \l__fontspec_nfssfont_prop {#1/#2}
+     { {#1}{#2}{\l__fontspec_this_font_tl}{#4}{\l__fontspec_sizefeat_clist} }
+   }
+ }
 \cs_new:Nn \__fontspec_set_font_type:
  {
   \bool_set_true:N \l__fontspec_ot_bool
  }
-\cs_generate_variant:Nn \tl_if_empty:nF {x}
 \cs_new:Nn \__fontspec_set_autofont:Nnn
  {
   \bool_if:NF \l__fontspec_external_bool
@@ -1021,8 +1244,8 @@
 
 \prg_new_conditional:Nnn \__fontspec_if_autofont:nn {T,TF}
  {
-  \__fontspec_font_set:Nnn \l_tmpa_font { \__fontspec_fullname:n {#1}   } {\f@size pt}
-  \__fontspec_font_set:Nnn \l_tmpb_font { \__fontspec_fullname:n {#1#2} } {\f@size pt}
+  \__fontspec_primitive_font_set:Nnn \l_tmpa_font { \__fontspec_construct_font_call:nn {#1} {}  } {\f@size pt}
+  \__fontspec_primitive_font_set:Nnn \l_tmpb_font { \__fontspec_construct_font_call:nn {#1#2} {} } {\f@size pt}
   \str_if_eq_x:nnTF { \fontname \l_tmpa_font } { \fontname \l_tmpb_font }
    { \prg_return_false: }
    { \prg_return_true: }
@@ -1030,7 +1253,7 @@
 \cs_new:Nn \__fontspec_make_font_shapes:Nnnnn
  {
   \group_begin:
-    \keys_set_known:nxN {fontspec-preparse-external} { #4 } \l__fontspec_leftover_clist
+    \__fontspec_keys_set_known:nxN {fontspec-preparse-external} { #4 } \l__fontspec_leftover_clist
     \__fontspec_load_fontname:n {#1}
     \__fontspec_declare_shape:nnxx {#2} {#3} { \l__fontspec_fontopts_clist, \l__fontspec_leftover_clist } {#5}
   \group_end:
@@ -1041,8 +1264,8 @@
     \__fontspec_load_external_fontoptions:Nn \l_fontspec_fontname_tl {#1}
     \prop_get:NVNF \g__fontspec_fontopts_prop \l_fontspec_fontname_tl \l__fontspec_fontopts_clist
      { \clist_clear:N \l__fontspec_fontopts_clist }
-    \__fontspec_font_set:Nnn \l_fontspec_font {\__fontspec_fullname:n {\l_fontspec_fontname_tl}} {\f@size pt}
-    \__fontspec_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {#1} }
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font { \__fontspec_construct_font_call:nn {\l_fontspec_fontname_tl} {} } {\f@size pt}
+    \__fontspec_primitive_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {#1} }
  }
 \cs_new:Nn \__fontspec_declare_shape:nnnn
  {
@@ -1050,25 +1273,33 @@
   \tl_clear:N \l__fontspec_nfss_sc_tl
   \tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
 
-  \exp_args:Nx \clist_map_inline:nn {#4}
-   {
+  \exp_args:Nx \clist_map_inline:nn {#4} { \__fontspec_setup_single_size:nn {#3} {##1} }
+
+  \__fontspec_declare_shapes_normal:nn {#1} {#2}
+  \__fontspec_declare_shapes_smcaps:nn {#1} {#2}
+  \__fontspec_declare_shape_slanted:nn {#1} {#2}
+  \__fontspec_declare_shape_loginfo:nn {#1} {#2}
+ }
+\cs_generate_variant:Nn \__fontspec_declare_shape:nnnn {nnxx}
+\cs_new:Nn \__fontspec_setup_single_size:nn
+  {
     \tl_clear:N \l__fontspec_size_tl
     \tl_set_eq:NN \l__fontspec_sizedfont_tl \l__fontspec_saved_fontname_tl % in case not spec'ed
 
-    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n ##1 }
+    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n #2 }
       \l__fontspec_sizing_leftover_clist
     \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
 
     % "normal"
     \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
-    \__fontspec_setup_nfss:Nnn \l__fontspec_nfss_tl {#3} {}
+    \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#1} {\l__fontspec_sizing_leftover_clist} {}
 
     % small caps
     \clist_set_eq:NN \l__fontspec_fontfeat_curr_clist \l__fontspec_fontfeat_sc_clist
 
     \bool_if:NF \l__fontspec_nosc_bool
      {
-      \tl_if_empty:NTF \l_fontspec_fontname_sc_tl
+      \tl_if_empty:NTF \l__fontspec_fontname_sc_tl
        {
         \__fontspec_make_smallcaps:TF
          {
@@ -1078,60 +1309,47 @@
           \bool_set_true:N \l__fontspec_nosc_bool
          }
        }
-       { \__fontspec_load_fontname:n {\l_fontspec_fontname_sc_tl} }% local for each size
+       { \__fontspec_load_fontname:n {\l__fontspec_fontname_sc_tl} }% local for each size
      }
 
     \bool_if:NF \l__fontspec_nosc_bool
      {
-      \__fontspec_setup_nfss:Nnn \l__fontspec_nfss_sc_tl {#3} {\l__fontspec_fontfeat_curr_clist}
+      \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_sc_tl
+        {#1} {\l__fontspec_sizing_leftover_clist} {\l__fontspec_fontfeat_curr_clist}
      }
-
-   }
-
-  \__fontspec_declare_shapes_normal:nn {#1} {#2}
-  \__fontspec_declare_shapes_smcaps:nn {#1} {#2}
-  \__fontspec_declare_shape_slanted:nn {#1} {#2}
-  \__fontspec_declare_shape_loginfo:nn {#1} {#2}
- }
-\cs_generate_variant:Nn \__fontspec_declare_shape:nnnn {nnxx}
-
-\cs_new:Nn \__fontspec_setup_nfss:Nnn
+  }
+\cs_new:Nn \__fontspec_setup_nfss:Nnnn
  {
-  \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist
-   { #2 , \l__fontspec_sizing_leftover_clist , #3 }
+
+  \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist { #2 , #3 , #4 }
 
   \tl_put_right:Nx #1
    {
     <\l__fontspec_size_tl> \l__fontspec_scale_tl
-    \__fontspec_fontwrap:n
-     {
-      \__fontspec_fullname:n { \l_fontspec_fontname_tl }
-      : \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist
-     }
+      \__fontspec_construct_font_call:nn { \l_fontspec_fontname_tl }
+        { \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist }
    }
  }
-
 \cs_new:Nn \__fontspec_declare_shapes_normal:nn
   {
     \__fontspec_DeclareFontShape:xxxxxx {\l__fontspec_nfss_enc_tl} {\l_fontspec_family_tl}
       {#1} {#2} {\l__fontspec_nfss_tl}{\l__fontspec_postadjust_tl}
   }
-
 \cs_new:Nn \__fontspec_declare_shapes_smcaps:nn
   {
-    \bool_if:NF \l__fontspec_nosc_bool
+    \tl_if_empty:NF \l__fontspec_nfss_sc_tl
      {
       \__fontspec_DeclareFontShape:xxxxxx {\l__fontspec_nfss_enc_tl} {\l_fontspec_family_tl} {#1}
         { \__fontspec_combo_sc_shape:n {#2} } {\l__fontspec_nfss_sc_tl} {\l__fontspec_postadjust_tl}
      }
   }
+
 \cs_new:Nn \__fontspec_combo_sc_shape:n
   {
     \tl_if_exist:cTF { \__fontspec_shape_merge:nn {#1} {\scdefault} }
          { \tl_use:c { \__fontspec_shape_merge:nn {#1} {\scdefault} } }
          { \scdefault }
   }
-
 \cs_new:Nn \__fontspec_DeclareFontShape:nnnnnn
  {
   \group_begin:
@@ -1157,6 +1375,7 @@
  {
   \tl_gput_right:Nx \l_fontspec_defined_shapes_tl
    {
+    \exp_not:n { \\ }
     -~ \exp_not:N \str_case:nn {#1/#2}
      {
        {\mddefault/\updefault} {'normal'~}
@@ -1186,7 +1405,6 @@
      }
    }
  }
-\cs_generate_variant:Nn \tl_if_empty:nF {f}
 \clist_set:Nn \l__fontspec_pre_feat_sclist
  {
   mode     = \l_fontspec_mode_tl   ;
@@ -1196,187 +1414,59 @@
     language = \l_fontspec_lang_tl   ;
    }
  }
-\cs_set:Nn \__fontspec_get_features:Nn
+\cs_set:Nn \__fontspec_make_smallcaps:TF
  {
-  \sclist_clear:N \l__fontspec_rawfeatures_sclist
-  \tl_clear:N \l__fontspec_scale_tl
-  \tl_set_eq:NN \l__fontspec_opacity_tl \g__fontspec_opacity_tl
-  \tl_set_eq:NN \l__fontspec_hexcol_tl \g__fontspec_hexcol_tl
-  \tl_set_eq:NN \l__fontspec_postadjust_tl \g__fontspec_postadjust_tl
-  \tl_clear:N \l__fontspec_wordspace_adjust_tl
-  \tl_clear:N \l__fontspec_punctspace_adjust_tl
-
-  \keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2}
-    \l__fontspec_keys_leftover_clist
-  \keys_set:nx {fontspec} {\l__fontspec_keys_leftover_clist}
-  \str_if_eq_x:nnF { \l__fontspec_hexcol_tl \l__fontspec_opacity_tl }
-                   { \g__fontspec_hexcol_tl \g__fontspec_opacity_tl }
-   {
-    \__fontspec_update_featstr:n { color = \l__fontspec_hexcol_tl\l__fontspec_opacity_tl }
-   }
-
-  \tl_set_eq:NN #1 \l__fontspec_rawfeatures_sclist
+  \__fontspec_check_ot_feat:nTF {smcp} {#1} {#2}
  }
-\tl_clear:N \l__fontspec_family_label_tl
-\tl_clear:N \l_fontspec_fontname_bf_tl
-\tl_clear:N \l_fontspec_fontname_it_tl
-\tl_clear:N \l_fontspec_fake_slant_tl
-\tl_clear:N \l_fontspec_fake_embolden_tl
-\tl_clear:N \l_fontspec_fontname_bfit_tl
-\tl_clear:N \l_fontspec_fontname_sl_tl
-\tl_clear:N \l_fontspec_fontname_bfsl_tl
-\tl_clear:N \l_fontspec_fontname_sc_tl
-\tl_clear:N \l__fontspec_fontfeat_up_clist
-\tl_clear:N \l__fontspec_fontfeat_bf_clist
-\tl_clear:N \l__fontspec_fontfeat_it_clist
-\tl_clear:N \l__fontspec_fontfeat_bfit_clist
-\tl_clear:N \l__fontspec_fontfeat_sl_clist
-\tl_clear:N \l__fontspec_fontfeat_bfsl_clist
-\tl_clear:N \l__fontspec_fontfeat_sc_clist
-\tl_clear:N \l__fontspec_script_name_tl
-\tl_clear:N \l_fontspec_script_tl
-\tl_clear:N \l__fontspec_lang_name_tl
-\tl_clear:N \l_fontspec_lang_tl
-\tl_set:Nn  \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl }
-
-\clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}}
-\tl_new:N  \g__fontspec_hexcol_tl
-\tl_new:N  \g__fontspec_opacity_tl
-\tl_set:Nn \g__fontspec_hexcol_tl {000000}
-\tl_set:Nn \g__fontspec_opacity_tl {FF~}
+\cs_new:Nn \__fontspec_update_featstr:n
+  {
+    \bool_if:NF \l__fontspec_firsttime_bool
+      {
+        \tl_gset:Nx \g__fontspec_single_feat_tl { #1 }
+        \tl_gput_right:Nx  \l__fontspec_rawfeatures_sclist {#1;}
+      }
+  }
+\cs_new:Nn \__fontspec_remove_clashing_featstr:n
+  {
+    \clist_map_inline:nn {#1}
+      {
+        \tl_gremove_all:Nn \l__fontspec_rawfeatures_sclist {##1;}
+      }
+  }
 \cs_set:Npn \__fontspec_init:
  {
   \bool_set_false:N \l__fontspec_ot_bool
   \bool_set_true:N \l__fontspec_firsttime_bool
-  \cs_set:Npn \__fontspec_namewrap:n ##1 { ##1 }
+  \__fontspec_font_is_name:
+  \tl_clear:N \l__fontspec_font_path_tl
   \tl_clear:N \l__fontspec_optical_size_tl
+  \tl_clear:N \l__fontspec_ttc_index_tl
   \tl_clear:N \l_fontspec_renderer_tl
   \tl_clear:N \l_fontspec_defined_shapes_tl
   \tl_clear:N \g__fontspec_curr_series_tl
   \tl_gset_eq:NN \l__fontspec_nfss_enc_tl \g_fontspec_encoding_tl
 
-  % 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: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} }
-    {\ttdefault} { \tl_set:Nn \l__fontspec_family_label_tl {\g__fontspec_ttfamily_family} }
-   }{}
-
   \tl_set:Nn \l_fontspec_mode_tl {node}
   \int_set:Nn \luatex_prehyphenchar:D { `\- } % fixme
   \int_zero:N \luatex_posthyphenchar:D        % fixme
   \int_zero:N \luatex_preexhyphenchar:D       % fixme
   \int_zero:N \luatex_postexhyphenchar:D      % fixme
  }
-\cs_set:Nn \fontspec_make_ot_smallcaps:TF
- {
-  \fontspec_check_ot_feat:nTF {+smcp} {#1} {#2}
- }
-\cs_set_eq:NN \__fontspec_make_smallcaps:TF \fontspec_make_ot_smallcaps:TF
-\cs_set_eq:NN \sclist_clear:N \tl_clear:N
-\cs_new:Nn \sclist_gput_right:Nn
- { \tl_gput_right:Nn #1 {#2;} }
-\cs_generate_variant:Nn \sclist_gput_right:Nn {Nx}
-\cs_new:Nn \__fontspec_update_featstr:n
- {
-  \bool_if:NF \l__fontspec_firsttime_bool
-   {
-    \sclist_gput_right:Nx \l__fontspec_rawfeatures_sclist {#1}
-   }
- }
-\cs_new:Nn \fontspec_make_feature:nnn
- { \fontspec_make_OT_feature:n {#3} }
-\cs_generate_variant:Nn \fontspec_make_feature:nnn {nnx}
-\cs_new:Nn \fontspec_make_AAT_feature:nn
- {
-  \tl_if_empty:nTF {#1}
-   { \__fontspec_warning:n {aat-feature-not-exist} }
-   {
-     \fontspec_make_AAT_feature_string:nnTF {#1}{#2}
-      {
-       \__fontspec_update_featstr:n {\l_fontspec_feature_string_tl}
-     }
-     { \__fontspec_warning:nx {aat-feature-not-exist-in-font} {#1,#2} }
-   }
- }
-\cs_new:Nn \fontspec_make_OT_feature:n
- {
-  \tl_if_empty:nTF {#1}
-   { \__fontspec_warning:n {icu-feature-not-exist} }
-   {
-     \fontspec_check_ot_feat:nTF {#1}
-      {
-       \__fontspec_update_featstr:n {#1}
-      }
-      { \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1} }
-   }
- }
-\cs_new_protected:Nn \fontspec_make_numbered_feature:nn
- {
-  \fontspec_check_ot_feat:nTF {#1}
-   {
-    \__fontspec_update_featstr:n { #1 = #2 }
-   }
-   { \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1} }
- }
-\cs_generate_variant:Nn \fontspec_make_numbered_feature:nn {xn}
-\cs_new:Nn \__fontspec_define_font_feature:n
- {
-  \keys_define:nn {fontspec} { #1 .multichoice: }
- }
-\cs_new:Nn \__fontspec_define_feature_option:nnnnn
- {
-  \keys_define:nn {fontspec}
-   {
-    #1/#2 .code:n = { \fontspec_make_feature:nnn{#3}{#4}{#5} }
-   }
- }
-\cs_new:Nn \fontspec_define_numbered_feat:nnnn
- {
-  \keys_define:nn {fontspec}
-   {
-    #1/#2 .code:n =
-      { \fontspec_make_numbered_feature:nn {#3}{#4} }
-   }
- }
-\prg_new_conditional:Nnn \fontspec_make_AAT_feature_string:nn {TF,T,F}
- {
-  \tl_set:Nx \l_tmpa_tl { \XeTeXfeaturename \l_fontspec_font #1 }
-  \tl_if_empty:NTF \l_tmpa_tl
-   { \prg_return_false: }
-   {
-    \int_compare:nTF { \XeTeXisexclusivefeature\l_fontspec_font #1 > 0 }
-     {
-      \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
-     }
-     {
-      \int_if_even:nTF {#2}
-       {
-        \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
-       }
-       {
-        \tl_set:Nx \l_tmpb_tl
-         {
-          \XeTeXselectorname\l_fontspec_font #1\space \numexpr#2-1\relax
-         }
-        \tl_if_empty:NF \l_tmpb_tl { \tl_put_left:Nn \l_tmpb_tl {!} }
-       }
-    }
-    \tl_if_empty:NTF \l_tmpb_tl
-     { \prg_return_false: }
-     {
-      \tl_set:Nx \l_fontspec_feature_string_tl { \l_tmpa_tl = \l_tmpb_tl }
-      \prg_return_true:
-     }
-   }
- }
-\cs_set:Nn \fontspec_iv_str_to_num:Nn
+\cs_new:Nn \__fontspec_init_fontface:
+  {
+    \tl_clear:N \l__fontspec_rawfeatures_sclist
+    \tl_clear:N \l__fontspec_scale_tl
+    \tl_set_eq:NN \l__fontspec_opacity_tl \g__fontspec_opacity_tl
+    \tl_set_eq:NN \l__fontspec_hexcol_tl \g__fontspec_hexcol_tl
+    \tl_set_eq:NN \l__fontspec_postadjust_tl \g__fontspec_postadjust_tl
+    \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
  {
-  \fontspec_iv_str_to_num:w #1 \q_nil #2 \c_empty_tl \c_empty_tl \q_nil
+  \__fontspec_iv_str_to_num:w #1 \q_nil #2 \c_empty_tl \c_empty_tl \q_nil
  }
-\cs_set:Npn \fontspec_iv_str_to_num:w #1 \q_nil #2#3#4#5#6 \q_nil
+\cs_set:Npn \__fontspec_iv_str_to_num:w #1 \q_nil #2#3#4#5#6 \q_nil
  {
   \int_set:Nn #1
    {
@@ -1386,23 +1476,83 @@
     + \ifx \c_empty_tl #5 32 \else `#5 \fi
    }
  }
-\cs_generate_variant:Nn \fontspec_iv_str_to_num:Nn {No}
-\cs_set:Nn \fontspec_v_str_to_num:Nn
+\cs_generate_variant:Nn \__fontspec_iv_str_to_num:Nn {No}
+\cs_new:Nn \__fontspec_define_opentype_feature_group:n
+  {
+    \keys_define:nn {fontspec-opentype} { #1 .multichoice: }
+  }
+\cs_new:Nn \__fontspec_feat_prop_add:nn
+  {
+    \tl_if_empty:nF {#1}
+     {
+      \prop_if_in:NnF \g__fontspec_OT_features_prop {#1}
+        {
+          \prop_gput:Nnn \g__fontspec_OT_features_prop {#1} {#2}
+        }
+     }
+  }
+\cs_new:Nn \__fontspec_define_opentype_feature:nnnnn
  {
-  \bool_if:nTF
+  \__fontspec_feat_prop_add:nn {#3} {#1\,=\,#2}
+  \keys_define:nn {fontspec-opentype}
    {
-    \tl_if_head_eq_charcode_p:nN {#2} {+} ||
-    \tl_if_head_eq_charcode_p:nN {#2} {-}
+    #1/#2 .code:n = { \__fontspec_make_OT_feature:nnn {#3} {#4} {#5} }
    }
-   { \fontspec_iv_str_to_num:No #1 { \use_none:n #2 } }
-   { \fontspec_iv_str_to_num:Nn #1 {#2} }
  }
-\prg_new_conditional:Nnn \fontspec_check_script:n {TF}
+\cs_new:Nn \__fontspec_feat_off:n {#1Off}
+\cs_new:Nn \__fontspec_feat_reset:n {#1Reset}
+\cs_new:Nn \__fontspec_define_opentype_onoffreset:nnnnn
+ {
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} {#2} {#3} {+#4} {#5}
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} { \__fontspec_feat_off:n   {#2} } {#3} {-#4} {}
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} { \__fontspec_feat_reset:n {#2} } {} {} {+#4,-#4}
+ }
+\cs_new:Nn \__fontspec_define_opentype_onreset:nnnnn
+ {
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} {#2} {#3} {#4} {#5}
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} { \__fontspec_feat_reset:n {#2} } {} {} {#4}
+ }
+\cs_new:Nn \__fontspec_make_OT_feature:nnn
+  {
+
+    \bool_set_true:N \l__fontspec_proceed_bool
+    \bool_set_true:N  \l__fontspec_check_feat_bool
+
+    \tl_if_empty:nT {#1} { \bool_set_false:N \l__fontspec_check_feat_bool }
+    \bool_if:NT \l__fontspec_check_feat_bool
+      {
+        \__fontspec_check_ot_feat:nF {#1}
+          {
+            \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1}
+            \bool_set_false:N \l__fontspec_proceed_bool
+          }
+      }
+
+    \bool_if:NT \l__fontspec_proceed_bool
+      {
+        \exp_args:Nx \__fontspec_remove_clashing_featstr:n
+          { #2 , \__fontspec_swap_plus_minus:n {#2} , #3 }
+
+        \__fontspec_update_featstr:n {#2}
+      }
+  }
+\cs_generate_variant:Nn \__fontspec_make_OT_feature:nnn {xxx}
+\cs_new:Nn \__fontspec_swap_plus_minus:n { \__fontspec_swap_plus_minus_aux:NNNNN #1 }
+\cs_new:Nn \__fontspec_swap_plus_minus_aux:NNNNN
+  { \str_case:nn {#1} { {+} {-#2#3#4#5} {-} {+#2#3#4#5} } }
+\prg_new_conditional:Nnn \__fontspec_check_script:n {TF}
+  {
+    \bool_if:NTF \l__fontspec_never_check_bool
+      { \prg_return_true: }
  {
   \directlua{fontspec.check_ot_script("l_fontspec_font", "#1")}
   \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
  }
-\prg_new_conditional:Nnn \fontspec_check_lang:n {TF}
+ }
+\prg_new_conditional:Nnn \__fontspec_check_lang:n {TF}
+  {
+    \bool_if:NTF \l__fontspec_never_check_bool
+      { \prg_return_true: }
  {
   \directlua
    {
@@ -1410,7 +1560,11 @@
    }
   \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
  }
-\prg_new_conditional:Nnn \fontspec_check_ot_feat:n {TF,T}
+  }
+\prg_new_conditional:Nnn \__fontspec_check_ot_feat:n {TF,F}
+  {
+    \bool_if:NTF \l__fontspec_never_check_bool
+      { \prg_return_true: }
  {
   \directlua
    {
@@ -1421,34 +1575,166 @@
    }
   \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
  }
-
+  }
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {aalt}{Access~All~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {abvf}{Above-base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {abvm}{Above-base~Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {abvs}{Above-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {afrc}{Alternative~Fractions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {akhn}{Akhands}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {blwf}{Below-base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {blwm}{Below-base~Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {blws}{Below-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {calt}{Contextual~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {case}{Case-Sensitive~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ccmp}{Glyph~Composition~/~Decomposition}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cfar}{Conjunct~Form~After~Ro}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cjct}{Conjunct~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {clig}{Contextual~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cpct}{Centered~CJK~Punctuation}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cpsp}{Capital~Spacing}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cswh}{Contextual~Swash}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {curs}{Cursive~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cvNN}{Character~Variant~$N$}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {c2pc}{Petite~Capitals~From~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {c2sc}{Small~Capitals~From~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dist}{Distances}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dlig}{Discretionary~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dnom}{Denominators}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dtls}{Dotless~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {expt}{Expert~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {falt}{Final~Glyph~on~Line~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fin2}{Terminal~Forms~\#2}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fin3}{Terminal~Forms~\#3}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fina}{Terminal~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {flac}{Flattened~accent~forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {frac}{Fractions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fwid}{Full~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {half}{Half~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {haln}{Halant~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {halt}{Alternate~Half~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hist}{Historical~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hkna}{Horizontal~Kana~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hlig}{Historical~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hngl}{Hangul}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hojo}{Hojo~Kanji~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hwid}{Half~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {init}{Initial~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {isol}{Isolated~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ital}{Italics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jalt}{Justification~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp78}{JIS78~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp83}{JIS83~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp90}{JIS90~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp04}{JIS2004~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {kern}{Kerning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {lfbd}{Left~Bounds}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {liga}{Standard~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ljmo}{Leading~Jamo~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {lnum}{Lining~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {locl}{Localized~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ltra}{Left-to-right~alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ltrm}{Left-to-right~mirrored~forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mark}{Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {med2}{Medial~Forms~\#2}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {medi}{Medial~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mgrk}{Mathematical~Greek}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mkmk}{Mark~to~Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mset}{Mark~Positioning~via~Substitution}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {nalt}{Alternate~Annotation~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {nlck}{NLC~Kanji~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {nukt}{Nukta~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {numr}{Numerators}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {onum}{Oldstyle~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {opbd}{Optical~Bounds}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ordn}{Ordinals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ornm}{Ornaments}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {palt}{Proportional~Alternate~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pcap}{Petite~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pkna}{Proportional~Kana}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pnum}{Proportional~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pref}{Pre-Base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pres}{Pre-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pstf}{Post-base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {psts}{Post-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pwid}{Proportional~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {qwid}{Quarter~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rand}{Randomize}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rclt}{Required~Contextual~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rkrf}{Rakar~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rlig}{Required~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rphf}{Reph~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rtbd}{Right~Bounds}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rtla}{Right-to-left~alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rtlm}{Right-to-left~mirrored~forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ruby}{Ruby~Notation~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rvrn}{Required~Variation~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {salt}{Stylistic~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {sinf}{Scientific~Inferiors}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {size}{Optical~size}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {smcp}{Small~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {smpl}{Simplified~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ssNN}{Stylistic~Set~$N$}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ssty}{Math~script~style~alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {stch}{Stretching~Glyph~Decomposition}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {subs}{Subscript}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {sups}{Superscript}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {swsh}{Swash}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {titl}{Titling}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {tjmo}{Trailing~Jamo~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {tnam}{Traditional~Name~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {tnum}{Tabular~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {trad}{Traditional~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {twid}{Third~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {unic}{Unicase}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {valt}{Alternate~Vertical~Metrics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vatu}{Vattu~Variants}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vert}{Vertical~Writing}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vhal}{Alternate~Vertical~Half~Metrics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vjmo}{Vowel~Jamo~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vkna}{Vertical~Kana~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vkrn}{Vertical~Kerning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vpal}{Proportional~Alternate~Vertical~Metrics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vrt2}{Vertical~Alternates~and~Rotation}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vrtr}{Vertical~Alternates~for~Rotation}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {zero}{Slashed~Zero}
+
+
+\clist_set:Nn \g__fontspec_all_keyval_modules_clist
+  {
+    fontspec, fontspec-opentype, fontspec-aat,
+    fontspec-preparse, fontspec-preparse-external, fontspec-preparse-nested,
+    fontspec-renderer
+  }
 \cs_new:Nn \__fontspec_keys_define_code:nnn
- {
-  \keys_define:nn {#1} { #2 .code:n = {#3} }
- }
+  {
+   \keys_define:nn {#1} { #2 .code:n = {#3} }
+  }
 \cs_new:Nn \__fontspec_aff_error:n
   {
     \__fontspec_keys_define_code:nnn {fontspec-addfeatures} {#1}
       { \__fontspec_error:nx {not-in-addfontfeatures} {#1} }
   }
-\bool_new:N \l__fontspec_external_bool
-\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {ExternalLocation}
+\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {Path}
  {
   \bool_set_true:N \l__fontspec_nobf_bool
   \bool_set_true:N \l__fontspec_noit_bool
   \bool_set_true:N \l__fontspec_external_bool
-  \cs_set:Npn \__fontspec_namewrap:n ##1 { [ #1 ##1 ] }
+  \tl_set:Nn \l__fontspec_font_path_tl {#1}
+  \__fontspec_font_is_file:
  }
-\aliasfontfeature{ExternalLocation}{Path}
+\aliasfontfeature{Path}{ExternalLocation}
+\__fontspec_keys_define_code:nnn {fontspec} {Path} {}
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {Extension}
  {
   \tl_set:Nn \l__fontspec_extension_tl {#1}
   \bool_if:NF \l__fontspec_external_bool
    {
-    \keys_set:nn {fontspec-preparse-external} {ExternalLocation}
+    \keys_set:nn {fontspec-preparse-external} {Path}
    }
  }
 \tl_clear:N \l__fontspec_extension_tl
+\__fontspec_keys_define_code:nnn {fontspec} {Extension} {}
 \keys_define:nn {fontspec-renderer}
  {
   Renderer .choices:nn =
@@ -1460,6 +1746,7 @@
      {
       \tl_set:Nv \l_fontspec_mode_tl
         { g_fontspec_mode_tag_ \l_keys_choice_tl }
+      \tl_gset:Nx \g__fontspec_single_feat_tl { mode=\l_fontspec_mode_tl }
      }
    }
  }
@@ -1477,7 +1764,16 @@
  {
   \tl_set:Nn \l__fontspec_lang_name_tl {#1}
  }
-\seq_new:N \g__fontspec_bf_series_seq
+\__fontspec_keys_define_code:nnn {fontspec-preparse} {FontIndex}
+ {
+  \str_if_eq_x:nnF { \str_lower_case:f {\l__fontspec_extension_tl} } {.ttc}
+    { \__fontspec_warning:n {font-index-needs-ttc} }
+  \tl_set:Nn \l__fontspec_ttc_index_tl {(#1)}
+ }
+\__fontspec_keys_define_code:nnn {fontspec} {FontIndex}
+ {
+  \tl_set:Nn \l__fontspec_ttc_index_tl {(#1)}
+ }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldSeries}
  {
   \tl_gset:Nx \g__fontspec_curr_series_tl { #1 }
@@ -1485,14 +1781,12 @@
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {UprightFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_up_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_up_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {FontName}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_up_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_up_tl {#1}
  }
-\cs_generate_variant:Nn \tl_if_eq:nnT {ox}
-\cs_generate_variant:Nn \prop_put:Nnn {NxV}
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldFont}
  {
   \tl_if_empty:nTF {#1}
@@ -1509,7 +1803,7 @@
       \seq_put_right:Nx \g__fontspec_bf_series_seq {\bfdefault}
      }
     \tl_if_eq:oxT \g__fontspec_curr_series_tl {\bfdefault}
-     { \tl_set_eq:NN \l_fontspec_fontname_bf_tl \l__fontspec_curr_bfname_tl }
+     { \tl_set_eq:NN \l__fontspec_fontname_bf_tl \l__fontspec_curr_bfname_tl }
 
 
     \prop_put:NxV \l__fontspec_nfss_prop
@@ -1517,7 +1811,6 @@
 
    }
  }
-\prop_new:N \l__fontspec_nfss_prop
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {ItalicFont}
  {
   \tl_if_empty:nTF {#1}
@@ -1526,20 +1819,20 @@
    }
    {
     \bool_set_false:N \l__fontspec_noit_bool
-    \fontspec_complete_fontname:Nn \l_fontspec_fontname_it_tl {#1}
+    \fontspec_complete_fontname:Nn \l__fontspec_fontname_it_tl {#1}
    }
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldItalicFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_bfit_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_bfit_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {SlantedFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_sl_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_sl_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldSlantedFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_bfsl_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_bfsl_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec} {SmallCapsFont}
  {
@@ -1549,16 +1842,9 @@
    }
    {
     \bool_set_false:N \l__fontspec_nosc_bool
-    \fontspec_complete_fontname:Nn \l_fontspec_fontname_sc_tl {#1}
+    \fontspec_complete_fontname:Nn \l__fontspec_fontname_sc_tl {#1}
    }
  }
-\cs_set:Nn \fontspec_complete_fontname:Nn
- {
-  \tl_set:Nx #1 {#2}
-  \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl}
-  \tl_remove_all:Nn #1 {~}
- }
-\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
 \__fontspec_keys_define_code:nnn {fontspec-preparse} {UprightFeatures}
  {
   \clist_set:Nn \l__fontspec_fontfeat_up_clist {#1}
@@ -1633,7 +1919,6 @@
   \tl_if_exist:NT \l_fontspec_family_tl
    { \cs_undefine:c {g__fontspec_ \l_fontspec_family_tl _prop} }
  }
-\prop_new:N \l__fontspec_nfssfont_prop
 \__fontspec_keys_define_code:nnn {fontspec} {FontFace}
  {
   \tl_set:No \l__fontspec_arg_tl { \use_iii:nnn #1 }
@@ -1651,20 +1936,6 @@
   \__fontspec_add_nfssfont:nnnn
    {\use_i:nnn #1}{\use_ii:nnn #1}{\l__fontspec_this_font_tl}{\l__fontspec_this_feat_tl}
  }
-\cs_new:Nn \__fontspec_add_nfssfont:nnnn
- {
-  \tl_set:Nx \l__fontspec_this_font_tl {#3}
-
-  \tl_if_empty:xTF {#4}
-   { \clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}} }
-   { \keys_set_known:noN {fontspec-preparse-nested} {#4} \l__fontspec_tmp_tl }
-
-  \tl_if_empty:NF \l__fontspec_this_font_tl
-   {
-    \prop_put:Nxx \l__fontspec_nfssfont_prop {#1/#2}
-     { {#1}{#2}{\l__fontspec_this_font_tl}{#4}{\l__fontspec_sizefeat_clist} }
-   }
- }
 \__fontspec_keys_define_code:nnn {fontspec} {Scale}
  {
   \str_case:nnF {#1}
@@ -1697,7 +1968,7 @@
     \settoheight #1
      {
       \str_if_eq:nnTF {#3} {\font} \rmfamily #3
-      \int_case:nnn #2
+      \int_case:nnF #2
        {
          {5} {x} % x-height
          {8} {X} % cap-height
@@ -1774,7 +2045,7 @@
     \tl_if_single:nTF {#1}
      { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} }
      { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} }
-    \font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
+    \__fontspec_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
      {
       \tl_put_right:Nn \l__fontspec_postadjust_tl
         {
@@ -1816,7 +2087,6 @@
   \tl_set:Nn \l__fontspec_opacity_tl {#7#8}
  }
 \aliasfontfeature{Color}{Colour}
-\int_new:N \l__fontspec_tmp_int
 \__fontspec_keys_define_code:nnn {fontspec} {Opacity}
  {
   \int_set:Nn \l__fontspec_tmp_int {255}
@@ -1838,14 +2108,10 @@
    {
     \__fontspec_warning:n {no-mapping-ligtex}
     \msg_redirect_name:nnn {fontspec} {no-mapping-ligtex} {none}
-    \keys_set:nn {fontspec} { Ligatures=TeX }
+    \keys_set:nn {fontspec-opentype} { Ligatures=TeX }
    }
    { \__fontspec_warning:n {no-mapping} }
  }
-\__fontspec_keys_define_code:nnn {fontspec} {FeatureFile}
- {
-  \__fontspec_update_featstr:n { featurefile = #1 }
- }
 \__fontspec_keys_define_code:nnn {fontspec} {Weight}
  {
   \__fontspec_update_featstr:n{weight=#1}
@@ -1884,17 +2150,17 @@
    {
     \bool_if:NT \l__fontspec_firsttime_bool
      {
-      \tl_set:Nn \l_fontspec_fake_slant_tl {#1}
+      \tl_set:Nn \l__fontspec_fake_slant_tl {#1}
       \clist_put_right:Nn \l__fontspec_fontfeat_it_clist {FakeSlant=#1}
-      \tl_set_eq:NN \l_fontspec_fontname_it_tl \l_fontspec_fontname_tl
+      \tl_set_eq:NN \l__fontspec_fontname_it_tl \l_fontspec_fontname_tl
       \bool_set_false:N \l__fontspec_noit_bool
 
-      \tl_if_empty:NF \l_fontspec_fake_embolden_tl
+      \tl_if_empty:NF \l__fontspec_fake_embolden_tl
        {
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist
-         {FakeBold=\l_fontspec_fake_embolden_tl}
+         {FakeBold=\l__fontspec_fake_embolden_tl}
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist {FakeSlant=#1}
-        \tl_set_eq:NN \l_fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
+        \tl_set_eq:NN \l__fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
        }
      }
    },
@@ -1906,154 +2172,250 @@
    {
     \bool_if:NT \l__fontspec_firsttime_bool
      {
-      \tl_set:Nn \l_fontspec_fake_embolden_tl {#1}
+      \tl_set:Nn \l__fontspec_fake_embolden_tl {#1}
       \clist_put_right:Nn \l__fontspec_fontfeat_bf_clist {FakeBold=#1}
-      \tl_set_eq:NN \l_fontspec_fontname_bf_tl \l_fontspec_fontname_tl
+      \tl_set_eq:NN \l__fontspec_fontname_bf_tl \l_fontspec_fontname_tl
       \bool_set_false:N \l__fontspec_nobf_bool
 
-      \tl_if_empty:NF \l_fontspec_fake_slant_tl
+      \tl_if_empty:NF \l__fontspec_fake_slant_tl
        {
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist
-         {FakeSlant=\l_fontspec_fake_slant_tl}
+         {FakeSlant=\l__fontspec_fake_slant_tl}
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist {FakeBold=#1}
-        \tl_set_eq:NN \l_fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
+        \tl_set_eq:NN \l__fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
        }
      }
    },
   AutoFakeBold .default:n = {1.5}
 }
-\__fontspec_define_font_feature:n{Ligatures}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Required}       {1}{0}{+rlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoRequired}     {1}{1}{-rlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Common}         {1}{2}{+liga}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoCommon}       {1}{3}{-liga}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Rare}           {1}{4}{+dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoRare}         {1}{5}{-dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Discretionary}  {1}{4}{+dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoDiscretionary}{1}{5}{-dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Contextual}     {}{}  {+clig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoContextual}   {}{}  {-clig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Historic}       {}{}  {+hlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoHistoric}     {}{}  {-hlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Logos}          {1}{6} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoLogos}        {1}{7} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Rebus}          {1}{8} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoRebus}        {1}{9} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Diphthong}      {1}{10}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoDiphthong}    {1}{11}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Squared}        {1}{12}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoSquared}      {1}{13}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{AbbrevSquared}  {1}{14}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoAbbrevSquared}{1}{15}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Icelandic}      {1}{32}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoIcelandic}    {1}{33}{}
-\keys_define:nn {fontspec}
+\__fontspec_keys_define_code:nnn {fontspec} {RawFeature}
  {
-  Ligatures / TeX .code:n =
-   {
-    \__fontspec_update_featstr:n { +tlig }
-   }
- }
-\__fontspec_define_font_feature:n{Letters}
-\__fontspec_define_feature_option:nnnnn{Letters}{Normal}             {3}{0}{}
-\__fontspec_define_feature_option:nnnnn{Letters}{Uppercase}          {3}{1}{+case}
-\__fontspec_define_feature_option:nnnnn{Letters}{Lowercase}          {3}{2}{}
-\__fontspec_define_feature_option:nnnnn{Letters}{SmallCaps}          {3}{3}{+smcp}
-\__fontspec_define_feature_option:nnnnn{Letters}{PetiteCaps}         {} {} {+pcap}
-\__fontspec_define_feature_option:nnnnn{Letters}{UppercaseSmallCaps} {} {} {+c2sc}
-\__fontspec_define_feature_option:nnnnn{Letters}{UppercasePetiteCaps}{} {} {+c2pc}
-\__fontspec_define_feature_option:nnnnn{Letters}{InitialCaps}        {3}{4}{}
-\__fontspec_define_feature_option:nnnnn{Letters}{Unicase}            {} {} {+unic}
-\__fontspec_define_feature_option:nnnnn{Letters}{Random}             {} {} {+rand}
-\__fontspec_define_font_feature:n{Numbers}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Monospaced}   {6} {0}{+tnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Proportional} {6} {1}{+pnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Lowercase}    {21}{0}{+onum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{OldStyle}     {21}{0}{+onum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Uppercase}    {21}{1}{+lnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Lining}       {21}{1}{+lnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{SlashedZero}  {14}{5}{+zero}
-\__fontspec_define_feature_option:nnnnn{Numbers}{NoSlashedZero}{14}{4}{-zero}
-\luatex_if_engine:T
- {
-  \__fontspec_define_feature_option:nnnnn{Numbers}{Arabic}{}{}{+anum}
- }
-\__fontspec_define_font_feature:n  {Contextuals}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{Swash}        {} {} {+cswh}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoSwash}      {} {} {-cswh}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{Alternate}    {} {} {+calt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoAlternate}  {} {} {-calt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{WordInitial}  {8}{0}{+init}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoWordInitial}{8}{1}{-init}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{WordFinal}    {8}{2}{+fina}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoWordFinal}  {8}{3}{-fina}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{LineInitial}  {8}{4}{}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoLineInitial}{8}{5}{}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{LineFinal}    {8}{6}{+falt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoLineFinal}  {8}{7}{-falt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{Inner}        {8}{8}{+medi}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoInner}      {8}{9}{-medi}
-\__fontspec_define_font_feature:n{Diacritics}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{Show}        {9}{0}{}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{Hide}        {9}{1}{}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{Decompose}   {9}{2}{}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{MarkToBase}  {}{}{+mark}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoMarkToBase}{}{}{-mark}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{MarkToMark}  {}{}{+mkmk}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoMarkToMark}{}{}{-mkmk}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{AboveBase}   {}{}{+abvm}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoAboveBase} {}{}{-abvm}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{BelowBase}   {}{}{+blwm}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoBelowBase} {}{}{-blwm}
-\__fontspec_define_font_feature:n{Kerning}
-\__fontspec_define_feature_option:nnnnn{Kerning}{Uppercase}{}{}{+cpsp}
-\__fontspec_define_feature_option:nnnnn{Kerning}{On}       {}{}{+kern}
-\__fontspec_define_feature_option:nnnnn{Kerning}{Off}      {}{}{-kern}
-\__fontspec_define_font_feature:n{VerticalPosition}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Normal}     {10}{0}{}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Superior}   {10}{1}{+sups}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Inferior}   {10}{2}{+subs}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Ordinal}    {10}{3}{+ordn}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Numerator}  {}  {} {+numr}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Denominator}{}  {} {+dnom}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{ScientificInferior}{}{}{+sinf}
-\__fontspec_define_font_feature:n{Fractions}
-\__fontspec_define_feature_option:nnnnn{Fractions}{On}       {11}{1}{+frac}
-\__fontspec_define_feature_option:nnnnn{Fractions}{Off}      {11}{0}{-frac}
-\__fontspec_define_feature_option:nnnnn{Fractions}{Diagonal} {11}{2}{}
-\__fontspec_define_feature_option:nnnnn{Fractions}{Alternate}{}  {} {+afrc}
-\__fontspec_define_font_feature:n { Alternate }
-\keys_define:nn {fontspec}
+  \__fontspec_update_featstr:n {#1}
+ }
+
+\__fontspec_feat_prop_add:nn {salt} { Alternate\,=\,$N$ }
+\__fontspec_feat_prop_add:nn {nalt} { Annotation\,=\,$N$ }
+\__fontspec_feat_prop_add:nn {ornm} { Ornament\,=\,$N$ }
+\__fontspec_feat_prop_add:nn {cvNN} { CharacterVariant\,=\,$N$:$M$ }
+\__fontspec_feat_prop_add:nn {ssNN} { StylisticSet\,=\,$N$ }
+\__fontspec_define_opentype_feature_group:n {Ligatures}
+\__fontspec_define_opentype_feature:nnnnn {Ligatures} {ResetAll} {} {}
+  {
+    +dlig,-dlig,+rlig,-rlig,+liga,-liga,+dlig,-dlig,+clig,-clig,+hlig,-hlig,
+  +tlig,-tlig
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Required}      {rlig} {rlig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Common}        {liga} {liga} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Rare}          {dlig} {dlig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Discretionary} {dlig} {dlig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Contextual}    {clig} {clig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Historic}      {hlig} {hlig} {}
+\__fontspec_define_opentype_onreset:nnnnn {Ligatures} {TeX} {} { +tlig } {}
+\__fontspec_define_opentype_feature_group:n {Letters}
+\__fontspec_define_opentype_feature:nnnnn   {Letters} {ResetAll} {} {}
+  {
+    +case,+smcp,+pcap,+c2sc,+c2pc,+unic,+rand,
+    -case,-smcp,-pcap,-c2sc,-c2pc,-unic,-rand
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {Uppercase} {case} {case} {+smcp,+pcap,+c2sc,+c2pc,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {SmallCaps} {smcp} {smcp} {+pcap,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {PetiteCaps} {pcap} {pcap} {+smcp,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {UppercaseSmallCaps} {c2sc} {c2sc} {+c2pc,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {UppercasePetiteCaps} {c2pc} {c2pc} {+c2sc,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {Unicase} {unic} {unic} {+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {Random} {rand} {rand} {+unic}
+\__fontspec_define_opentype_feature_group:n {Numbers}
+\__fontspec_define_opentype_feature:nnnnn   {Numbers} {ResetAll} {} {}
+  {
+    +tnum,-tnum,
+    +pnum,-pnum,
+    +onum,-onum,
+    +lnum,-lnum,
+    +zero,-zero,
+    +anum,-anum,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Monospaced}   {tnum} {tnum} {+pnum,-pnum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Proportional} {pnum} {pnum} {+tnum,-tnum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Lowercase}    {onum} {onum} {+lnum,-lnum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Uppercase}    {lnum} {lnum} {+onum,-onum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {SlashedZero}  {zero} {zero} {}
+\aliasfontfeatureoption {Numbers} {Lowercase} {OldStyle}
+\aliasfontfeatureoption {Numbers} {Uppercase} {Lining}
+  \__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Arabic} {anum} {anum} {}
+\__fontspec_define_opentype_feature_group:n  {VerticalPosition}
+\__fontspec_define_opentype_feature:nnnnn    {VerticalPosition} {ResetAll} {} {}
+  {
+    +sups,-sups,
+    +subs,-subs,
+    +ordn,-ordn,
+    +numr,-numr,
+    +dnom,-dnom,
+    +sinf,-sinf,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Superior}           {sups} {sups} {+subs,+ordn,+numr,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Inferior}           {subs} {subs} {+sups,+ordn,+numr,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Ordinal}            {ordn} {ordn} {+sups,+subs,+numr,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Numerator}          {numr} {numr} {+sups,+subs,+ordn,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Denominator}        {dnom} {dnom} {+sups,+subs,+ordn,+numr,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {ScientificInferior} {sinf} {sinf} {+sups,+subs,+ordn,+numr,+dnom}
+\__fontspec_define_opentype_feature_group:n  {Contextuals}
+\__fontspec_define_opentype_feature:nnnnn    {Contextuals} {ResetAll} {} {}
+  {
+    +cswh,-cswh,
+    +calt,-calt,
+    +init,-init,
+    +fina,-fina,
+    +falt,-falt,
+    +medi,-medi,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {Swash}       {cswh} {cswh} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {Alternate}   {calt} {calt} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {WordInitial} {init} {init} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {WordFinal}   {fina} {fina} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {LineFinal}   {falt} {falt} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {Inner}       {medi} {medi} {}
+\__fontspec_define_opentype_feature_group:n  {Diacritics}
+\__fontspec_define_opentype_feature:nnnnn    {Diacritics} {ResetAll} {} {}
+  {
+    +mark,-mark,
+    +mkmk,-mkmk,
+    +abvm,-abvm,
+    +blwm,-blwm,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {MarkToBase} {mark} {mark} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {MarkToMark} {mkmk} {mkmk} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {AboveBase}  {abvm} {abvm} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {BelowBase}  {blwm} {blwm} {}
+\__fontspec_define_opentype_feature_group:n  {Kerning}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {ResetAll} {} {}
+  {
+    +cpsp,-cpsp,
+    +kern,-kern,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Kerning} {Uppercase} {cpsp} {cpsp} {}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {On}        {kern} {+kern} {-kern}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {Off}       {kern} {-kern} {+kern}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {Reset}     {} {} {+kern,-kern}
+\__fontspec_define_opentype_feature_group:n  {Fractions}
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {ResetAll} {} {}
+  {
+    +frac,-frac,
+    +afrc,-afrc,
+  }
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {On}    {frac} {+frac} {}
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {Off}   {frac} {-frac} {}
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {Reset} {} {} {+frac,-frac}
+\__fontspec_define_opentype_onoffreset:nnnnn {Fractions} {Alternate} {afrc} {afrc} {-frac}
+
+\__fontspec_define_opentype_feature_group:n  {Style}
+\__fontspec_define_opentype_feature:nnnnn    {Style} {ResetAll} {} {}
+  {
+    +salt,-salt,
+    +ital,-ital,
+    +ruby,-ruby,
+    +swsh,-swsh,
+    +hist,-hist,
+    +titl,-titl,
+    +hkna,-hkna,
+    +vkna,-vkna,
+    +ssty=0,-ssty=0,
+    +ssty=1,-ssty=1,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Alternate}        {salt} {salt} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Italic}           {ital} {ital} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Ruby}             {ruby} {ruby} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Swash}            {swsh} {swsh} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Cursive}          {swsh} {curs} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Historic}         {hist} {hist} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {TitlingCaps}      {titl} {titl} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {HorizontalKana}   {hkna} {hkna} {+vkna,+pkna}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {VerticalKana}     {vkna} {vkna} {+hkna,+pkna}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {ProportionalKana} {pkna} {pkna} {+vkna,+hkna}
+\__fontspec_define_opentype_feature:nnnnn    {Style} {MathScript}       {ssty} {+ssty=0} {+ssty=1}
+\__fontspec_define_opentype_feature:nnnnn    {Style} {MathScriptScript} {ssty} {+ssty=1} {+ssty=0}
+\__fontspec_define_opentype_feature_group:n  {CJKShape}
+\__fontspec_define_opentype_feature:nnnnn    {CJKShape} {ResetAll} {} {}
+  {
+    +trad,-trad,
+    +smpl,-smpl,
+    +jp78,-jp78,
+    +jp83,-jp83,
+    +jp90,-jp90,
+    +jp04,-jp04,
+    +expt,-expt,
+    +nlck,-nlck,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {Traditional} {trad} {trad} {+smpl,+jp78,+jp83,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {Simplified}  {smpl} {smpl} {+trad,+jp78,+jp83,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1978}     {jp78} {jp78} {+trad,+smpl,+jp83,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1983}     {jp83} {jp83} {+trad,+smpl,+jp78,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1990}     {jp90} {jp90} {+trad,+smpl,+jp78,+jp83,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS2004}     {jp04} {jp04} {+trad,+smpl,+jp78,+jp83,+jp90,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {Expert}      {expt} {expt} {+trad,+smpl,+jp78,+jp83,+jp90,+jp04,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {NLC}         {nlck} {nlck} {+trad,+smpl,+jp78,+jp83,+jp90,+jp04,+expt}
+\__fontspec_define_opentype_feature_group:n  {CharacterWidth}
+\__fontspec_define_opentype_feature:nnnnn    {CharacterWidth} {ResetAll} {} {}
+  {
+    +pwid,-pwid,
+    +fwid,-fwid,
+    +hwid,-hwid,
+    +twid,-twid,
+    +qwid,-qwid,
+    +palt,-palt,
+    +halt,-halt,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Proportional}          {pwid} {pwid} {+fwid,+hwid,+twid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Full}                  {fwid} {fwid} {+pwid,+hwid,+twid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Half}                  {hwid} {hwid} {+pwid,+fwid,+twid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Third}                 {twid} {twid} {+pwid,+fwid,+hwid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Quarter}               {qwid} {qwid} {+pwid,+fwid,+hwid,+twid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {AlternateProportional} {palt} {palt} {+pwid,+fwid,+hwid,+twid,+qwid,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {AlternateHalf}         {halt} {halt} {+pwid,+fwid,+hwid,+twid,+qwid,+palt}
+\__fontspec_define_opentype_feature_group:n {Vertical}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {RotatedGlyphs}         {vrt2} {vrt2} {+vrtr,+vert}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {AlternatesForRotation} {vrtr} {vrtr} {+vrt2}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {Alternates}            {vert} {vert} {+vrt2}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {KanaAlternates}        {vkna} {vkna} {+hkna}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {Kerning}               {vkrn} {vkrn} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {AlternateMetrics}      {valt} {valt} {+vhal,+vpal,+kern}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {HalfMetrics}           {vhal} {vhal} {+valt,+vpal,+kern}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {ProportionalMetrics}   {vpal} {vpal} {+valt,+vhal}
+\__fontspec_define_opentype_feature_group:n  {Alternate}
+\keys_define:nn {fontspec-opentype}
  {
   Alternate .default:n = {0} ,
+  Alternate / Random  .code:n =
+   { \__fontspec_make_OT_feature:nnn {salt}{ +salt = random }{} } ,
   Alternate / unknown .code:n =
    {
     \clist_map_inline:nn {#1}
-      { \fontspec_make_feature:nnx {17}{##1} { \fontspec_salt:n {##1} } }
+      { \__fontspec_make_OT_feature:nnn {salt}{ +salt = ##1 }{} }
    }
  }
-\cs_set:Nn \fontspec_salt:n { +salt = #1 }
-\__fontspec_define_font_feature:n {Variant}
-\keys_define:nn {fontspec}
+\aliasfontfeature{Alternate}{StylisticAlternates}
+\__fontspec_define_opentype_feature_group:n  {Variant}
+\keys_define:nn {fontspec-opentype}
  {
   Variant .default:n = {0} ,
   Variant / unknown .code:n =
    {
     \clist_map_inline:nn {#1}
-      { \fontspec_make_feature:nnx {18}{##1} { +ss \two@digits {##1} } }
+      {
+        \__fontspec_make_OT_feature:xxx { ss \two@digits {##1} } { +ss \two@digits {##1} } {}
+      }
    }
  }
 \aliasfontfeature{Variant}{StylisticSet}
-\__fontspec_define_font_feature:n { CharacterVariant }
+\__fontspec_define_opentype_feature_group:n  {CharacterVariant}
 \use:x
  {
   \cs_new:Npn \exp_not:N \fontspec_parse_cv:w
       ##1 \c_colon_str ##2 \c_colon_str ##3 \exp_not:N \q_nil
    {
-     \fontspec_make_numbered_feature:xn
-       { +cv \exp_not:N \two@digits {##1} } {##2}
+     \__fontspec_make_OT_feature:xxx
+       { cv \exp_not:N \two@digits {##1} } { +cv \exp_not:N \two@digits {##1} = ##2 } {}
    }
-  \keys_define:nn {fontspec}
+  \keys_define:nn {fontspec-opentype}
    {
     CharacterVariant / unknown .code:n =
      {
@@ -2065,90 +2427,53 @@
      }
    }
  }
-\__fontspec_define_font_feature:n{Style}
-\__fontspec_define_feature_option:nnnnn{Style}{Alternate}     {}  {} {+salt}
-\__fontspec_define_feature_option:nnnnn{Style}{Italic}        {32}{2}{+ital}
-\__fontspec_define_feature_option:nnnnn{Style}{Ruby}          {28}{2}{+ruby}
-\__fontspec_define_feature_option:nnnnn{Style}{Swash}         {}  {} {+swsh}
-\__fontspec_define_feature_option:nnnnn{Style}{Historic}      {}  {} {+hist}
-\__fontspec_define_feature_option:nnnnn{Style}{Display}       {19}{1}{}
-\__fontspec_define_feature_option:nnnnn{Style}{Engraved}      {19}{2}{}
-\__fontspec_define_feature_option:nnnnn{Style}{TitlingCaps}   {19}{4}{+titl}
-\__fontspec_define_feature_option:nnnnn{Style}{TallCaps}      {19}{5}{}
-\__fontspec_define_feature_option:nnnnn{Style}{HorizontalKana}{}  {} {+hkna}
-\__fontspec_define_feature_option:nnnnn{Style}{VerticalKana}  {}  {} {+vkna}
-\fontspec_define_numbered_feat:nnnn {Style} {MathScript}       {+ssty} {0}
-\fontspec_define_numbered_feat:nnnn {Style} {MathScriptScript} {+ssty} {1}
-\__fontspec_define_font_feature:n{CJKShape}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{Traditional}{20}{0} {+trad}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{Simplified} {20}{1} {+smpl}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS1978}    {20}{2} {+jp78}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS1983}    {20}{3} {+jp83}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS1990}    {20}{4} {+jp90}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{Expert}     {20}{10}{+expt}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{NLC}        {20}{13}{+nlck}
-\__fontspec_define_font_feature:n{CharacterWidth}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Proportional}{22}{0}{+pwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Full}{22}{1}{+fwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Half}{22}{2}{+hwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Third}{22}{3}{+twid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Quarter}{22}{4}{+qwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{AlternateProportional}{22}{5}{+palt}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{AlternateHalf}{22}{6}{+halt}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Default}{22}{7}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Off}{24}{0}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Box}{24}{1}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{RoundedBox}{24}{2}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Circle}{24}{3}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{BlackCircle}{24}{4}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Parenthesis}{24}{5}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Period}{24}{6}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{RomanNumerals}{24}{7}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Diamond}{24}{8}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{BlackSquare}{24}{9}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{BlackRoundSquare}{24}{10}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{DoubleCircle}{24}{11}{}
-\__fontspec_define_font_feature:n { Annotation }
-\keys_define:nn {fontspec}
+\__fontspec_define_opentype_feature_group:n {Annotation}
+\keys_define:nn {fontspec-opentype}
  {
   Annotation .default:n = {0} ,
   Annotation / unknown .code:n =
    {
-    \fontspec_make_feature:nnx {}{}{ +nalt=#1 }
+    \__fontspec_make_OT_feature:nnn {nalt} {+nalt=#1} {}
    }
  }
-\keys_define:nn {fontspec}
+\__fontspec_define_opentype_feature_group:n  {Ornament}
+\keys_define:nn {fontspec-opentype}
  {
-  Vertical .choice: ,
-  Vertical / RotatedGlyphs .code:n =
+  Ornament .default:n = {0} ,
+  Ornament / unknown .code:n =
    {
-    \bool_if:NTF \l__fontspec_ot_bool
-     {
-      \fontspec_make_feature:nnn{}{}{+vrt2}
-      \__fontspec_update_featstr:n {vertical}
-     }
-     {
-      \__fontspec_update_featstr:n {vertical}
-     }
+    \__fontspec_make_OT_feature:nnn {ornm} { +ornm=#1 } {}
    }
  }
-\keys_define:nn { fontspec } { Script .choice: }
+\keys_define:nn { fontspec-opentype } { Script .choice: }
 \cs_new:Nn \fontspec_new_script:nn
  {
-  \keys_define:nn { fontspec } { Script / #1 .code:n =
+  \keys_define:nn { fontspec-opentype } { Script / #1 .code:n =
+    \bool_set_false:N \l__fontspec_script_exist_bool
     \clist_map_inline:nn {#2}
      {
-      \fontspec_check_script:nTF {####1}
+      \__fontspec_check_script:nTF {####1}
        {
         \tl_set:Nn \l_fontspec_script_tl {####1}
-        \int_set:Nn \l_fontspec_script_int {\l_fontspec_strnum_int}
+        \int_set:Nn \l__fontspec_script_int {\l__fontspec_strnum_int}
+        \bool_set_true:N \l__fontspec_script_exist_bool
+        \tl_gset:Nx \g__fontspec_single_feat_tl { script=####1 }
         \clist_map_break:
        }
+       { }
+     }
+    \bool_if:NF \l__fontspec_script_exist_bool
+     {
+      \str_if_eq:nnTF {#1} {Latin}
        {
-        \fontspec_check_script:nTF {latn}
+        \__fontspec_warning:nx {script-not-exist} {#1}
+       }
+       {
+        \__fontspec_check_script:nTF {latn}
          {
           \__fontspec_warning:nx {script-not-exist-latn} {#1}
-          \keys_set:nn {fontspec} {Script=Latin}
+          \tl_set:Nn \l_fontspec_script_tl {latn}
+          \int_set:Nn \l__fontspec_script_int {\l__fontspec_strnum_int}
          }
          {
           \__fontspec_warning:nx {script-not-exist} {#1}
@@ -2157,296 +2482,607 @@
      }
    }
  }
-\newfontscript{Arabic}{arab}            \newfontscript{Armenian}{armn}
+\keys_define:nn { fontspec-opentype } { Language .choice: }
+\cs_new:Nn \fontspec_new_lang:nn
+ {
+  \keys_define:nn { fontspec-opentype } { Language / #1 .code:n =
+  \__fontspec_check_lang:nTF {#2}
+     {
+      \tl_set:Nn \l_fontspec_lang_tl {#2}
+      \int_set:Nn \l__fontspec_language_int {\l__fontspec_strnum_int}
+      \tl_gset:Nx \g__fontspec_single_feat_tl { language=#2 }
+     }
+     {
+      \__fontspec_warning:nx {language-not-exist} {#1}
+      \keys_set:nn { fontspec-opentype } { Language = Default }
+     }
+  }
+ }
+\__fontspec_keys_define_code:nnn {fontspec-opentype}{ Language / Default }
+ {
+  \tl_set:Nn \l_fontspec_lang_tl {DFLT}
+  \int_zero:N \l__fontspec_language_int
+  \tl_gset:Nn \g__fontspec_single_feat_tl { language=DFLT }
+ }
+\keys_define:nn {fontspec-opentype}
+ {
+  Language / Turkish .code:n =
+   {
+    \__fontspec_check_lang:nTF {TRK}
+     {
+      \int_set:Nn \l__fontspec_language_int {\l__fontspec_strnum_int}
+      \tl_set:Nn \l_fontspec_lang_tl {TRK}
+      \tl_gset:Nn \g__fontspec_single_feat_tl { language=TRK }
+     }
+     {
+      \__fontspec_check_lang:nTF {TUR}
+       {
+        \int_set:Nn \l__fontspec_language_int {\l__fontspec_strnum_int}
+        \tl_set:Nn \l_fontspec_lang_tl {TUR}
+        \tl_gset:Nn \g__fontspec_single_feat_tl { language=TUR }
+       }
+       {
+        \__fontspec_warning:nx {language-not-exist} {Turkish}
+        \keys_set:nn {fontspec-opentype} {Language=Default}
+       }
+     }
+   }
+ }
+\cs_new:Nn \__fontspec_ot_compat:nn
+  {
+    \aliasfontfeatureoption {#1} {#2Off} {No#2}
+  }
+\__fontspec_ot_compat:nn {Ligatures}   {Rare}
+\__fontspec_ot_compat:nn {Ligatures}   {Required}
+\__fontspec_ot_compat:nn {Ligatures}   {Common}
+\__fontspec_ot_compat:nn {Ligatures}   {Discretionary}
+\__fontspec_ot_compat:nn {Ligatures}   {Contextual}
+\__fontspec_ot_compat:nn {Ligatures}   {Historic}
+\__fontspec_ot_compat:nn {Numbers}     {SlashedZero}
+\__fontspec_ot_compat:nn {Contextuals} {Swash}
+\__fontspec_ot_compat:nn {Contextuals} {Alternate}
+\__fontspec_ot_compat:nn {Contextuals} {WordInitial}
+\__fontspec_ot_compat:nn {Contextuals} {WordFinal}
+\__fontspec_ot_compat:nn {Contextuals} {LineFinal}
+\__fontspec_ot_compat:nn {Contextuals} {Inner}
+\__fontspec_ot_compat:nn {Diacritics}  {MarkToBase}
+\__fontspec_ot_compat:nn {Diacritics}  {MarkToMark}
+\__fontspec_ot_compat:nn {Diacritics}  {AboveBase}
+\__fontspec_ot_compat:nn {Diacritics}  {BelowBase}
+
+\newfontscript{Arabic}{arab}
+\newfontscript{Armenian}{armn}
 \newfontscript{Balinese}{bali}
 \newfontscript{Bengali}{bng2,beng}
-\newfontscript{Bopomofo}{bopo}          \newfontscript{Braille}{brai}
-\newfontscript{Buginese}{bugi}          \newfontscript{Buhid}{buhd}
+\newfontscript{Bopomofo}{bopo}
+\newfontscript{Braille}{brai}
+\newfontscript{Buginese}{bugi}
+\newfontscript{Buhid}{buhd}
 \newfontscript{Byzantine~Music}{byzm}
 \newfontscript{Canadian~Syllabics}{cans}
 \newfontscript{Cherokee}{cher}
-\newfontscript{CJK~Ideographic}{hani}   \newfontscript{Coptic}{copt}
-\newfontscript{Cypriot~Syllabary}{cprt} \newfontscript{Cyrillic}{cyrl}
-\newfontscript{Default}{DFLT}           \newfontscript{Deseret}{dsrt}
+\newfontscript{CJK~Ideographic}{hani}
+\newfontscript{Coptic}{copt}
+\newfontscript{Cypriot~Syllabary}{cprt}
+\newfontscript{Cyrillic}{cyrl}
+\newfontscript{Default}{DFLT}
+\newfontscript{Deseret}{dsrt}
 \newfontscript{Devanagari}{dev2,deva}
 \newfontscript{Ethiopic}{ethi}
-\newfontscript{Georgian}{geor}          \newfontscript{Glagolitic}{glag}
-\newfontscript{Gothic}{goth}            \newfontscript{Greek}{grek}
+\newfontscript{Georgian}{geor}
+\newfontscript{Glagolitic}{glag}
+\newfontscript{Gothic}{goth}
+\newfontscript{Greek}{grek}
 \newfontscript{Gujarati}{gjr2,gujr}
 \newfontscript{Gurmukhi}{gur2,guru}
-\newfontscript{Hangul~Jamo}{jamo}       \newfontscript{Hangul}{hang}
-\newfontscript{Hanunoo}{hano}           \newfontscript{Hebrew}{hebr}
+\newfontscript{Hangul~Jamo}{jamo}
+\newfontscript{Hangul}{hang}
+\newfontscript{Hanunoo}{hano}
+\newfontscript{Hebrew}{hebr}
 \newfontscript{Hiragana~and~Katakana}{kana}
 \newfontscript{Javanese}{java}
 \newfontscript{Kannada}{knd2,knda}
-\newfontscript{Kharosthi}{khar}         \newfontscript{Khmer}{khmr}
-\newfontscript{Lao}{lao~}               \newfontscript{Latin}{latn}
-\newfontscript{Limbu}{limb}             \newfontscript{Linear~B}{linb}
+\newfontscript{Kharosthi}{khar}
+\newfontscript{Khmer}{khmr}
+\newfontscript{Lao}{lao~}
+\newfontscript{Latin}{latn}
+\newfontscript{Limbu}{limb}
+\newfontscript{Linear~B}{linb}
 \newfontscript{Malayalam}{mlm2,mlym}
 \newfontscript{Math}{math}
 \newfontscript{Mongolian}{mong}
-\newfontscript{Musical~Symbols}{musc}   \newfontscript{Myanmar}{mymr}
-\newfontscript{N'ko}{nko~}              \newfontscript{Ogham}{ogam}
+\newfontscript{Musical~Symbols}{musc}
+\newfontscript{Myanmar}{mymr}
+\newfontscript{N'ko}{nko~}
+\newfontscript{Ogham}{ogam}
 \newfontscript{Old~Italic}{ital}
 \newfontscript{Old~Persian~Cuneiform}{xpeo}
 \newfontscript{Oriya}{ory2,orya}
 \newfontscript{Osmanya}{osma}
-\newfontscript{Phags-pa}{phag}          \newfontscript{Phoenician}{phnx}
-\newfontscript{Runic}{runr}             \newfontscript{Shavian}{shaw}
+\newfontscript{Phags-pa}{phag}
+\newfontscript{Phoenician}{phnx}
+\newfontscript{Runic}{runr}
+\newfontscript{Shavian}{shaw}
 \newfontscript{Sinhala}{sinh}
 \newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
-\newfontscript{Syloti~Nagri}{sylo}      \newfontscript{Syriac}{syrc}
-\newfontscript{Tagalog}{tglg}           \newfontscript{Tagbanwa}{tagb}
-\newfontscript{Tai~Le}{tale}            \newfontscript{Tai~Lu}{talu}
+\newfontscript{Syloti~Nagri}{sylo}
+\newfontscript{Syriac}{syrc}
+\newfontscript{Tagalog}{tglg}
+\newfontscript{Tagbanwa}{tagb}
+\newfontscript{Tai~Le}{tale}
+\newfontscript{Tai~Lu}{talu}
 \newfontscript{Tamil}{tml2,taml}
 \newfontscript{Telugu}{tel2,telu}
-\newfontscript{Thaana}{thaa}            \newfontscript{Thai}{thai}
-\newfontscript{Tibetan}{tibt}           \newfontscript{Tifinagh}{tfng}
-\newfontscript{Ugaritic~Cuneiform}{ugar}\newfontscript{Yi}{yi~~}
+\newfontscript{Thaana}{thaa}
+\newfontscript{Thai}{thai}
+\newfontscript{Tibetan}{tibt}
+\newfontscript{Tifinagh}{tfng}
+\newfontscript{Ugaritic~Cuneiform}{ugar}
+\newfontscript{Yi}{yi~~}
 \newfontscript{Kana}{kana}
 \newfontscript{Maths}{math}
 \newfontscript{CJK}{hani}
-\keys_define:nn { fontspec } { Language .choice: }
-\cs_new:Nn \fontspec_new_lang:nn
- {
-  \keys_define:nn { fontspec } { Language / #1 .code:n =
-    \fontspec_check_lang:nTF {#2}
-     {
-      \tl_set:Nn \l_fontspec_lang_tl {#2}
-      \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-     }
-     {
-      \__fontspec_warning:nx {language-not-exist} {#1}
-      \keys_set:nn { fontspec } { Language = Default }
-     }
-  }
- }
-\newfontlanguage{Abaza}{ABA}\newfontlanguage{Abkhazian}{ABK}
-\newfontlanguage{Adyghe}{ADY}\newfontlanguage{Afrikaans}{AFK}
-\newfontlanguage{Afar}{AFR}\newfontlanguage{Agaw}{AGW}
-\newfontlanguage{Altai}{ALT}\newfontlanguage{Amharic}{AMH}
-\newfontlanguage{Arabic}{ARA}\newfontlanguage{Aari}{ARI}
-\newfontlanguage{Arakanese}{ARK}\newfontlanguage{Assamese}{ASM}
-\newfontlanguage{Athapaskan}{ATH}\newfontlanguage{Avar}{AVR}
-\newfontlanguage{Awadhi}{AWA}\newfontlanguage{Aymara}{AYM}
-\newfontlanguage{Azeri}{AZE}\newfontlanguage{Badaga}{BAD}
-\newfontlanguage{Baghelkhandi}{BAG}\newfontlanguage{Balkar}{BAL}
-\newfontlanguage{Baule}{BAU}\newfontlanguage{Berber}{BBR}
-\newfontlanguage{Bench}{BCH}\newfontlanguage{Bible~Cree}{BCR}
-\newfontlanguage{Belarussian}{BEL}\newfontlanguage{Bemba}{BEM}
-\newfontlanguage{Bengali}{BEN}\newfontlanguage{Bulgarian}{BGR}
-\newfontlanguage{Bhili}{BHI}\newfontlanguage{Bhojpuri}{BHO}
-\newfontlanguage{Bikol}{BIK}\newfontlanguage{Bilen}{BIL}
-\newfontlanguage{Blackfoot}{BKF}\newfontlanguage{Balochi}{BLI}
-\newfontlanguage{Balante}{BLN}\newfontlanguage{Balti}{BLT}
-\newfontlanguage{Bambara}{BMB}\newfontlanguage{Bamileke}{BML}
-\newfontlanguage{Breton}{BRE}\newfontlanguage{Brahui}{BRH}
-\newfontlanguage{Braj~Bhasha}{BRI}\newfontlanguage{Burmese}{BRM}
-\newfontlanguage{Bashkir}{BSH}\newfontlanguage{Beti}{BTI}
-\newfontlanguage{Catalan}{CAT}\newfontlanguage{Cebuano}{CEB}
-\newfontlanguage{Chechen}{CHE}\newfontlanguage{Chaha~Gurage}{CHG}
-\newfontlanguage{Chattisgarhi}{CHH}\newfontlanguage{Chichewa}{CHI}
-\newfontlanguage{Chukchi}{CHK}\newfontlanguage{Chipewyan}{CHP}
-\newfontlanguage{Cherokee}{CHR}\newfontlanguage{Chuvash}{CHU}
-\newfontlanguage{Comorian}{CMR}\newfontlanguage{Coptic}{COP}
-\newfontlanguage{Cree}{CRE}\newfontlanguage{Carrier}{CRR}
-\newfontlanguage{Crimean~Tatar}{CRT}\newfontlanguage{Church~Slavonic}{CSL}
-\newfontlanguage{Czech}{CSY}\newfontlanguage{Danish}{DAN}
-\newfontlanguage{Dargwa}{DAR}\newfontlanguage{Woods~Cree}{DCR}
+
+\newfontlanguage{Abaza}{ABA}
+\newfontlanguage{Abkhazian}{ABK}
+\newfontlanguage{Adyghe}{ADY}
+\newfontlanguage{Afrikaans}{AFK}
+\newfontlanguage{Afar}{AFR}
+\newfontlanguage{Agaw}{AGW}
+\newfontlanguage{Altai}{ALT}
+\newfontlanguage{Amharic}{AMH}
+\newfontlanguage{Arabic}{ARA}
+\newfontlanguage{Aari}{ARI}
+\newfontlanguage{Arakanese}{ARK}
+\newfontlanguage{Assamese}{ASM}
+\newfontlanguage{Athapaskan}{ATH}
+\newfontlanguage{Avar}{AVR}
+\newfontlanguage{Awadhi}{AWA}
+\newfontlanguage{Aymara}{AYM}
+\newfontlanguage{Azeri}{AZE}
+\newfontlanguage{Badaga}{BAD}
+\newfontlanguage{Baghelkhandi}{BAG}
+\newfontlanguage{Balkar}{BAL}
+\newfontlanguage{Baule}{BAU}
+\newfontlanguage{Berber}{BBR}
+\newfontlanguage{Bench}{BCH}
+\newfontlanguage{Bible~Cree}{BCR}
+\newfontlanguage{Belarussian}{BEL}
+\newfontlanguage{Bemba}{BEM}
+\newfontlanguage{Bengali}{BEN}
+\newfontlanguage{Bulgarian}{BGR}
+\newfontlanguage{Bhili}{BHI}
+\newfontlanguage{Bhojpuri}{BHO}
+\newfontlanguage{Bikol}{BIK}
+\newfontlanguage{Bilen}{BIL}
+\newfontlanguage{Blackfoot}{BKF}
+\newfontlanguage{Balochi}{BLI}
+\newfontlanguage{Balante}{BLN}
+\newfontlanguage{Balti}{BLT}
+\newfontlanguage{Bambara}{BMB}
+\newfontlanguage{Bamileke}{BML}
+\newfontlanguage{Breton}{BRE}
+\newfontlanguage{Brahui}{BRH}
+\newfontlanguage{Braj~Bhasha}{BRI}
+\newfontlanguage{Burmese}{BRM}
+\newfontlanguage{Bashkir}{BSH}
+\newfontlanguage{Beti}{BTI}
+\newfontlanguage{Catalan}{CAT}
+\newfontlanguage{Cebuano}{CEB}
+\newfontlanguage{Chechen}{CHE}
+\newfontlanguage{Chaha~Gurage}{CHG}
+\newfontlanguage{Chattisgarhi}{CHH}
+\newfontlanguage{Chichewa}{CHI}
+\newfontlanguage{Chukchi}{CHK}
+\newfontlanguage{Chipewyan}{CHP}
+\newfontlanguage{Cherokee}{CHR}
+\newfontlanguage{Chuvash}{CHU}
+\newfontlanguage{Comorian}{CMR}
+\newfontlanguage{Coptic}{COP}
+\newfontlanguage{Cree}{CRE}
+\newfontlanguage{Carrier}{CRR}
+\newfontlanguage{Crimean~Tatar}{CRT}
+\newfontlanguage{Church~Slavonic}{CSL}
+\newfontlanguage{Czech}{CSY}
+\newfontlanguage{Danish}{DAN}
+\newfontlanguage{Dargwa}{DAR}
+\newfontlanguage{Woods~Cree}{DCR}
 \newfontlanguage{German}{DEU}
-\newfontlanguage{Dogri}{DGR}\newfontlanguage{Divehi}{DIV}
-\newfontlanguage{Djerma}{DJR}\newfontlanguage{Dangme}{DNG}
-\newfontlanguage{Dinka}{DNK}\newfontlanguage{Dungan}{DUN}
-\newfontlanguage{Dzongkha}{DZN}\newfontlanguage{Ebira}{EBI}
-\newfontlanguage{Eastern~Cree}{ECR}\newfontlanguage{Edo}{EDO}
-\newfontlanguage{Efik}{EFI}\newfontlanguage{Greek}{ELL}
-\newfontlanguage{English}{ENG}\newfontlanguage{Erzya}{ERZ}
-\newfontlanguage{Spanish}{ESP}\newfontlanguage{Estonian}{ETI}
-\newfontlanguage{Basque}{EUQ}\newfontlanguage{Evenki}{EVK}
-\newfontlanguage{Even}{EVN}\newfontlanguage{Ewe}{EWE}
+\newfontlanguage{Dogri}{DGR}
+\newfontlanguage{Divehi}{DIV}
+\newfontlanguage{Djerma}{DJR}
+\newfontlanguage{Dangme}{DNG}
+\newfontlanguage{Dinka}{DNK}
+\newfontlanguage{Dungan}{DUN}
+\newfontlanguage{Dzongkha}{DZN}
+\newfontlanguage{Ebira}{EBI}
+\newfontlanguage{Eastern~Cree}{ECR}
+\newfontlanguage{Edo}{EDO}
+\newfontlanguage{Efik}{EFI}
+\newfontlanguage{Greek}{ELL}
+\newfontlanguage{English}{ENG}
+\newfontlanguage{Erzya}{ERZ}
+\newfontlanguage{Spanish}{ESP}
+\newfontlanguage{Estonian}{ETI}
+\newfontlanguage{Basque}{EUQ}
+\newfontlanguage{Evenki}{EVK}
+\newfontlanguage{Even}{EVN}
+\newfontlanguage{Ewe}{EWE}
 \newfontlanguage{French~Antillean}{FAN}
 \newfontlanguage{Farsi}{FAR}
 \newfontlanguage{Parsi}{FAR}
 \newfontlanguage{Persian}{FAR}
-\newfontlanguage{Finnish}{FIN}\newfontlanguage{Fijian}{FJI}
-\newfontlanguage{Flemish}{FLE}\newfontlanguage{Forest~Nenets}{FNE}
-\newfontlanguage{Fon}{FON}\newfontlanguage{Faroese}{FOS}
-\newfontlanguage{French}{FRA}\newfontlanguage{Frisian}{FRI}
-\newfontlanguage{Friulian}{FRL}\newfontlanguage{Futa}{FTA}
-\newfontlanguage{Fulani}{FUL}\newfontlanguage{Ga}{GAD}
-\newfontlanguage{Gaelic}{GAE}\newfontlanguage{Gagauz}{GAG}
-\newfontlanguage{Galician}{GAL}\newfontlanguage{Garshuni}{GAR}
-\newfontlanguage{Garhwali}{GAW}\newfontlanguage{Ge'ez}{GEZ}
-\newfontlanguage{Gilyak}{GIL}\newfontlanguage{Gumuz}{GMZ}
-\newfontlanguage{Gondi}{GON}\newfontlanguage{Greenlandic}{GRN}
-\newfontlanguage{Garo}{GRO}\newfontlanguage{Guarani}{GUA}
-\newfontlanguage{Gujarati}{GUJ}\newfontlanguage{Haitian}{HAI}
-\newfontlanguage{Halam}{HAL}\newfontlanguage{Harauti}{HAR}
-\newfontlanguage{Hausa}{HAU}\newfontlanguage{Hawaiin}{HAW}
-\newfontlanguage{Hammer-Banna}{HBN}\newfontlanguage{Hiligaynon}{HIL}
-\newfontlanguage{Hindi}{HIN}\newfontlanguage{High~Mari}{HMA}
-\newfontlanguage{Hindko}{HND}\newfontlanguage{Ho}{HO}
-\newfontlanguage{Harari}{HRI}\newfontlanguage{Croatian}{HRV}
-\newfontlanguage{Hungarian}{HUN}\newfontlanguage{Armenian}{HYE}
-\newfontlanguage{Igbo}{IBO}\newfontlanguage{Ijo}{IJO}
-\newfontlanguage{Ilokano}{ILO}\newfontlanguage{Indonesian}{IND}
-\newfontlanguage{Ingush}{ING}\newfontlanguage{Inuktitut}{INU}
-\newfontlanguage{Irish}{IRI}\newfontlanguage{Irish~Traditional}{IRT}
-\newfontlanguage{Icelandic}{ISL}\newfontlanguage{Inari~Sami}{ISM}
-\newfontlanguage{Italian}{ITA}\newfontlanguage{Hebrew}{IWR}
-\newfontlanguage{Javanese}{JAV}\newfontlanguage{Yiddish}{JII}
-\newfontlanguage{Japanese}{JAN}\newfontlanguage{Judezmo}{JUD}
-\newfontlanguage{Jula}{JUL}\newfontlanguage{Kabardian}{KAB}
-\newfontlanguage{Kachchi}{KAC}\newfontlanguage{Kalenjin}{KAL}
-\newfontlanguage{Kannada}{KAN}\newfontlanguage{Karachay}{KAR}
-\newfontlanguage{Georgian}{KAT}\newfontlanguage{Kazakh}{KAZ}
-\newfontlanguage{Kebena}{KEB}\newfontlanguage{Khutsuri~Georgian}{KGE}
-\newfontlanguage{Khakass}{KHA}\newfontlanguage{Khanty-Kazim}{KHK}
-\newfontlanguage{Khmer}{KHM}\newfontlanguage{Khanty-Shurishkar}{KHS}
-\newfontlanguage{Khanty-Vakhi}{KHV}\newfontlanguage{Khowar}{KHW}
-\newfontlanguage{Kikuyu}{KIK}\newfontlanguage{Kirghiz}{KIR}
-\newfontlanguage{Kisii}{KIS}\newfontlanguage{Kokni}{KKN}
-\newfontlanguage{Kalmyk}{KLM}\newfontlanguage{Kamba}{KMB}
-\newfontlanguage{Kumaoni}{KMN}\newfontlanguage{Komo}{KMO}
-\newfontlanguage{Komso}{KMS}\newfontlanguage{Kanuri}{KNR}
-\newfontlanguage{Kodagu}{KOD}\newfontlanguage{Korean~Old~Hangul}{KOH}
-\newfontlanguage{Konkani}{KOK}\newfontlanguage{Kikongo}{KON}
-\newfontlanguage{Komi-Permyak}{KOP}\newfontlanguage{Korean}{KOR}
-\newfontlanguage{Komi-Zyrian}{KOZ}\newfontlanguage{Kpelle}{KPL}
-\newfontlanguage{Krio}{KRI}\newfontlanguage{Karakalpak}{KRK}
-\newfontlanguage{Karelian}{KRL}\newfontlanguage{Karaim}{KRM}
-\newfontlanguage{Karen}{KRN}\newfontlanguage{Koorete}{KRT}
-\newfontlanguage{Kashmiri}{KSH}\newfontlanguage{Khasi}{KSI}
-\newfontlanguage{Kildin~Sami}{KSM}\newfontlanguage{Kui}{KUI}
-\newfontlanguage{Kulvi}{KUL}\newfontlanguage{Kumyk}{KUM}
-\newfontlanguage{Kurdish}{KUR}\newfontlanguage{Kurukh}{KUU}
-\newfontlanguage{Kuy}{KUY}\newfontlanguage{Koryak}{KYK}
-\newfontlanguage{Ladin}{LAD}\newfontlanguage{Lahuli}{LAH}
-\newfontlanguage{Lak}{LAK}\newfontlanguage{Lambani}{LAM}
-\newfontlanguage{Lao}{LAO}\newfontlanguage{Latin}{LAT}
-\newfontlanguage{Laz}{LAZ}\newfontlanguage{L-Cree}{LCR}
-\newfontlanguage{Ladakhi}{LDK}\newfontlanguage{Lezgi}{LEZ}
-\newfontlanguage{Lingala}{LIN}\newfontlanguage{Low~Mari}{LMA}
-\newfontlanguage{Limbu}{LMB}\newfontlanguage{Lomwe}{LMW}
-\newfontlanguage{Lower~Sorbian}{LSB}\newfontlanguage{Lule~Sami}{LSM}
-\newfontlanguage{Lithuanian}{LTH}\newfontlanguage{Luba}{LUB}
-\newfontlanguage{Luganda}{LUG}\newfontlanguage{Luhya}{LUH}
-\newfontlanguage{Luo}{LUO}\newfontlanguage{Latvian}{LVI}
-\newfontlanguage{Majang}{MAJ}\newfontlanguage{Makua}{MAK}
-\newfontlanguage{Malayalam~Traditional}{MAL}\newfontlanguage{Mansi}{MAN}
-\newfontlanguage{Marathi}{MAR}\newfontlanguage{Marwari}{MAW}
-\newfontlanguage{Mbundu}{MBN}\newfontlanguage{Manchu}{MCH}
-\newfontlanguage{Moose~Cree}{MCR}\newfontlanguage{Mende}{MDE}
-\newfontlanguage{Me'en}{MEN}\newfontlanguage{Mizo}{MIZ}
-\newfontlanguage{Macedonian}{MKD}\newfontlanguage{Male}{MLE}
-\newfontlanguage{Malagasy}{MLG}\newfontlanguage{Malinke}{MLN}
-\newfontlanguage{Malayalam~Reformed}{MLR}\newfontlanguage{Malay}{MLY}
-\newfontlanguage{Mandinka}{MND}\newfontlanguage{Mongolian}{MNG}
-\newfontlanguage{Manipuri}{MNI}\newfontlanguage{Maninka}{MNK}
-\newfontlanguage{Manx~Gaelic}{MNX}\newfontlanguage{Moksha}{MOK}
-\newfontlanguage{Moldavian}{MOL}\newfontlanguage{Mon}{MON}
-\newfontlanguage{Moroccan}{MOR}\newfontlanguage{Maori}{MRI}
-\newfontlanguage{Maithili}{MTH}\newfontlanguage{Maltese}{MTS}
-\newfontlanguage{Mundari}{MUN}\newfontlanguage{Naga-Assamese}{NAG}
-\newfontlanguage{Nanai}{NAN}\newfontlanguage{Naskapi}{NAS}
-\newfontlanguage{N-Cree}{NCR}\newfontlanguage{Ndebele}{NDB}
-\newfontlanguage{Ndonga}{NDG}\newfontlanguage{Nepali}{NEP}
-\newfontlanguage{Newari}{NEW}\newfontlanguage{Nagari}{NGR}
-\newfontlanguage{Norway~House~Cree}{NHC}\newfontlanguage{Nisi}{NIS}
-\newfontlanguage{Niuean}{NIU}\newfontlanguage{Nkole}{NKL}
-\newfontlanguage{N'ko}{NKO}\newfontlanguage{Dutch}{NLD}
-\newfontlanguage{Nogai}{NOG}\newfontlanguage{Norwegian}{NOR}
-\newfontlanguage{Northern~Sami}{NSM}\newfontlanguage{Northern~Tai}{NTA}
-\newfontlanguage{Esperanto}{NTO}\newfontlanguage{Nynorsk}{NYN}
-\newfontlanguage{Oji-Cree}{OCR}\newfontlanguage{Ojibway}{OJB}
-\newfontlanguage{Oriya}{ORI}\newfontlanguage{Oromo}{ORO}
-\newfontlanguage{Ossetian}{OSS}\newfontlanguage{Palestinian~Aramaic}{PAA}
-\newfontlanguage{Pali}{PAL}\newfontlanguage{Punjabi}{PAN}
-\newfontlanguage{Palpa}{PAP}\newfontlanguage{Pashto}{PAS}
-\newfontlanguage{Polytonic~Greek}{PGR}\newfontlanguage{Pilipino}{PIL}
-\newfontlanguage{Palaung}{PLG}\newfontlanguage{Polish}{PLK}
-\newfontlanguage{Provencal}{PRO}\newfontlanguage{Portuguese}{PTG}
-\newfontlanguage{Chin}{QIN}\newfontlanguage{Rajasthani}{RAJ}
-\newfontlanguage{R-Cree}{RCR}\newfontlanguage{Russian~Buriat}{RBU}
-\newfontlanguage{Riang}{RIA}\newfontlanguage{Rhaeto-Romanic}{RMS}
-\newfontlanguage{Romanian}{ROM}\newfontlanguage{Romany}{ROY}
-\newfontlanguage{Rusyn}{RSY}\newfontlanguage{Ruanda}{RUA}
-\newfontlanguage{Russian}{RUS}\newfontlanguage{Sadri}{SAD}
-\newfontlanguage{Sanskrit}{SAN}\newfontlanguage{Santali}{SAT}
-\newfontlanguage{Sayisi}{SAY}\newfontlanguage{Sekota}{SEK}
-\newfontlanguage{Selkup}{SEL}\newfontlanguage{Sango}{SGO}
-\newfontlanguage{Shan}{SHN}\newfontlanguage{Sibe}{SIB}
-\newfontlanguage{Sidamo}{SID}\newfontlanguage{Silte~Gurage}{SIG}
-\newfontlanguage{Skolt~Sami}{SKS}\newfontlanguage{Slovak}{SKY}
-\newfontlanguage{Slavey}{SLA}\newfontlanguage{Slovenian}{SLV}
-\newfontlanguage{Somali}{SML}\newfontlanguage{Samoan}{SMO}
-\newfontlanguage{Sena}{SNA}\newfontlanguage{Sindhi}{SND}
-\newfontlanguage{Sinhalese}{SNH}\newfontlanguage{Soninke}{SNK}
-\newfontlanguage{Sodo~Gurage}{SOG}\newfontlanguage{Sotho}{SOT}
-\newfontlanguage{Albanian}{SQI}\newfontlanguage{Serbian}{SRB}
-\newfontlanguage{Saraiki}{SRK}\newfontlanguage{Serer}{SRR}
-\newfontlanguage{South~Slavey}{SSL}\newfontlanguage{Southern~Sami}{SSM}
-\newfontlanguage{Suri}{SUR}\newfontlanguage{Svan}{SVA}
-\newfontlanguage{Swedish}{SVE}\newfontlanguage{Swadaya~Aramaic}{SWA}
-\newfontlanguage{Swahili}{SWK}\newfontlanguage{Swazi}{SWZ}
-\newfontlanguage{Sutu}{SXT}\newfontlanguage{Syriac}{SYR}
-\newfontlanguage{Tabasaran}{TAB}\newfontlanguage{Tajiki}{TAJ}
-\newfontlanguage{Tamil}{TAM}\newfontlanguage{Tatar}{TAT}
-\newfontlanguage{TH-Cree}{TCR}\newfontlanguage{Telugu}{TEL}
-\newfontlanguage{Tongan}{TGN}\newfontlanguage{Tigre}{TGR}
-\newfontlanguage{Tigrinya}{TGY}\newfontlanguage{Thai}{THA}
-\newfontlanguage{Tahitian}{THT}\newfontlanguage{Tibetan}{TIB}
-\newfontlanguage{Turkmen}{TKM}\newfontlanguage{Temne}{TMN}
-\newfontlanguage{Tswana}{TNA}\newfontlanguage{Tundra~Nenets}{TNE}
-\newfontlanguage{Tonga}{TNG}\newfontlanguage{Todo}{TOD}
-\newfontlanguage{Tsonga}{TSG}\newfontlanguage{Turoyo~Aramaic}{TUA}
-\newfontlanguage{Tulu}{TUL}\newfontlanguage{Tuvin}{TUV}
-\newfontlanguage{Twi}{TWI}\newfontlanguage{Udmurt}{UDM}
-\newfontlanguage{Ukrainian}{UKR}\newfontlanguage{Urdu}{URD}
-\newfontlanguage{Upper~Sorbian}{USB}\newfontlanguage{Uyghur}{UYG}
-\newfontlanguage{Uzbek}{UZB}\newfontlanguage{Venda}{VEN}
-\newfontlanguage{Vietnamese}{VIT}\newfontlanguage{Wa}{WA}
-\newfontlanguage{Wagdi}{WAG}\newfontlanguage{West-Cree}{WCR}
-\newfontlanguage{Welsh}{WEL}\newfontlanguage{Wolof}{WLF}
-\newfontlanguage{Tai~Lue}{XBD}\newfontlanguage{Xhosa}{XHS}
-\newfontlanguage{Yakut}{YAK}\newfontlanguage{Yoruba}{YBA}
-\newfontlanguage{Y-Cree}{YCR}\newfontlanguage{Yi~Classic}{YIC}
-\newfontlanguage{Yi~Modern}{YIM}\newfontlanguage{Chinese~Hong~Kong}{ZHH}
+\newfontlanguage{Finnish}{FIN}
+\newfontlanguage{Fijian}{FJI}
+\newfontlanguage{Flemish}{FLE}
+\newfontlanguage{Forest~Nenets}{FNE}
+\newfontlanguage{Fon}{FON}
+\newfontlanguage{Faroese}{FOS}
+\newfontlanguage{French}{FRA}
+\newfontlanguage{Frisian}{FRI}
+\newfontlanguage{Friulian}{FRL}
+\newfontlanguage{Futa}{FTA}
+\newfontlanguage{Fulani}{FUL}
+\newfontlanguage{Ga}{GAD}
+\newfontlanguage{Gaelic}{GAE}
+\newfontlanguage{Gagauz}{GAG}
+\newfontlanguage{Galician}{GAL}
+\newfontlanguage{Garshuni}{GAR}
+\newfontlanguage{Garhwali}{GAW}
+\newfontlanguage{Ge'ez}{GEZ}
+\newfontlanguage{Gilyak}{GIL}
+\newfontlanguage{Gumuz}{GMZ}
+\newfontlanguage{Gondi}{GON}
+\newfontlanguage{Greenlandic}{GRN}
+\newfontlanguage{Garo}{GRO}
+\newfontlanguage{Guarani}{GUA}
+\newfontlanguage{Gujarati}{GUJ}
+\newfontlanguage{Haitian}{HAI}
+\newfontlanguage{Halam}{HAL}
+\newfontlanguage{Harauti}{HAR}
+\newfontlanguage{Hausa}{HAU}
+\newfontlanguage{Hawaiin}{HAW}
+\newfontlanguage{Hammer-Banna}{HBN}
+\newfontlanguage{Hiligaynon}{HIL}
+\newfontlanguage{Hindi}{HIN}
+\newfontlanguage{High~Mari}{HMA}
+\newfontlanguage{Hindko}{HND}
+\newfontlanguage{Ho}{HO}
+\newfontlanguage{Harari}{HRI}
+\newfontlanguage{Croatian}{HRV}
+\newfontlanguage{Hungarian}{HUN}
+\newfontlanguage{Armenian}{HYE}
+\newfontlanguage{Igbo}{IBO}
+\newfontlanguage{Ijo}{IJO}
+\newfontlanguage{Ilokano}{ILO}
+\newfontlanguage{Indonesian}{IND}
+\newfontlanguage{Ingush}{ING}
+\newfontlanguage{Inuktitut}{INU}
+\newfontlanguage{Irish}{IRI}
+\newfontlanguage{Irish~Traditional}{IRT}
+\newfontlanguage{Icelandic}{ISL}
+\newfontlanguage{Inari~Sami}{ISM}
+\newfontlanguage{Italian}{ITA}
+\newfontlanguage{Hebrew}{IWR}
+\newfontlanguage{Javanese}{JAV}
+\newfontlanguage{Yiddish}{JII}
+\newfontlanguage{Japanese}{JAN}
+\newfontlanguage{Judezmo}{JUD}
+\newfontlanguage{Jula}{JUL}
+\newfontlanguage{Kabardian}{KAB}
+\newfontlanguage{Kachchi}{KAC}
+\newfontlanguage{Kalenjin}{KAL}
+\newfontlanguage{Kannada}{KAN}
+\newfontlanguage{Karachay}{KAR}
+\newfontlanguage{Georgian}{KAT}
+\newfontlanguage{Kazakh}{KAZ}
+\newfontlanguage{Kebena}{KEB}
+\newfontlanguage{Khutsuri~Georgian}{KGE}
+\newfontlanguage{Khakass}{KHA}
+\newfontlanguage{Khanty-Kazim}{KHK}
+\newfontlanguage{Khmer}{KHM}
+\newfontlanguage{Khanty-Shurishkar}{KHS}
+\newfontlanguage{Khanty-Vakhi}{KHV}
+\newfontlanguage{Khowar}{KHW}
+\newfontlanguage{Kikuyu}{KIK}
+\newfontlanguage{Kirghiz}{KIR}
+\newfontlanguage{Kisii}{KIS}
+\newfontlanguage{Kokni}{KKN}
+\newfontlanguage{Kalmyk}{KLM}
+\newfontlanguage{Kamba}{KMB}
+\newfontlanguage{Kumaoni}{KMN}
+\newfontlanguage{Komo}{KMO}
+\newfontlanguage{Komso}{KMS}
+\newfontlanguage{Kanuri}{KNR}
+\newfontlanguage{Kodagu}{KOD}
+\newfontlanguage{Korean~Old~Hangul}{KOH}
+\newfontlanguage{Konkani}{KOK}
+\newfontlanguage{Kikongo}{KON}
+\newfontlanguage{Komi-Permyak}{KOP}
+\newfontlanguage{Korean}{KOR}
+\newfontlanguage{Komi-Zyrian}{KOZ}
+\newfontlanguage{Kpelle}{KPL}
+\newfontlanguage{Krio}{KRI}
+\newfontlanguage{Karakalpak}{KRK}
+\newfontlanguage{Karelian}{KRL}
+\newfontlanguage{Karaim}{KRM}
+\newfontlanguage{Karen}{KRN}
+\newfontlanguage{Koorete}{KRT}
+\newfontlanguage{Kashmiri}{KSH}
+\newfontlanguage{Khasi}{KSI}
+\newfontlanguage{Kildin~Sami}{KSM}
+\newfontlanguage{Kui}{KUI}
+\newfontlanguage{Kulvi}{KUL}
+\newfontlanguage{Kumyk}{KUM}
+\newfontlanguage{Kurdish}{KUR}
+\newfontlanguage{Kurukh}{KUU}
+\newfontlanguage{Kuy}{KUY}
+\newfontlanguage{Koryak}{KYK}
+\newfontlanguage{Ladin}{LAD}
+\newfontlanguage{Lahuli}{LAH}
+\newfontlanguage{Lak}{LAK}
+\newfontlanguage{Lambani}{LAM}
+\newfontlanguage{Lao}{LAO}
+\newfontlanguage{Latin}{LAT}
+\newfontlanguage{Laz}{LAZ}
+\newfontlanguage{L-Cree}{LCR}
+\newfontlanguage{Ladakhi}{LDK}
+\newfontlanguage{Lezgi}{LEZ}
+\newfontlanguage{Lingala}{LIN}
+\newfontlanguage{Low~Mari}{LMA}
+\newfontlanguage{Limbu}{LMB}
+\newfontlanguage{Lomwe}{LMW}
+\newfontlanguage{Lower~Sorbian}{LSB}
+\newfontlanguage{Lule~Sami}{LSM}
+\newfontlanguage{Lithuanian}{LTH}
+\newfontlanguage{Luba}{LUB}
+\newfontlanguage{Luganda}{LUG}
+\newfontlanguage{Luhya}{LUH}
+\newfontlanguage{Luo}{LUO}
+\newfontlanguage{Latvian}{LVI}
+\newfontlanguage{Majang}{MAJ}
+\newfontlanguage{Makua}{MAK}
+\newfontlanguage{Malayalam~Traditional}{MAL}
+\newfontlanguage{Mansi}{MAN}
+\newfontlanguage{Marathi}{MAR}
+\newfontlanguage{Marwari}{MAW}
+\newfontlanguage{Mbundu}{MBN}
+\newfontlanguage{Manchu}{MCH}
+\newfontlanguage{Moose~Cree}{MCR}
+\newfontlanguage{Mende}{MDE}
+\newfontlanguage{Me'en}{MEN}
+\newfontlanguage{Mizo}{MIZ}
+\newfontlanguage{Macedonian}{MKD}
+\newfontlanguage{Male}{MLE}
+\newfontlanguage{Malagasy}{MLG}
+\newfontlanguage{Malinke}{MLN}
+\newfontlanguage{Malayalam~Reformed}{MLR}
+\newfontlanguage{Malay}{MLY}
+\newfontlanguage{Mandinka}{MND}
+\newfontlanguage{Mongolian}{MNG}
+\newfontlanguage{Manipuri}{MNI}
+\newfontlanguage{Maninka}{MNK}
+\newfontlanguage{Manx~Gaelic}{MNX}
+\newfontlanguage{Moksha}{MOK}
+\newfontlanguage{Moldavian}{MOL}
+\newfontlanguage{Mon}{MON}
+\newfontlanguage{Moroccan}{MOR}
+\newfontlanguage{Maori}{MRI}
+\newfontlanguage{Maithili}{MTH}
+\newfontlanguage{Maltese}{MTS}
+\newfontlanguage{Mundari}{MUN}
+\newfontlanguage{Naga-Assamese}{NAG}
+\newfontlanguage{Nanai}{NAN}
+\newfontlanguage{Naskapi}{NAS}
+\newfontlanguage{N-Cree}{NCR}
+\newfontlanguage{Ndebele}{NDB}
+\newfontlanguage{Ndonga}{NDG}
+\newfontlanguage{Nepali}{NEP}
+\newfontlanguage{Newari}{NEW}
+\newfontlanguage{Nagari}{NGR}
+\newfontlanguage{Norway~House~Cree}{NHC}
+\newfontlanguage{Nisi}{NIS}
+\newfontlanguage{Niuean}{NIU}
+\newfontlanguage{Nkole}{NKL}
+\newfontlanguage{N'ko}{NKO}
+\newfontlanguage{Dutch}{NLD}
+\newfontlanguage{Nogai}{NOG}
+\newfontlanguage{Norwegian}{NOR}
+\newfontlanguage{Northern~Sami}{NSM}
+\newfontlanguage{Northern~Tai}{NTA}
+\newfontlanguage{Esperanto}{NTO}
+\newfontlanguage{Nynorsk}{NYN}
+\newfontlanguage{Oji-Cree}{OCR}
+\newfontlanguage{Ojibway}{OJB}
+\newfontlanguage{Oriya}{ORI}
+\newfontlanguage{Oromo}{ORO}
+\newfontlanguage{Ossetian}{OSS}
+\newfontlanguage{Palestinian~Aramaic}{PAA}
+\newfontlanguage{Pali}{PAL}
+\newfontlanguage{Punjabi}{PAN}
+\newfontlanguage{Palpa}{PAP}
+\newfontlanguage{Pashto}{PAS}
+\newfontlanguage{Polytonic~Greek}{PGR}
+\newfontlanguage{Pilipino}{PIL}
+\newfontlanguage{Palaung}{PLG}
+\newfontlanguage{Polish}{PLK}
+\newfontlanguage{Provencal}{PRO}
+\newfontlanguage{Portuguese}{PTG}
+\newfontlanguage{Chin}{QIN}
+\newfontlanguage{Rajasthani}{RAJ}
+\newfontlanguage{R-Cree}{RCR}
+\newfontlanguage{Russian~Buriat}{RBU}
+\newfontlanguage{Riang}{RIA}
+\newfontlanguage{Rhaeto-Romanic}{RMS}
+\newfontlanguage{Romanian}{ROM}
+\newfontlanguage{Romany}{ROY}
+\newfontlanguage{Rusyn}{RSY}
+\newfontlanguage{Ruanda}{RUA}
+\newfontlanguage{Russian}{RUS}
+\newfontlanguage{Sadri}{SAD}
+\newfontlanguage{Sanskrit}{SAN}
+\newfontlanguage{Santali}{SAT}
+\newfontlanguage{Sayisi}{SAY}
+\newfontlanguage{Sekota}{SEK}
+\newfontlanguage{Selkup}{SEL}
+\newfontlanguage{Sango}{SGO}
+\newfontlanguage{Shan}{SHN}
+\newfontlanguage{Sibe}{SIB}
+\newfontlanguage{Sidamo}{SID}
+\newfontlanguage{Silte~Gurage}{SIG}
+\newfontlanguage{Skolt~Sami}{SKS}
+\newfontlanguage{Slovak}{SKY}
+\newfontlanguage{Slavey}{SLA}
+\newfontlanguage{Slovenian}{SLV}
+\newfontlanguage{Somali}{SML}
+\newfontlanguage{Samoan}{SMO}
+\newfontlanguage{Sena}{SNA}
+\newfontlanguage{Sindhi}{SND}
+\newfontlanguage{Sinhalese}{SNH}
+\newfontlanguage{Soninke}{SNK}
+\newfontlanguage{Sodo~Gurage}{SOG}
+\newfontlanguage{Sotho}{SOT}
+\newfontlanguage{Albanian}{SQI}
+\newfontlanguage{Serbian}{SRB}
+\newfontlanguage{Saraiki}{SRK}
+\newfontlanguage{Serer}{SRR}
+\newfontlanguage{South~Slavey}{SSL}
+\newfontlanguage{Southern~Sami}{SSM}
+\newfontlanguage{Suri}{SUR}
+\newfontlanguage{Svan}{SVA}
+\newfontlanguage{Swedish}{SVE}
+\newfontlanguage{Swadaya~Aramaic}{SWA}
+\newfontlanguage{Swahili}{SWK}
+\newfontlanguage{Swazi}{SWZ}
+\newfontlanguage{Sutu}{SXT}
+\newfontlanguage{Syriac}{SYR}
+\newfontlanguage{Tabasaran}{TAB}
+\newfontlanguage{Tajiki}{TAJ}
+\newfontlanguage{Tamil}{TAM}
+\newfontlanguage{Tatar}{TAT}
+\newfontlanguage{TH-Cree}{TCR}
+\newfontlanguage{Telugu}{TEL}
+\newfontlanguage{Tongan}{TGN}
+\newfontlanguage{Tigre}{TGR}
+\newfontlanguage{Tigrinya}{TGY}
+\newfontlanguage{Thai}{THA}
+\newfontlanguage{Tahitian}{THT}
+\newfontlanguage{Tibetan}{TIB}
+\newfontlanguage{Turkmen}{TKM}
+\newfontlanguage{Temne}{TMN}
+\newfontlanguage{Tswana}{TNA}
+\newfontlanguage{Tundra~Nenets}{TNE}
+\newfontlanguage{Tonga}{TNG}
+\newfontlanguage{Todo}{TOD}
+\newfontlanguage{Tsonga}{TSG}
+\newfontlanguage{Turoyo~Aramaic}{TUA}
+\newfontlanguage{Tulu}{TUL}
+\newfontlanguage{Tuvin}{TUV}
+\newfontlanguage{Twi}{TWI}
+\newfontlanguage{Udmurt}{UDM}
+\newfontlanguage{Ukrainian}{UKR}
+\newfontlanguage{Urdu}{URD}
+\newfontlanguage{Upper~Sorbian}{USB}
+\newfontlanguage{Uyghur}{UYG}
+\newfontlanguage{Uzbek}{UZB}
+\newfontlanguage{Venda}{VEN}
+\newfontlanguage{Vietnamese}{VIT}
+\newfontlanguage{Wa}{WA}
+\newfontlanguage{Wagdi}{WAG}
+\newfontlanguage{West-Cree}{WCR}
+\newfontlanguage{Welsh}{WEL}
+\newfontlanguage{Wolof}{WLF}
+\newfontlanguage{Tai~Lue}{XBD}
+\newfontlanguage{Xhosa}{XHS}
+\newfontlanguage{Yakut}{YAK}
+\newfontlanguage{Yoruba}{YBA}
+\newfontlanguage{Y-Cree}{YCR}
+\newfontlanguage{Yi~Classic}{YIC}
+\newfontlanguage{Yi~Modern}{YIM}
+\newfontlanguage{Chinese~Hong~Kong}{ZHH}
 \newfontlanguage{Chinese~Phonetic}{ZHP}
 \newfontlanguage{Chinese~Simplified}{ZHS}
-\newfontlanguage{Chinese~Traditional}{ZHT}\newfontlanguage{Zande}{ZND}
+\newfontlanguage{Chinese~Traditional}{ZHT}
+\newfontlanguage{Zande}{ZND}
 \newfontlanguage{Zulu}{ZUL}
-\keys_define:nn {fontspec}
- {
-  Language / Turkish .code:n =
-   {
-    \fontspec_check_lang:nTF {TRK}
-     {
-      \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-      \tl_set:Nn \l_fontspec_lang_tl {TRK}
-     }
-     {
-      \fontspec_check_lang:nTF {TUR}
-       {
-        \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-        \tl_set:Nn \l_fontspec_lang_tl {TUR}
-       }
-       {
-        \__fontspec_warning:nx {language-not-exist} {Turkish}
-        \keys_set:nn {fontspec} {Language=Default}
-       }
-     }
-   }
- }
-\__fontspec_keys_define_code:nnn {fontspec}{ Language / Default }
- {
-  \tl_set:Nn \l_fontspec_lang_tl {DFLT}
-  \int_zero:N \l_fontspec_language_int
- }
-\__fontspec_keys_define_code:nnn {fontspec} {RawFeature}
- {
-  \__fontspec_update_featstr:n {#1}
- }
+
+
+\providecommand\UnicodeFontFile[2]{"[#1]:#2"}
+\providecommand\UnicodeFontName[2]{"#1:#2"}
+\providecommand\UnicodeFontTeXLigatures{+tlig;}
+\providecommand\add@unicode@accent[2]{#2\char#1\relax}
+\providecommand\DeclareUnicodeAccent[3]{%
+  \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
+}
+\DeclareDocumentCommand \EncodingCommand {mO{}m}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingCommand }
+    \DeclareTextCommand{#1}{\UnicodeEncodingName}[#2]{#3}
+  }
+\DeclareDocumentCommand \EncodingAccent {mm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingAccent }
+    \DeclareTextCommand{#1}{\UnicodeEncodingName}{\add@unicode@accent{#2}}
+  }
+\DeclareDocumentCommand \EncodingSymbol {mm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingSymbol }
+    \DeclareTextSymbol{#1}{\UnicodeEncodingName}{#2}
+  }
+\DeclareDocumentCommand \EncodingComposite {mmm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingComposite }
+    \DeclareTextComposite{#1}{\UnicodeEncodingName}{#2}{#3}
+  }
+\DeclareDocumentCommand \EncodingCompositeCommand {mmm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingCompositeCommand }
+    \DeclareTextCompositeCommand{#1}{\UnicodeEncodingName}{#2}{#3}
+  }
+\DeclareDocumentCommand \DeclareUnicodeEncoding {mm}
+  {
+    \DeclareFontEncoding{#1}{}{}
+    \DeclareErrorFont{#1}{lmr}{m}{n}{10}
+    \DeclareFontSubstitution{#1}{lmr}{m}{n}
+    \DeclareFontFamily{#1}{lmr}{}
+
+    \DeclareFontShape{#1}{lmr}{m}{n}
+      {<->\UnicodeFontFile{lmroman10-regular}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{m}{it}
+      {<->\UnicodeFontFile{lmroman10-italic}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{m}{sc}
+      {<->\UnicodeFontFile{lmromancaps10-regular}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{bx}{n}
+      {<->\UnicodeFontFile{lmroman10-bold}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{bx}{it}
+      {<->\UnicodeFontFile{lmroman10-bolditalic}{\UnicodeFontTeXLigatures}}{}
+
+    \tl_set_eq:NN \l__fontspec_prev_unicode_name_tl \UnicodeEncodingName
+    \tl_set:Nn \UnicodeEncodingName {#1}
+    \bool_set_true:N \l__fontspec_defining_encoding_bool
+    #2
+    \bool_set_false:N \l__fontspec_defining_encoding_bool
+    \tl_set_eq:NN \UnicodeEncodingName \l__fontspec_prev_unicode_name_tl
+  }
+\DeclareDocumentCommand \UndeclareSymbol {m}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \UndeclareSymbol }
+    \UndeclareTextCommand {#1} {\UnicodeEncodingName}
+  }
+
+\DeclareDocumentCommand \UndeclareComposite {mm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \UndeclareComposite }
+    \cs_undefine:c
+      { \c_backslash_str \UnicodeEncodingName \token_to_str:N #1 - \tl_to_str:n {#2} }
+  }
 \@ifpackageloaded{euler}
  {
   \bool_set_true:N \g__fontspec_pkg_euler_loaded_bool
@@ -2585,7 +3221,7 @@
 \tl_set:Nn \zf@enc { \g_fontspec_encoding_tl }
 \cs_set:Npn \zf@fontspec #1 #2
  {
-  \fontspec_select:nn {#1} {#2}
+  \__fontspec_select_font_family:nn {#1} {#2}
   \tl_set:Nn \zf@family { \l_fontspec_family_tl }
   \tl_set:Nn \zf@basefont { \l_fontspec_font }
  }
@@ -2646,27 +3282,45 @@
   \not@math@alphabet\upshape\relax
   \fontspec_merge_shape:n\updefault
  }
-\int_new:N \l__fontspec_em_int
-\int_new:N \l__fontspec_emdef_int
 \cs_new_protected:Npn \emfontdeclare #1
   {
-    \int_zero:N \l__fontspec_emdef_int
-    \clist_map_inline:nn {#1}
-      {
-        \int_incr:N \l__fontspec_emdef_int
-        \cs_set:cpn {__fontspec_em_font_ \int_use:N \l__fontspec_emdef_int _switch:} {##1}
-      }
+    \prop_clear:N \g__fontspec_em_prop
+    \int_zero:N   \l__fontspec_emdef_int
+    \group_begin:
+      \normalfont
+      \clist_map_inline:nn {\emreset,#1}
+        {
+          ##1
+          \prop_gput:NxV \g__fontspec_em_prop { \f@series/\f@shape } { \l__fontspec_emdef_int }
+          \prop_gput:Nxn \g__fontspec_em_prop { switch-\int_use:N \l__fontspec_emdef_int } { ##1 }
+          \int_incr:N \l__fontspec_emdef_int
+        }
+    \group_end:
   }
 \DeclareRobustCommand \em
   {
     \@nomath\em
+
+    \prop_get:NxNT \g__fontspec_em_prop { \f@series/\f@shape } \l__fontspec_em_tmp_tl
+      { \int_set:Nn \l__fontspec_em_int { \l__fontspec_em_tmp_tl } }
+
     \int_incr:N \l__fontspec_em_int
-    \use:c {__fontspec_em_font_ \int_use:N \l__fontspec_em_int _switch:}
+
+    \prop_get:NxNTF \g__fontspec_em_prop { switch-\int_use:N \l__fontspec_em_int } \l__fontspec_em_switch_tl
+      { \l__fontspec_em_switch_tl }
+      {
+        \int_zero:N \l__fontspec_em_int
+        \emreset
+      }
+
   }
 \DeclareTextFontCommand{\emph}{\em}
+\cs_set:Npn \emreset { \upshape }
 \cs_set:Npn \emshape { \itshape }
 \cs_set:Npn \eminnershape { \upshape }
 \emfontdeclare{ \emshape, \eminnershape }
+\cs_set:Npn \reset@font { \normalfont \int_zero:N \l__fontspec_em_int }
+\cs_new:Nn \fontspec_set_em_level:n { \int_set:Nn \l__fontspec_em_int {#1} }
 \DeclareRobustCommand{\-}
  {
   \discretionary
@@ -2681,7 +3335,7 @@
 \def\xlx@defaulthyphenchar{`\-}
 \cs_new:Nn \fontspec_visible_space:
  {
-  \font_glyph_if_exist:NnTF \font {"2423}
+  \__fontspec_primitive_font_glyph_if_exist:NnTF \font {"2423}
    { \char"2423\scan_stop: }
    { \fontspec_visible_space_fallback: }
  }
@@ -2768,15 +3422,15 @@
   { \addfontfeature{Numbers=Lining} #1 }
  }
 %% ------------------------------------------------
-%% Copyright 2004--2016 Will Robertson <wspr81@gmail.com>
+%% Copyright 2004--2017 Will Robertson <wspr81@gmail.com>
 %% Copyright 2009--2013   Khaled Hosny <khaledhosny@eglug.org>
 %% 
 %% Distributable under the LaTeX Project Public License, version 1.3c or higher.
 %% The latest version of this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is "maintained" by Will Robertson.
-%% It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec-example.tex.
-%% And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
+%% It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec*.tex.
+%% And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf.
 %% ------------------------------------------------
 %%
 %% End of file `fontspec-luatex.sty'.
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index 272a2f4257c..c8a4e568aa7 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -5,26 +5,33 @@
 %% The original source files were:
 %%
 %% fontspec.dtx  (with options: `fontspec,xetexx')
-%% fontspec-vars.dtx  (with options: `vars')
-%% fontspec-msg.dtx  (with options: `msg')
+%% fontspec-vars.dtx  (with options: `fontspec,xetexx')
+%% fontspec-msg.dtx  (with options: `fontspec,xetexx')
 %% fontspec-opening.dtx  (with options: `fontspec,xetexx')
 %% fontspec-fontload.dtx  (with options: `fontspec,xetexx')
 %% fontspec-user.dtx  (with options: `fontspec,xetexx')
 %% fontspec-api.dtx  (with options: `fontspec,xetexx')
 %% fontspec-internal.dtx  (with options: `fontspec,xetexx')
+%% fontspec-opentype.dtx  (with options: `fontspec,xetexx')
+%% fontspec-graphite.dtx  (with options: `fontspec,xetexx')
 %% fontspec-keyval.dtx  (with options: `fontspec,xetexx')
+%% fontspec-feat-opentype.dtx  (with options: `fontspec,xetexx')
+%% fontspec-scripts.dtx  (with options: `fontspec,xetexx')
+%% fontspec-lang.dtx  (with options: `fontspec,xetexx')
+%% fontspec-feat-aat.dtx  (with options: `fontspec,xetexx')
+%% fontspec-enc.dtx  (with options: `fontspec,xetexx')
 %% fontspec-math.dtx  (with options: `fontspec,xetexx')
 %% fontspec-closing.dtx  (with options: `fontspec,xetexx')
-%% fontspec-patches.dtx  (with options: `patches')
+%% fontspec-patches.dtx  (with options: `fontspec,xetexx')
 %% ------------------------------------------------
 %% The FONTSPEC package for XeLaTeX/LuaLaTeX
-%% (C)  2004--2016  Will Robertson and Khaled Hosny
+%% (C)  2004--2017  Will Robertson and Khaled Hosny
 %% License information appended.
 %% ------------------------------------------------
 \RequirePackage{expl3}
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec-xetex}%
-  {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/01/02}{2.5c}{Font selection for XeLaTeX and LuaLaTeX}
 \bool_new:N \l__fontspec_firsttime_bool
 \bool_new:N \l__fontspec_nobf_bool
 \bool_new:N \l__fontspec_noit_bool
@@ -43,30 +50,93 @@
 \bool_new:N \g__fontspec_cfg_bool
 \bool_new:N \g__fontspec_math_bool
 \bool_new:N \g__fontspec_euenc_bool
-\int_new:N \l_fontspec_script_int
-\int_new:N \l_fontspec_language_int
-\int_new:N \l_fontspec_strnum_int
+\bool_new:N \l__fontspec_disable_defaults_bool
+\bool_new:N \l__fontspec_alias_bool
+\bool_new:N \l__fontspec_external_bool
+\bool_new:N \l__fontspec_never_check_bool
+\bool_new:N \l__fontspec_defining_encoding_bool
+\bool_new:N \l__fontspec_script_exist_bool
+\int_new:N \l__fontspec_script_int
+\int_new:N \l__fontspec_language_int
+\int_new:N \l__fontspec_strnum_int
+\int_new:N \l__fontspec_tmp_int
+\int_new:N \l__fontspec_em_int
+\int_new:N \l__fontspec_emdef_int
 \fp_new:N \l__fontspec_tmpa_fp
 \fp_new:N \l__fontspec_tmpb_fp
 \dim_new:N \l__fontspec_tmpa_dim
 \dim_new:N \l__fontspec_tmpb_dim
 \dim_new:N \l__fontspec_tmpc_dim
-\tl_set:Nx \c_colon_str { \tl_to_str:N : }
-\cs_set:Npn \use_v:nnnnn #1#2#3#4#5 {#5}
-\cs_set:Npn \use_iv:nnnnn #1#2#3#4#5 {#4}
-\cs_generate_variant:Nn \str_if_eq:nnTF {nv}
-\cs_generate_variant:Nn \int_set:Nn {Nv}
-\cs_generate_variant:Nn \keys_set:nn {nx}
-\cs_generate_variant:Nn \keys_set_known:nnN {nx}
-\cs_generate_variant:Nn \tl_if_empty:nTF {x}
-\cs_generate_variant:Nn \tl_if_empty:nTF {x}
-\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
+\seq_new:N \g__fontspec_bf_series_seq
+\clist_new:N \g__fontspec_default_fontopts_clist
+\clist_new:N \g__fontspec_all_keyval_modules_clist
+\clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}}
+\prop_new:N \g__fontspec_fontopts_prop
+\prop_new:N \l__fontspec_nfss_prop
+\prop_new:N \l__fontspec_nfssfont_prop
+\prop_new:N \g__fontspec_OT_features_prop
+\prop_new:N \g__fontspec_all_opentype_feature_names_prop
+\prop_new:N \g__fontspec_em_prop
+\tl_new:N \g__fontspec_mathrm_tl
+\tl_new:N \g__fontspec_bfmathrm_tl
+\tl_new:N \g__fontspec_mathsf_tl
+\tl_new:N \g__fontspec_mathtt_tl
+\tl_new:N \l__fontspec_family_label_tl
+\tl_new:N \l__fontspec_fake_slant_tl
+\tl_new:N \l__fontspec_fake_embolden_tl
+\tl_new:N \l__fontspec_fontname_up_tl
+\tl_new:N \l__fontspec_fontname_bf_tl
+\tl_new:N \l__fontspec_fontname_it_tl
+\tl_new:N \l__fontspec_fontname_bfit_tl
+\tl_new:N \l__fontspec_fontname_sl_tl
+\tl_new:N \l__fontspec_fontname_bfsl_tl
+\tl_new:N \l__fontspec_fontname_sc_tl
+\tl_new:N \l__fontspec_fontfeat_up_clist
+\tl_new:N \l__fontspec_fontfeat_bf_clist
+\tl_new:N \l__fontspec_fontfeat_it_clist
+\tl_new:N \l__fontspec_fontfeat_bfit_clist
+\tl_new:N \l__fontspec_fontfeat_sl_clist
+\tl_new:N \l__fontspec_fontfeat_bfsl_clist
+\tl_new:N \l__fontspec_fontfeat_sc_clist
+\tl_new:N \l__fontspec_script_name_tl
+\tl_new:N \l_fontspec_script_tl
+\tl_new:N \l__fontspec_lang_name_tl
+\tl_new:N \l_fontspec_lang_tl
+\tl_new:N  \g__fontspec_hexcol_tl
+\tl_new:N  \g__fontspec_opacity_tl
+\tl_set:Nn \g__fontspec_hexcol_tl {000000}
+\tl_set:Nn \g__fontspec_opacity_tl {FF~}
+\tl_set:Nn \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl }
+\cs_new:Nn \__fontspec_keys_set_known:nnN
+  {
+    \keys_set_known:nnN {#1} {#2} #3
+  }
+\cs_generate_variant:Nn \__fontspec_keys_set_known:nnN {nx}
+\cs_set:Npn \__fontspec_head_ii:n #1 { \__fontspec_head_ii:w #1 *** \q_stop}
+\cs_set:Npn \__fontspec_head_ii:w #1#2#3 \q_stop { #1#2 }
+\cs_generate_variant:Nn \__fontspec_head_ii:n {o}
 \cs_new:Nn \__fontspec_int_mult_truncate:Nn
   {
     \int_set:Nn #1 { \__dim_eval:w #2 #1 \__dim_eval_end: }
   }
+\cs_generate_variant:Nn \int_set:Nn {Nv}
+\cs_generate_variant:Nn \keys_set:nn {nx}
+\cs_generate_variant:Nn \keys_set_known:nnN {nx}
+\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
+\cs_generate_variant:Nn \prop_put:Nnn {NxV}
+\cs_generate_variant:Nn \prop_gput:Nnn  {NxV}
+\cs_generate_variant:Nn \prop_gput:Nnn  {Nxn}
+\cs_generate_variant:Nn \prop_get:NnNT  {NxN}
+\cs_generate_variant:Nn \prop_get:NnNTF {NxN}
+\cs_generate_variant:Nn \str_if_eq:nnTF {nv}
+\cs_generate_variant:Nn \tl_if_empty:nTF {x}
+\cs_generate_variant:Nn \tl_if_empty:nF {x}
+\cs_generate_variant:Nn \tl_if_empty:nF {f}
+\cs_generate_variant:Nn \tl_if_eq:nnT {ox}
+\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
 
 \cs_new:Npn \__fontspec_error:n     { \msg_error:nn     {fontspec} }
+\cs_new:Npn \__fontspec_error:nn    { \msg_error:nnn    {fontspec} }
 \cs_new:Npn \__fontspec_error:nx    { \msg_error:nnx    {fontspec} }
 \cs_new:Npn \__fontspec_warning:n   { \msg_warning:nn   {fontspec} }
 \cs_new:Npn \__fontspec_warning:nx  { \msg_warning:nnx  {fontspec} }
@@ -75,190 +145,226 @@
 \cs_new:Npn \__fontspec_info:nx     { \msg_info:nnx     {fontspec} }
 \cs_new:Npn \__fontspec_info:nxx    { \msg_info:nnxx    {fontspec} }
 \cs_new:Npn \__fontspec_trace:n     { \msg_trace:nn     {fontspec} }
-\msg_new:nnn {fontspec} {no-size-info}
+\cs_generate_variant:Nn \msg_new:nnn  {nnx}
+\cs_generate_variant:Nn \msg_new:nnnn {nnxx}
+\cs_new:Nn \__fontspec_msg_new:nnn
+  { \msg_new:nnx {#1} {#2} { \tl_trim_spaces:n {#3} } }
+\cs_new:Nn \__fontspec_msg_new:nnnn
+  { \msg_new:nnxx {#1} {#2} { \tl_trim_spaces:n {#3} } { \tl_trim_spaces:n {#4} } }
+\char_set_catcode_space:n {32}
+\__fontspec_msg_new:nnn {fontspec} {only-inside-encdef}
+ {
+  \exp_not:N#1can only be used in the second argument
+  to \string\DeclareUnicodeEncoding.
+ }
+\__fontspec_msg_new:nnn {fontspec} {only-import-tu}
  {
-  Size~ information~ must~ be~ supplied.\\
-  For~ example,~ SizeFeatures={Size={8-12},...}.
+  The "\string\ImportEncoding" command can only take "TU" as an argument at this stage.
  }
-\msg_new:nnnn {fontspec} {font-not-found}
+\__fontspec_msg_new:nnn {fontspec} {no-size-info}
  {
-  The~ font~ "#1"~ cannot~ be~ found.
+  Size information must be supplied.\\
+  For example, SizeFeatures={Size={8-12},...}.
  }
+\__fontspec_msg_new:nnnn {fontspec} {font-not-found}
  {
-  A~font~might~not~be~found~for~many~reasons.\\
-  Check~the~spelling,~where~the~font~is~installed~etc.~etc.\\\\
-  When~in~doubt,~ask~someone~for~help!
+  The font "#1" cannot be found.
  }
-\msg_new:nnnn {fontspec} {rename-feature-not-exist}
  {
-  The~ feature~ #1~ doesn't~ appear~ to~ be~ defined.
+  A font might not be found for many reasons.\\
+  Check the spelling, where the font is installed etc. etc.\\\\
+  When in doubt, ask someone for help!
  }
+\__fontspec_msg_new:nnnn {fontspec} {rename-feature-not-exist}
  {
-  It~ looks~ like~ you're~ trying~ to~ rename~ a~ feature~ that~ doesn't~ exist.
+  The feature #1 doesn't appear to be defined.
  }
-\msg_new:nnn {fontspec} {no-glyph}
  {
-  '\l_fontspec_fontname_tl'~ does~ not~ contain~ glyph~ #1.
+  It looks like you're trying to rename a feature that doesn't exist.
  }
-\msg_new:nnnn {fontspec} {euler-too-late}
+\__fontspec_msg_new:nnn {fontspec} {no-glyph}
  {
-  The~ euler~ package~ must~ be~ loaded~ BEFORE~ fontspec.
+  '\l_fontspec_fontname_tl' does not contain glyph #1.
  }
+\__fontspec_msg_new:nnnn {fontspec} {euler-too-late}
  {
-  fontspec~ only~ overwrites~ euler's~ attempt~ to~
-  define~ the~ maths~ text~ fonts~ if~ fontspec~ is~
-  loaded~ after~ euler.~ Type~ <return>~ to~ proceed~
-  with~ incorrect~ \string\mathit,~ \string\mathbf,~ etc.
+  The euler package must be loaded BEFORE fontspec.
  }
-\msg_new:nnnn {fontspec} {no-xcolor}
  {
-  Cannot~ load~ named~ colours~ without~ the~ xcolor~ package.
+  fontspec only overwrites euler's attempt to
+  define the maths text fonts if fontspec is
+  loaded after euler. Type <return> to proceed
+  with incorrect \string\mathit, \string\mathbf, etc.
  }
+\__fontspec_msg_new:nnnn {fontspec} {no-xcolor}
  {
-  Sorry,~ I~ can't~ do~ anything~ to~ help.~ Instead~ of~ loading~
-  the~ color~ package,~ use~ xcolor~ instead.~ It's~ better.
+  Cannot load named colours without the xcolor package.
  }
-\msg_new:nnnn {fontspec} {unknown-color-model}
  {
-  Error~ loading~ colour~ `#1';~ unknown~ colour~ model.
+  Sorry, I can't do anything to help. Instead of loading
+  the color package, use xcolor instead.
  }
+\__fontspec_msg_new:nnnn {fontspec} {unknown-color-model}
  {
-  Sorry,~ I~ can't~ do~ anything~ to~ help.~ Please~ report~ this~ error~
-  to~ my~ developer~ with~ a~ minimal~ example~ that~ causes~ the~ problem.
+  Error loading colour `#1'; unknown colour model.
  }
-\msg_new:nnnn {fontspec} {not-in-addfontfeatures}
  {
-  The~ "#1"~ font~ feature~ cannot~ be~ used~ in~ \string\addfontfeatures.
+  Sorry, I can't do anything to help. Please report this error
+  to my developer with a minimal example that causes the problem.
  }
+\__fontspec_msg_new:nnnn {fontspec} {not-in-addfontfeatures}
  {
-  This~ is~ due~ to~ how~ TeX~ loads~ fonts;~ such~ settings~
-  are~ global~ so~ adding~ them~ mid-document~ within~ a~ group~ causes~
-  confusion.~ You'll~ need~ to~ define~ multiple~ font~ families~ to~ achieve~
-  what~ you~ want.
+  The "#1" font feature cannot be used in \string\addfontfeatures.
  }
-\msg_new:nnn {fontspec} {addfontfeatures-ignored}
  {
-  \string\addfontfeature (s)~ ignored~ \msg_line_context:;~
-  it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ a~ fontspec~ command.\\
+  This is due to how TeX loads fonts; such settings
+  are global so adding them mid-document within a group causes
+  confusion. You'll need to define multiple font families to achieve
+  what you want.
+ }
+\__fontspec_msg_new:nnn {fontspec} {tu-clash}
+ {
+  I have found the tuenc.def encoding definition file but the TU encoding is not
+  defined by the LaTeX2e kernel; attempting to correct but you really should update
+  to the latest version of LaTeX2e.
+ }
+\__fontspec_msg_new:nnn {fontspec} {tu-missing}
+ {
+  The TU encoding seems to be missing; please update to the latest version of LaTeX2e.
+ }
+\__fontspec_msg_new:nnn {fontspec} {addfontfeatures-ignored}
+ {
+  \string\addfontfeature (s) ignored \msg_line_context:;
+  it cannot be used with a font that wasn't selected by a fontspec command.\\
   \\
-  The~ current~ font~ is~ "\use:c{font@name}".\\
+  The current font is "\use:c{font@name}".\\
   \int_compare:nTF { \clist_count:n {#1} = 1 }
-    { The~ requested~ feature~ is~ "#1". }
-    { The~ requested~ features~ are~ "#1". }
+    { The requested feature is "#1". }
+    { The requested features are "#1". }
  }
-\msg_new:nnn {fontspec} {feature-option-overwrite}
+\__fontspec_msg_new:nnn {fontspec} {feature-option-overwrite}
  {
-  Option~ '#2'~ of~ font~ feature~ '#1'~ overwritten.
+  Option '#2' of font feature '#1' overwritten.
  }
-\msg_new:nnn {fontspec} {script-not-exist-latn}
+\__fontspec_msg_new:nnn {fontspec} {script-not-exist-latn}
  {
-  Font~ '\l_fontspec_fontname_tl'~ does~ not~ contain~ script~ '#1'.\\
-  'Latin'~ script~ used~ instead.
+  Font '\l_fontspec_fontname_tl' does not contain script '#1'.\\
+  'Latin' script used instead.
  }
-\msg_new:nnn {fontspec} {script-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {script-not-exist}
  {
-  Font~ '\l_fontspec_fontname_tl'~ does~ not~ contain~ script~ '#1'.
+  Font '\l_fontspec_fontname_tl' does not contain script '#1'.
  }
-\msg_new:nnn {fontspec} {aat-feature-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {aat-feature-not-exist}
  {
-  '\l_keys_key_tl=\l_keys_value_tl'~ feature~ not~ supported~
-  for~ AAT~ font~ '\l_fontspec_fontname_tl'.
+  '\l_keys_key_tl=\l_keys_value_tl' feature not supported
+  for AAT font '\l_fontspec_fontname_tl'.
  }
-\msg_new:nnn {fontspec} {aat-feature-not-exist-in-font}
+\__fontspec_msg_new:nnn {fontspec} {aat-feature-not-exist-in-font}
  {
-  AAT~ feature~ '\l_keys_key_tl=\l_keys_value_tl'~ (#1)~ not~ available~
-  in~ font~ '\l_fontspec_fontname_tl'.
+  AAT feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
+  in font '\l_fontspec_fontname_tl'.
  }
-\msg_new:nnn {fontspec} {icu-feature-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {icu-feature-not-exist}
  {
-  '\l_keys_key_tl=\l_keys_value_tl'~ feature~ not~ supported~
-  for~ OpenType~ font~ '\l_fontspec_fontname_tl'
+  '\l_keys_key_tl=\l_keys_value_tl' feature not supported
+  for OpenType font '\l_fontspec_fontname_tl'
  }
-\msg_new:nnn {fontspec} {icu-feature-not-exist-in-font}
+\__fontspec_msg_new:nnn {fontspec} {icu-feature-not-exist-in-font}
  {
-  OpenType~ feature~ '\l_keys_key_tl=\l_keys_value_tl'~ (#1)~ not~ available~
-  for~ font~ '\l_fontspec_fontname_tl'~
-  with~ script~ '\l__fontspec_script_name_tl'~ and~ language~ '\l__fontspec_lang_name_tl'.
+  OpenType feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
+  for font '\l_fontspec_fontname_tl'
+  with script '\l__fontspec_script_name_tl' and language '\l__fontspec_lang_name_tl'.
  }
-\msg_new:nnn {fontspec} {no-opticals}
+\__fontspec_msg_new:nnn {fontspec} {no-opticals}
  {
-  '\l_fontspec_fontname_tl'~ doesn't~ appear~ to~ have~ an~ Optical~ Size~ axis.
+  '\l_fontspec_fontname_tl' doesn't appear to have an Optical Size axis.
  }
-\msg_new:nnn {fontspec} {language-not-exist}
+\__fontspec_msg_new:nnn {fontspec} {language-not-exist}
  {
-  Language~ '#1'~ not~ available~
-  for~ font~ '\l_fontspec_fontname_tl'~
-  with~ script~ '\l__fontspec_script_name_tl'.\\
-  'Default'~ language~ used~ instead.
+  Language '#1' not available
+  for font '\l_fontspec_fontname_tl'
+  with script '\l__fontspec_script_name_tl'.\\
+  'Default' language used instead.
  }
-\msg_new:nnn {fontspec} {only-xetex-feature}
+\__fontspec_msg_new:nnn {fontspec} {only-xetex-feature}
  {
-  Ignored~ XeTeX~ only~ feature:~ '#1'.
+  Ignored XeTeX only feature: '#1'.
  }
-\msg_new:nnn {fontspec} {only-luatex-feature}
+\__fontspec_msg_new:nnn {fontspec} {only-luatex-feature}
  {
-  Ignored~ LuaTeX~ only~ feature:~ '#1'.
+  Ignored LuaTeX only feature: '#1'.
  }
-\msg_new:nnn {fontspec} {no-mapping}
+\__fontspec_msg_new:nnn {fontspec} {no-mapping}
  {
-  Input~ mapping~ not~ (yet?)~ supported~ in~ LuaTeX.
+  Input mapping not (yet?) supported in LuaTeX.
  }
-\msg_new:nnn {fontspec} {no-mapping-ligtex}
+\__fontspec_msg_new:nnn {fontspec} {no-mapping-ligtex}
  {
-  Input~ mapping~ not~ (yet?)~ supported~ in~ LuaTeX.\\
-  Use~ "Ligatures=TeX"~ instead~ of~ "Mapping=tex-text".
+  Input mapping not (yet?) supported in LuaTeX.\\
+  Use "Ligatures=TeX" instead of "Mapping=tex-text".
  }
-\msg_new:nnn {fontspec} {cm-default-obsolete}
+\__fontspec_msg_new:nnn {fontspec} {cm-default-obsolete}
  {
-  The~ "cm-default"~ package~ option~ is~ obsolete.
+  The "cm-default" package option is obsolete.
  }
-\msg_new:nnn {fontspec} {fakebold-only-xetex}
+\__fontspec_msg_new:nnn {fontspec} {fakebold-only-xetex}
  {
-  The~ "FakeBold"~ and~ "AutoFakeBold"~ options~ are~ only~ available~ with~ XeLaTeX.\\
-  Option~ ignored.
+  The "FakeBold" and "AutoFakeBold" options are only available with XeLaTeX.\\
+  Option ignored.
  }
-\msg_new:nnn {fontspec} {defining-font}
+\__fontspec_msg_new:nnn {fontspec} {font-index-needs-ttc}
  {
-  Font~ family~'\l_fontspec_family_tl'~ created~ for~ font~ '#2'~
-  with~ options~ [\l__fontspec_all_features_clist].\\
+  The "FontIndex" feature is only supported by TTC (TrueType Collection) fonts.\\
+  Feature ignored.
+ }
+\__fontspec_msg_new:nnn {fontspec} {feat-cannot-remove}
+ {
+  The "#1" feature cannot be deactivated. Request ignored.
+ }
+\__fontspec_msg_new:nnn {fontspec} {defining-font}
+ {
+  Font family '\l_fontspec_family_tl' created for font '#2'
+  with options [\l__fontspec_all_features_clist].\\
   \\
-  This~ font~ family~ consists~ of~ the~ following~ NFSS~ series/shapes:\\
+  This font family consists of the following NFSS series/shapes:\\
   \l_fontspec_defined_shapes_tl
  }
-\msg_new:nnn {fontspec} {no-font-shape}
+\__fontspec_msg_new:nnn {fontspec} {no-font-shape}
  {
-  Could~ not~ resolve~ font~ #1~ (it~ probably~ doesn't~ exist).
+  Could not resolve font "#1" (it probably doesn't exist).
  }
-\msg_new:nnn {fontspec} {set-scale}
+\__fontspec_msg_new:nnn {fontspec} {set-scale}
  {
-  \l_fontspec_fontname_tl\space scale ~=~ \l__fontspec_scale_tl.
+  \l_fontspec_fontname_tl\space scale = \l__fontspec_scale_tl.
  }
-\msg_new:nnn {fontspec} {setup-math}
+\__fontspec_msg_new:nnn {fontspec} {setup-math}
  {
-  Adjusting~ the~ maths~ setup~ (use~ [no-math]~ to~ avoid~ this).
+  Adjusting the maths setup (use [no-math] to avoid this).
  }
-\msg_new:nnn {fontspec} {no-scripts}
+\__fontspec_msg_new:nnn {fontspec} {no-scripts}
  {
-  Font~ \l_fontspec_fontname_tl\space does~ not~ contain~ any~ OpenType~ `Script'~ information.
+  Font "\l_fontspec_fontname_tl" does not contain any OpenType `Script' information.
  }
-\msg_new:nnn {fontspec} {opa-twice}
+\__fontspec_msg_new:nnn {fontspec} {opa-twice}
  {
-  Opacity~ set~ twice,~ in~ both~ Colour~ and~ Opacity.\\
-  Using~ specification~ "Opacity=#1".
+  Opacity set twice, in both Colour and Opacity.\\
+  Using specification "Opacity=#1".
  }
-\msg_new:nnn {fontspec} {opa-twice-col}
+\__fontspec_msg_new:nnn {fontspec} {opa-twice-col}
  {
-  Opacity~ set~ twice,~ in~ both~ Opacity~ and~ Colour.\\
-  Using~ an~ opacity~ specification~ in~ hex~ of~ "#1/FF".
+  Opacity set twice, in both Opacity and Colour.\\
+  Using an opacity specification in hex of "#1/FF".
  }
-\msg_new:nnn {fontspec} {bad-colour}
+\__fontspec_msg_new:nnn {fontspec} {bad-colour}
  {
-  Bad~ colour~ declaration~ "#1".~
-  Colour~ must~ be~ one~ of:\\
-  *~ a~ named~ xcolor~ colour\\
-  *~ a~ six-digit~ hex~ colour~ RRGGBB\\
-  *~ an~ eight-digit~ hex~ colour~ RRGGBBTT~ with~ opacity
+  Bad colour declaration "#1".
+  Colour must be one of:\\
+  * a named xcolor colour\\
+  * a six-digit hex colour RRGGBB\\
+  * an eight-digit hex colour RRGGBBTT with opacity
  }
+\char_set_catcode_ignore:n {32}
 \DeclareOption{cm-default}
  { \__fontspec_warning:n {cm-default-obsolete} }
 \DeclareOption{math}{\bool_set_true:N \g__fontspec_math_bool}
@@ -277,20 +383,35 @@
   \msg_redirect_module:nnn { fontspec } { warning } { none }
   \msg_redirect_module:nnn { fontspec } { info } { none }
  }
-\ExecuteOptions{config,math,euenc}
+\ExecuteOptions{config,math,tuenc}
 \ProcessOptions*
-\tl_set:Nn \g_fontspec_encoding_tl {TU}
-\file_if_exist:nF {tuenc.def} { \bool_set_true:N \g__fontspec_euenc_bool }
-\bool_if:NT \g__fontspec_euenc_bool
+\bool_if:NF \g__fontspec_euenc_bool
+  {
+    \file_if_exist:nTF {tuenc.def}
+      {
+        \cs_if_exist:cF {T@TU}
+          {
+            \__fontspec_warning:n {tu-clash}
+            \DeclareFontEncoding{TU}{}{}
+            \DeclareFontSubstitution{TU}{lmr}{m}{n}
+          }
+      }
+      {
+        \__fontspec_warning:n {tu-missing}
+        \bool_set_true:N \g__fontspec_euenc_bool
+      }
+  }
+\bool_if:NTF \g__fontspec_euenc_bool
   {
     \tl_set:Nn \g_fontspec_encoding_tl {EU1}
   }
+  { \tl_set:Nn \g_fontspec_encoding_tl { TU } }
 \tl_set:Nn \rmdefault {lmr}
 \tl_set:Nn \sfdefault {lmss}
 \tl_set:Nn \ttdefault {lmtt}
 \RequirePackage[\g_fontspec_encoding_tl]{fontenc}
 \tl_set_eq:NN \UTFencname \g_fontspec_encoding_tl % for xunicode if needed
-\normalsize % to overcome the encoding changing the current font size
+\tl_if_in:NnT \@filelist {.cls} { \normalsize }
 \tl_set_eq:NN \cyrillicencoding \g_fontspec_encoding_tl
 \tl_set_eq:NN \latinencoding    \g_fontspec_encoding_tl
 \AtBeginDocument
@@ -303,23 +424,19 @@
     \RequirePackage{xunicode}
   }
 
-\cs_set:Nn \__fontspec_fontwrap:n { "#1" }
 \cs_set:Npn \__fontspec_primitive_font_set:Nnn #1#2#3
   {
     \font #1 = #2 ~at~ #3 \scan_stop:
   }
-
 \cs_set:Npn \__fontspec_primitive_font_gset:Nnn #1#2#3
   {
     \global \font #1 = #2 ~at~ #3 \scan_stop:
   }
-
 \cs_set:Npn \__fontspec_font_suppress_not_found_error:
   {
     \int_set_eq:NN \xetex_suppressfontnotfounderror:D \c_one
   }
-
-\prg_set_conditional:Nnn \__fontspec_font_if_null:N {p,TF,T,F}
+\prg_set_conditional:Nnn \__fontspec_primitive_font_if_null:N {p,TF,T,F}
   {
     \ifx #1 \nullfont
       \prg_return_true:
@@ -327,102 +444,95 @@
       \prg_return_false:
     \fi
   }
-\cs_new:Nn \__fontspec_font_set:Nnn
- {
-  \__fontspec_primitive_font_set:Nnn  #1 { \__fontspec_fontwrap:n {#2} } {#3}
- }
-\cs_new:Nn \__fontspec_font_gset:Nnn
- {
-  \__fontspec_primitive_font_gset:Nnn #1 { \__fontspec_fontwrap:n {#2} } {#3}
- }
-\prg_new_conditional:Nnn \font_glyph_if_exist:Nn {p,TF,T,F}
- {
-  \etex_iffontchar:D #1 #2 \scan_stop:
-    \prg_return_true:
-  \else:
-    \prg_return_false:
-  \fi:
- }
-\cs_new:Nn \__fontspec_pass_args:nnn
- {
-  \IfNoValueTF {#2}
-   { \__fontspec_post_arg:w {#1} {#3} }
-   { #1 {#2} {#3} }
- }
-\NewDocumentCommand \__fontspec_post_arg:w { m m O{} }
- { #1 {#3} {#2} }
-\NewDocumentCommand \fontspec { o m }
- { \__fontspec_pass_args:nnn \__fontspec_fontspec:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_fontspec:nn
+\prg_set_conditional:Nnn \__fontspec_primitive_font_if_exist:n {TF,T,F}
+  {
+    \group_begin:
+      \__fontspec_font_suppress_not_found_error:
+      \__fontspec_primitive_font_set:Nnn \l__fontspec_primitive_font {#1} {10pt}
+      \__fontspec_primitive_font_if_null:NTF \l__fontspec_primitive_font
+        { \group_end: \prg_return_false: }
+        { \group_end: \prg_return_true:  }
+  }
+\prg_new_conditional:Nnn \__fontspec_primitive_font_glyph_if_exist:Nn {p,TF,T,F}
+  {
+    \etex_iffontchar:D #1 #2 \scan_stop:
+      \prg_return_true:
+    \else:
+      \prg_return_false:
+    \fi:
+  }
+\NewDocumentCommand \fontspec { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \f@family {#1} {#2}
+  \fontspec_set_family:Nnn \f@family {#1,#3} {#2}
   \fontencoding { \l__fontspec_nfss_enc_tl }
   \selectfont
   \ignorespaces
  }
-\DeclareDocumentCommand \setmainfont { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmainfont:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmainfont:nn
+\DeclareDocumentCommand \setmainfont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \rmdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily }
+   {
+    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g__fontspec_rmfamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\rmdefault}
+    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
-
-\DeclareDocumentCommand \setsansfont { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setsansfont:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setsansfont:nn
+\DeclareDocumentCommand \setsansfont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \sfdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g__fontspec_sffamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \sffamily }
+   {
+    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g__fontspec_sffamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\sfdefault}
+    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
-
-\DeclareDocumentCommand \setmonofont { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmonofont:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmonofont:nn
+\DeclareDocumentCommand \setmonofont { O{} m O{} }
  {
-  \fontspec_set_family:Nnn \ttdefault {#1}{#2}
+  \fontspec_set_family:Nnn \g__fontspec_ttfamily_family {#1,#3} {#2}
+  \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family
+  \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily }
+   {
+    \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+    \exp_not:N \fontfamily { \g__fontspec_ttfamily_family }
+    \exp_not:N \selectfont
+   }
+  }
+  \str_if_eq_x:nnT {\familydefault} {\ttdefault}
+    { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
   \normalfont
   \ignorespaces
  }
 \cs_set_eq:NN \setromanfont \setmainfont
-\tl_new:N \g__fontspec_mathrm_tl
-\tl_new:N \g__fontspec_bfmathrm_tl
-\tl_new:N \g__fontspec_mathsf_tl
-\tl_new:N \g__fontspec_mathtt_tl
-\DeclareDocumentCommand \setmathrm { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmathrm:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmathrm:nn
+\DeclareDocumentCommand \setmathrm { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setboldmathrm { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setboldmathrm:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setboldmathrm:nn
+\DeclareDocumentCommand \setboldmathrm { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_bfmathrm_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setmathsf { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmathsf:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmathsf:nn
+\DeclareDocumentCommand \setmathsf { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {#1} {#2}
  }
 
-\DeclareDocumentCommand \setmathtt { o m }
- { \__fontspec_pass_args:nnn \__fontspec_setmathtt:nn {#1} {#2} }
-
-\cs_new:Nn \__fontspec_setmathtt:nn
+\DeclareDocumentCommand \setmathtt { O{} m O{} }
  {
   \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {#1} {#2}
  }
@@ -433,12 +543,9 @@
 \tl_set:Nn \g__fontspec_mathrm_tl {\rmdefault}
 \tl_set:Nn \g__fontspec_mathsf_tl {\sfdefault}
 \tl_set:Nn \g__fontspec_mathtt_tl {\ttdefault}
-\DeclareDocumentCommand \newfontfamily { m o m }
- { \__fontspec_pass_args:nnn { \__fontspec_newfontfamily:Nnn #1 } {#2} {#3} }
-
-\cs_new:Nn \__fontspec_newfontfamily:Nnn
+\DeclareDocumentCommand \newfontfamily { m O{} m O{} }
  {
-  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3}
+  \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2,#4} {#3}
   \use:x
    {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1
@@ -449,15 +556,10 @@
      }
    }
  }
-\DeclareDocumentCommand \newfontface { m o m }
- { \__fontspec_pass_args:nnn { \__fontspec_newfontface:Nnn #1 } {#2} {#3} }
-
-\cs_new:Nn \__fontspec_newfontface:Nnn
+\DeclareDocumentCommand \newfontface { m O{} m O{} }
  {
-  \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
+  \newfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
  }
-\clist_new:N \g__fontspec_default_fontopts_clist
-\prop_new:N \g__fontspec_fontopts_prop
 \DeclareDocumentCommand \defaultfontfeatures { t+ o m }
  {
   \IfNoValueTF {#2}
@@ -492,19 +594,6 @@
      }
    }
  }
-\cs_new:Nn \__fontspec_sanitise_fontname:Nn
- {
-  \tl_set:Nx #1 {#2}
-  \clist_map_inline:Nn \l__fontspec_extensions_clist
-   {
-     \tl_if_in:NnT #1 {##1}
-       {
-         \tl_remove_once:Nn #1 {##1}
-         \clist_map_break:
-       }
-   }
- }
-\bool_new:N \l__fontspec_disable_defaults_bool
 \DeclareDocumentCommand \addfontfeatures {m}
  {
   \fontspec_if_fontspec_font:TF
@@ -516,7 +605,7 @@
       \bool_set_true:N \l__fontspec_disable_defaults_bool
       \use:x
        {
-        \exp_not:N \fontspec_select:nn
+        \__fontspec_select_font_family:nn
           { \l__fontspec_options_tl , #1 } {\l__fontspec_fontname_tl}
        }
     \group_end:
@@ -541,49 +630,57 @@
 \DeclareDocumentCommand \newAATfeature {mmmm}
  {
   \keys_if_exist:nnF { fontspec } {#1}
-    { \__fontspec_define_font_feature:n {#1} }
+    { \__fontspec_define_aat_feature_group:n {#1} }
   \keys_if_choice_exist:nnnT {fontspec} {#1} {#2}
     { \__fontspec_warning:nxx {feature-option-overwrite} {#1} {#2} }
-  \__fontspec_define_feature_option:nnnnn {#1}{#2}{#3}{#4}{}
+  \__fontspec_define_aat_feature:nnnn {#1}{#2}{#3}{#4}
  }
 \DeclareDocumentCommand \newopentypefeature {mmm}
  {
   \keys_if_exist:nnF { fontspec / options } {#1}
-    { \__fontspec_define_font_feature:n {#1} }
+    { \__fontspec_define_opentype_feature_group:n {#1} }
   \keys_if_choice_exist:nnnT {fontspec} {#1} {#2}
     { \__fontspec_warning:nxx {feature-option-overwrite} {#1} {#2} }
-  \__fontspec_define_feature_option:nnnnn {#1}{#2}{}{}{#3}
+  \__fontspec_define_opentype_feature:nnn {#1}{#2}{#3}
  }
 \cs_set_eq:NN \newICUfeature \newopentypefeature % deprecated
-\bool_new:N \l__fontspec_alias_bool
 \DeclareDocumentCommand \aliasfontfeature {mm}
  {
   \bool_set_false:N \l__fontspec_alias_bool
 
   \clist_map_inline:nn
-   { fontspec, fontspec-preparse, fontspec-preparse-external,
+   { fontspec, fontspec-opentype, fontspec-aat, fontspec-preparse, fontspec-preparse-external,
      fontspec-preparse-nested, fontspec-renderer }
    {
 
      \keys_if_exist:nnT {##1} {#1}
       {
         \bool_set_true:N \l__fontspec_alias_bool
-        \__fontspec_alias_font_feature:nnn {##1} {#1} {#2}
+        \keys_define:nn {##1}
+          { #2 .code:n = { \keys_set:nn {##1} { #1 = {####1} } } }
       }
    }
 
   \bool_if:NF \l__fontspec_alias_bool
     { \__fontspec_warning:nx {rename-feature-not-exist} {#1} }
  }
+\DeclareDocumentCommand \aliasfontfeatureoption {mmm}
+ {
+  \bool_set_false:N \l__fontspec_alias_bool
 
-\cs_set:Nn \__fontspec_alias_font_feature:nnn
-  {
-    \keys_define:nn {#1}
-      { #3 .code:n = { \keys_set:nn {#1} { #2 = {##1} } } }
-  }
+  \clist_map_inline:Nn \g__fontspec_all_keyval_modules_clist
+   {
 
-\DeclareDocumentCommand \aliasfontfeatureoption {mmm}
-  { \keys_define:nn { fontspec / #1 } { #3 .meta:n = {#2} } }
+     \keys_if_exist:nnT {##1} {#1}
+      {
+        \bool_set_true:N \l__fontspec_alias_bool
+        \keys_define:nn { ##1 / #1 } { #3 .meta:n = {#2} }
+      }
+   }
+
+  \bool_if:NF \l__fontspec_alias_bool
+    { \__fontspec_warning:nx {rename-feature-not-exist} {#1} }
+ }
 \DeclareDocumentCommand \newfontscript {mm}
  {
   \fontspec_new_script:nn {#1} {#2}
@@ -599,6 +696,31 @@
  }
 \DeclareFontsExtensions{.otf,.ttf,.OTF,.TTF,.ttc,.TTC,.dfont}
 
+\DeclareDocumentCommand \IfFontFeatureActiveTF {mmm}
+  {
+    \__fontspec_if_font_feature:nTF {#1} {#2} {#3}
+  }
+\prg_new_conditional:Nnn \__fontspec_if_font_feature:n {TF}
+  {
+    \tl_gclear:N \g__fontspec_single_feat_tl
+    \group_begin:
+      \__fontspec_font_suppress_not_found_error:
+      \__fontspec_init:
+      \bool_set_true:N \l__fontspec_ot_bool
+      \bool_set_true:N \l__fontspec_never_check_bool
+      \bool_set_false:N \l__fontspec_firsttime_bool
+      \clist_clear:N \l__fontspec_fontfeat_clist
+      \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist {#1}
+    \group_end:
+
+
+    \tl_if_empty:NTF \g__fontspec_single_feat_tl { \prg_return_false: }
+      {
+        \exp_args:NV \fontspec_if_current_feature:nTF \g__fontspec_single_feat_tl
+          { \prg_return_true: } { \prg_return_false: }
+      }
+  }
+
 \prg_new_conditional:Nnn \fontspec_if_fontspec_font: {TF,T,F}
  {
   \cs_if_exist:cTF {g__fontspec_ \f@family _prop} \prg_return_true: \prg_return_false:
@@ -608,10 +730,10 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \bool_if:NTF \l__fontspec_atsui_bool
      {
-      \fontspec_make_AAT_feature_string:nnTF {#1}{#2}
+      \__fontspec_make_AAT_feature_string:nnTF {#1}{#2}
         \prg_return_true: \prg_return_false:
      }
      {
@@ -627,7 +749,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool \prg_return_true: \prg_return_false:
    }
@@ -640,20 +762,20 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-num} \l__fontspec_tmp_tl
-      \int_set:Nn \l_fontspec_script_int {\l__fontspec_tmp_tl}
+      \int_set:Nn \l__fontspec_script_int {\l__fontspec_tmp_tl}
 
       \prop_get:cnN {g__fontspec_ \f@family _prop} {lang-num} \l__fontspec_tmp_tl
-      \int_set:Nn \l_fontspec_language_int {\l__fontspec_tmp_tl}
+      \int_set:Nn \l__fontspec_language_int {\l__fontspec_tmp_tl}
 
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
       \prop_get:cnN {g__fontspec_ \f@family _prop} {lang-tag}  \l_fontspec_lang_tl
 
-      \fontspec_check_ot_feat:nTF {#1} {\prg_return_true:} {\prg_return_false:}
+      \__fontspec_check_ot_feat:nTF {#1} {\prg_return_true:} {\prg_return_false:}
      }
      {
       \prg_return_false:
@@ -668,13 +790,13 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
-      \fontspec_iv_str_to_num:Nn \l_fontspec_script_int {#1}
-      \fontspec_iv_str_to_num:Nn \l_fontspec_language_int {#2}
-      \fontspec_check_ot_feat:nTF {#3} \prg_return_true: \prg_return_false:
+      \__fontspec_iv_str_to_num:Nn \l__fontspec_script_int {#1}
+      \__fontspec_iv_str_to_num:Nn \l__fontspec_language_int {#2}
+      \__fontspec_check_ot_feat:nTF {#3} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -685,11 +807,11 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
-      \fontspec_check_script:nTF {#1} \prg_return_true: \prg_return_false:
+      \__fontspec_check_script:nTF {#1} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -700,15 +822,15 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-num} \l__fontspec_tmp_tl
-      \int_set:Nn \l_fontspec_script_int {\l__fontspec_tmp_tl}
+      \int_set:Nn \l__fontspec_script_int {\l__fontspec_tmp_tl}
       \prop_get:cnN {g__fontspec_ \f@family _prop} {script-tag}  \l_fontspec_script_tl
 
-      \fontspec_check_lang:nTF {#1} \prg_return_true: \prg_return_false:
+      \__fontspec_check_lang:nTF {#1} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -719,13 +841,13 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
       \tl_set:Nn \l_fontspec_script_tl {#1}
-      \fontspec_iv_str_to_num:Nn \l_fontspec_script_int {#1}
-      \fontspec_check_lang:nTF {#2} \prg_return_true: \prg_return_false:
+      \__fontspec_iv_str_to_num:Nn \l__fontspec_script_int {#1}
+      \__fontspec_check_lang:nTF {#2} \prg_return_true: \prg_return_false:
      }
      { \prg_return_false: }
    }
@@ -736,7 +858,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
@@ -753,7 +875,7 @@
   \fontspec_if_fontspec_font:TF
    {
     \prop_get:cnN {g__fontspec_ \f@family _prop} {fontdef} \l__fontspec_fontdef_tl
-    \__fontspec_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font {\l__fontspec_fontdef_tl} {\f@size pt}
     \__fontspec_set_font_type:
     \bool_if:NTF \l__fontspec_ot_bool
      {
@@ -768,48 +890,103 @@
 \cs_new:Nn \fontspec_set_family:Nnn
  {
   \tl_set:Nn \l__fontspec_family_label_tl { #1 }
-  \fontspec_select:nn {#2}{#3}
+  \__fontspec_select_font_family:nn {#2}{#3}
   \tl_set_eq:NN #1 \l_fontspec_family_tl
  }
 \cs_generate_variant:Nn \fontspec_set_family:Nnn {c}
 \cs_new:Nn \fontspec_set_fontface:NNnn
  {
   \tl_set:Nn \l__fontspec_family_label_tl { #1 }
-  \fontspec_select:nn {#3}{#4}
+  \__fontspec_select_font_family:nn {#3}{#4}
   \tl_set_eq:NN #1 \l_fontspec_font
   \tl_set_eq:NN #2 \l_fontspec_family_tl
  }
-\cs_set:Nn \fontspec_select:nn
+\prg_new_conditional:Nnn \fontspec_font_if_exist:n {TF,T,F}
+  {
+    \group_begin:
+      \__fontspec_init:
+      \__fontspec_if_detect_external:nT {#1} { \__fontspec_font_is_file: }
+      \__fontspec_primitive_font_if_exist:nTF { \__fontspec_construct_font_call:nn {#1} {} }
+        { \group_end: \prg_return_true: }
+        { \group_end: \prg_return_false:  }
+  }
+\cs_set_eq:NN \IfFontExistsTF \fontspec_font_if_exist:nTF
+
+\prg_new_conditional:Nnn \fontspec_if_current_feature:n {TF,T,F}
+  {
+    \exp_args:Nxx \tl_if_in:nnTF
+      { \fontname\font } { \tl_to_str:n {#1} }
+      { \prg_return_true: } { \prg_return_false: }%
+  }
+
+\cs_new_protected:Nn \__fontspec_select_font_family:nn
  {
   \group_begin:
   \__fontspec_font_suppress_not_found_error:
   \__fontspec_init:
 
-  \tl_set:Nx \l_fontspec_fontname_tl    {#2}
-  \tl_set:Nx \l_fontspec_fontname_up_tl {#2}
-  \tl_set:Nx \l__fontspec_basename_tl          {#2}
+  \__fontspec_sanitise_fontname:Nn \l_fontspec_fontname_tl    {#2}
+  \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_up_tl {#2}
+  \__fontspec_sanitise_fontname:Nn \l__fontspec_basename_tl          {#2}
 
+  \__fontspec_if_detect_external:nT {#2}
+   { \keys_set:nn {fontspec-preparse-external} {Path} }
+
+  \__fontspec_init_ttc:n {#2}
   \__fontspec_load_external_fontoptions:Nn \l_fontspec_fontname_tl {#2}
+
   \__fontspec_extract_all_features:n {#1}
-  \__fontspec_preparse_features:
+  \tl_set:Nx \l__fontspec_fontid_tl { \tl_to_str:N \l_fontspec_fontname_tl-:-\tl_to_str:N \l__fontspec_all_features_clist }
+
 
+  \__fontspec_preparse_features:
   \__fontspec_load_font:
   \__fontspec_set_scriptlang:
   \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist {}
   \bool_set_false:N \l__fontspec_firsttime_bool
 
-  \__fontspec_save_family:nTF {#2}
+  \__fontspec_save_family_needed:nTF {#2}
    {
-    \__fontspec_save_fontinfo:
-    \__fontspec_find_autofonts:
-    \DeclareFontFamily{\l__fontspec_nfss_enc_tl}{\l_fontspec_family_tl}{}
-    \__fontspec_set_faces:
-    \__fontspec_info:nxx {defining-font} {#1} {#2}
+     \__fontspec_save_family:nn {#1} {#2}
    }
    {
    }
   \group_end:
  }
+\cs_set_eq:NN \fontspec_select:nn \__fontspec_select_font_family:nn
+\cs_new:Nn \__fontspec_sanitise_fontname:Nn
+ {
+  \tl_set:Nx #1 {#2}
+  \clist_map_inline:Nn \l__fontspec_extensions_clist
+   {
+     \tl_if_in:NnT #1 {##1}
+       {
+         \tl_remove_once:Nn #1 {##1}
+         \tl_set:Nn \l__fontspec_extension_tl {##1}
+         \clist_map_break:
+       }
+   }
+ }
+\prg_new_conditional:Nnn \__fontspec_if_detect_external:n {T}
+ {
+  \clist_map_inline:Nn \l__fontspec_extensions_clist
+   {
+    \bool_set_false:N \l__fontspec_tmpa_bool
+    \exp_args:Nx % <- this should be handled earlier
+    \tl_if_in:nnT {#1 <= end_of_string} {##1 <= end_of_string}
+      { \bool_set_true:N \l__fontspec_tmpa_bool \clist_map_break: }
+   }
+  \bool_if:NTF \l__fontspec_tmpa_bool \prg_return_true: \prg_return_false:
+ }
+\cs_new:Nn \__fontspec_init_ttc:n
+ {
+  \str_if_eq_x:nnT { \str_lower_case:f {\l__fontspec_extension_tl} } {.ttc}
+   {
+    \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_it_tl   {#1}
+    \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bf_tl   {#1}
+    \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bfit_tl {#1}
+   }
+ }
 \cs_new:Nn \__fontspec_load_external_fontoptions:Nn
  {
   \__fontspec_sanitise_fontname:Nn #1 {#2}
@@ -843,64 +1020,68 @@
       #1
      }
    }
-  \tl_set:Nx \l__fontspec_fontid_tl { \tl_to_str:N \l_fontspec_fontname_tl-:-\tl_to_str:N \l__fontspec_all_features_clist }
  }
 \cs_new:Nn \__fontspec_preparse_features:
  {
-  \__fontspec_if_detect_external:VT \l__fontspec_basename_tl
-   { \keys_set:nn {fontspec-preparse-external} {ExternalLocation} }
 
-  \keys_set_known:nxN {fontspec-preparse-external}
+  \__fontspec_keys_set_known:nxN {fontspec-preparse-external}
    { \l__fontspec_all_features_clist }
    \l__fontspec_keys_leftover_clist
-  \tl_set_eq:NN \l_fontspec_fontname_tl \l_fontspec_fontname_up_tl
-  \keys_set_known:nxN {fontspec-renderer} {\l__fontspec_keys_leftover_clist}
+
+  \tl_set_eq:NN \l_fontspec_fontname_tl \l__fontspec_fontname_up_tl
+  \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_keys_leftover_clist}
     \l__fontspec_keys_leftover_clist
-  \keys_set_known:nxN {fontspec-preparse} {\l__fontspec_keys_leftover_clist}
+  \__fontspec_keys_set_known:nxN {fontspec-preparse} {\l__fontspec_keys_leftover_clist}
     \l__fontspec_fontfeat_clist
  }
 \cs_new:Nn \__fontspec_load_font:
  {
-  \__fontspec_font_set:Nnn    \l_fontspec_font
-     { \__fontspec_fullname:n {\l_fontspec_fontname_up_tl} } {\f@size pt}
-  \__fontspec_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {\l_fontspec_fontname_up_tl} }
+  \__fontspec_primitive_font_set:Nnn \l_fontspec_font
+     { \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } {} } {\f@size pt}
+  \__fontspec_primitive_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {\l__fontspec_fontname_up_tl} }
   \__fontspec_set_font_type:
-  \__fontspec_font_gset:Nnn   \l_fontspec_font
-     { \__fontspec_fullname:n {\l_fontspec_fontname_up_tl} } {\f@size pt}
+  \__fontspec_primitive_font_gset:Nnn \l_fontspec_font
+     { \__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
  }
-\prg_new_conditional:Nnn \__fontspec_if_detect_external:n {T}
+\cs_set:Nn \__fontspec_construct_font_call:nnnnnn
  {
-  \clist_map_inline:Nn \l__fontspec_extensions_clist
-   {
-    \bool_set_false:N \l__fontspec_tmpa_bool
-    \tl_if_in:nnT {#1 <= end_of_string} {##1 <= end_of_string}
-      { \bool_set_true:N \l__fontspec_tmpa_bool \clist_map_break: }
-   }
-  \bool_if:NTF \l__fontspec_tmpa_bool \prg_return_true: \prg_return_false:
+  " \__fontspec_fontname_wrap:n { #1 #2 #3 } #4 #5
+    \str_if_eq_x:nnF {#6}{} {:#6} "
  }
-\cs_generate_variant:Nn \__fontspec_if_detect_external:nT {V}
-\cs_set:Nn \__fontspec_fullname:n
+\cs_set:Nn \__fontspec_construct_font_call:nn
  {
-  \__fontspec_namewrap:n { #1 \l__fontspec_extension_tl }
-  \l_fontspec_renderer_tl
-  \l__fontspec_optical_size_tl
+  \__fontspec_construct_font_call:nnnnnn
+    {#1}
+    \l__fontspec_extension_tl
+    \l__fontspec_ttc_index_tl
+    \l_fontspec_renderer_tl
+    \l__fontspec_optical_size_tl
+    {#2}
  }
+\cs_new:Nn \__fontspec_font_is_name:
+  {
+    \cs_set_eq:NN \__fontspec_fontname_wrap:n \use:n
+  }
+\cs_new:Nn \__fontspec_font_is_file:
+  {
+    \cs_set:Npn \__fontspec_fontname_wrap:n ##1 { [ \l__fontspec_font_path_tl ##1 ] }
+  }
 \cs_new:Nn \__fontspec_set_scriptlang:
  {
   \bool_if:NT \l__fontspec_firsttime_bool
    {
     \tl_if_empty:NTF \l__fontspec_script_name_tl
      {
-      \fontspec_check_script:nTF {latn}
+      \__fontspec_check_script:nTF {latn}
        {
         \tl_set:Nn \l__fontspec_script_name_tl {Latin}
         \tl_if_empty:NT \l__fontspec_lang_name_tl
          {
           \tl_set:Nn \l__fontspec_lang_name_tl {Default}
          }
-        \keys_set:nx {fontspec} {Script=\l__fontspec_script_name_tl}
-        \keys_set:nx {fontspec} {Language=\l__fontspec_lang_name_tl}
+        \keys_set:nx {fontspec-opentype} {Script=\l__fontspec_script_name_tl}
+        \keys_set:nx {fontspec-opentype} {Language=\l__fontspec_lang_name_tl}
        }
        {
         \__fontspec_info:n {no-scripts}
@@ -911,13 +1092,36 @@
        {
         \tl_set:Nn \l__fontspec_lang_name_tl {Default}
        }
-      \keys_set:nx {fontspec} {Script=\l__fontspec_script_name_tl}
-      \keys_set:nx {fontspec} {Language=\l__fontspec_lang_name_tl}
+      \keys_set:nx {fontspec-opentype} {Script=\l__fontspec_script_name_tl}
+      \keys_set:nx {fontspec-opentype} {Language=\l__fontspec_lang_name_tl}
      }
    }
  }
-\prg_new_conditional:Nnn \__fontspec_save_family:n {TF}
+\cs_set:Nn \__fontspec_get_features:Nn
  {
+  \__fontspec_init_fontface:
+  \__fontspec_keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2}
+    \l__fontspec_keys_leftover_clist
+  \__fontspec_keys_set_known:nxN {fontspec} {\l__fontspec_keys_leftover_clist} \l__fontspec_keys_leftover_clist
+  \bool_if:NTF \l__fontspec_ot_bool
+    {
+      \keys_set:nx {fontspec-opentype} {\l__fontspec_keys_leftover_clist}
+    }
+    {
+      \bool_if:NT \l__fontspec_atsui_bool
+        { \keys_set:nx {fontspec-aat} {\l__fontspec_keys_leftover_clist} }
+    }
+
+  \str_if_eq_x:nnF { \l__fontspec_hexcol_tl \l__fontspec_opacity_tl }
+                   { \g__fontspec_hexcol_tl \g__fontspec_opacity_tl }
+    { \__fontspec_update_featstr:n { color = \l__fontspec_hexcol_tl\l__fontspec_opacity_tl } }
+
+  \tl_set_eq:NN #1 \l__fontspec_rawfeatures_sclist
+ }
+\prg_new_conditional:Nnn \__fontspec_save_family_needed:n {TF}
+ {
+
+
   \cs_if_exist:NT \l__fontspec_nfss_fam_tl
    {
     \cs_set_eq:cN {g__fontspec_UID_\l__fontspec_fontid_tl} \l__fontspec_nfss_fam_tl
@@ -941,51 +1145,58 @@
   \cs_if_exist:cTF {g__fontspec_ \l_fontspec_family_tl _prop}
     \prg_return_false: \prg_return_true:
  }
-\cs_new:Nn \__fontspec_save_fontinfo:
+\cs_new:Nn \__fontspec_save_family:nn
+  {
+    \__fontspec_save_fontinfo:n {#2}
+    \__fontspec_find_autofonts:
+    \DeclareFontFamily{\l__fontspec_nfss_enc_tl}{\l_fontspec_family_tl}{}
+    \__fontspec_set_faces:
+    \__fontspec_info:nxx {defining-font} {#1} {#2}
+  }
+\cs_new:Nn \__fontspec_save_fontinfo:n
  {
   \prop_new:c {g__fontspec_ \l_fontspec_family_tl _prop}
-  \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {fontname} { \l__fontspec_basename_tl }
+  \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {fontname} { #1 }
   \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {options}  { \l__fontspec_all_features_clist }
   \prop_gput:cnx {g__fontspec_ \l_fontspec_family_tl _prop} {fontdef}
    {
-    \__fontspec_fullname:n {\l_fontspec_fontname_tl} :
-    \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist
+    \__fontspec_construct_font_call:nn {\l_fontspec_fontname_tl}
+      { \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist }
    }
-  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {script-num} \l_fontspec_script_int
-  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {lang-num} \l_fontspec_language_int
+  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {script-num} \l__fontspec_script_int
+  \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {lang-num} \l__fontspec_language_int
   \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {script-tag} \l_fontspec_script_tl
   \prop_gput:cnV {g__fontspec_ \l_fontspec_family_tl _prop} {lang-tag} \l_fontspec_lang_tl
-
  }
 \cs_new:Nn \__fontspec_find_autofonts:
  {
   \bool_if:nF {\l__fontspec_noit_bool || \l__fontspec_nobf_bool}
    {
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_it_tl} {/B}
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_bf_tl} {/I}
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfit_tl {\l_fontspec_fontname_tl} {/BI}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfit_tl {\l__fontspec_fontname_it_tl} {/B}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfit_tl {\l__fontspec_fontname_bf_tl} {/I}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfit_tl {\l_fontspec_fontname_tl} {/BI}
    }
 
   \bool_if:NF \l__fontspec_nobf_bool
    {
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bf_tl {\l_fontspec_fontname_tl} {/B}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bf_tl {\l_fontspec_fontname_tl} {/B}
    }
 
   \bool_if:NF \l__fontspec_noit_bool
    {
-    \__fontspec_set_autofont:Nnn \l_fontspec_fontname_it_tl {\l_fontspec_fontname_tl} {/I}
+    \__fontspec_set_autofont:Nnn \l__fontspec_fontname_it_tl {\l_fontspec_fontname_tl} {/I}
    }
 
-  \__fontspec_set_autofont:Nnn \l_fontspec_fontname_bfsl_tl {\l_fontspec_fontname_sl_tl} {/B}
+  \__fontspec_set_autofont:Nnn \l__fontspec_fontname_bfsl_tl {\l__fontspec_fontname_sl_tl} {/B}
  }
 \cs_new:Nn \__fontspec_set_faces:
  {
   \__fontspec_add_nfssfont:nnnn \mddefault \updefault \l_fontspec_fontname_tl      \l__fontspec_fontfeat_up_clist
-  \__fontspec_add_nfssfont:nnnn \bfdefault \updefault \l_fontspec_fontname_bf_tl   \l__fontspec_fontfeat_bf_clist
-  \__fontspec_add_nfssfont:nnnn \mddefault \itdefault \l_fontspec_fontname_it_tl   \l__fontspec_fontfeat_it_clist
-  \__fontspec_add_nfssfont:nnnn \mddefault \sldefault \l_fontspec_fontname_sl_tl   \l__fontspec_fontfeat_sl_clist
-  \__fontspec_add_nfssfont:nnnn \bfdefault \itdefault \l_fontspec_fontname_bfit_tl \l__fontspec_fontfeat_bfit_clist
-  \__fontspec_add_nfssfont:nnnn \bfdefault \sldefault \l_fontspec_fontname_bfsl_tl \l__fontspec_fontfeat_bfsl_clist
+  \__fontspec_add_nfssfont:nnnn \bfdefault \updefault \l__fontspec_fontname_bf_tl   \l__fontspec_fontfeat_bf_clist
+  \__fontspec_add_nfssfont:nnnn \mddefault \itdefault \l__fontspec_fontname_it_tl   \l__fontspec_fontfeat_it_clist
+  \__fontspec_add_nfssfont:nnnn \mddefault \sldefault \l__fontspec_fontname_sl_tl   \l__fontspec_fontfeat_sl_clist
+  \__fontspec_add_nfssfont:nnnn \bfdefault \itdefault \l__fontspec_fontname_bfit_tl \l__fontspec_fontfeat_bfit_clist
+  \__fontspec_add_nfssfont:nnnn \bfdefault \sldefault \l__fontspec_fontname_bfsl_tl \l__fontspec_fontfeat_bfsl_clist
 
   \prop_map_inline:Nn \l__fontspec_nfssfont_prop { \__fontspec_set_faces_aux:nnnnn ##2 }
  }
@@ -994,6 +1205,25 @@
   \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
+ {
+  \tl_set:Nx #1 {#2}
+  \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl}
+ }
+\cs_new:Nn \__fontspec_add_nfssfont:nnnn
+ {
+  \tl_set:Nx \l__fontspec_this_font_tl {#3}
+
+  \tl_if_empty:xTF {#4}
+   { \clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}} }
+   { \__fontspec_keys_set_known:nxN {fontspec-preparse-nested} {#4} \l__fontspec_tmp_tl }
+
+  \tl_if_empty:NF \l__fontspec_this_font_tl
+   {
+    \prop_put:Nxx \l__fontspec_nfssfont_prop {#1/#2}
+     { {#1}{#2}{\l__fontspec_this_font_tl}{#4}{\l__fontspec_sizefeat_clist} }
+   }
+ }
 \cs_new:Nn \__fontspec_set_font_type:
  {
   \bool_set_false:N \l__fontspec_tfm_bool
@@ -1021,7 +1251,6 @@
      }
    }
  }
-\cs_generate_variant:Nn \tl_if_empty:nF {x}
 \cs_new:Nn \__fontspec_set_autofont:Nnn
  {
   \bool_if:NF \l__fontspec_external_bool
@@ -1040,8 +1269,8 @@
 
 \prg_new_conditional:Nnn \__fontspec_if_autofont:nn {T,TF}
  {
-  \__fontspec_font_set:Nnn \l_tmpa_font { \__fontspec_fullname:n {#1}   } {\f@size pt}
-  \__fontspec_font_set:Nnn \l_tmpb_font { \__fontspec_fullname:n {#1#2} } {\f@size pt}
+  \__fontspec_primitive_font_set:Nnn \l_tmpa_font { \__fontspec_construct_font_call:nn {#1} {}  } {\f@size pt}
+  \__fontspec_primitive_font_set:Nnn \l_tmpb_font { \__fontspec_construct_font_call:nn {#1#2} {} } {\f@size pt}
   \str_if_eq_x:nnTF { \fontname \l_tmpa_font } { \fontname \l_tmpb_font }
    { \prg_return_false: }
    { \prg_return_true: }
@@ -1049,7 +1278,7 @@
 \cs_new:Nn \__fontspec_make_font_shapes:Nnnnn
  {
   \group_begin:
-    \keys_set_known:nxN {fontspec-preparse-external} { #4 } \l__fontspec_leftover_clist
+    \__fontspec_keys_set_known:nxN {fontspec-preparse-external} { #4 } \l__fontspec_leftover_clist
     \__fontspec_load_fontname:n {#1}
     \__fontspec_declare_shape:nnxx {#2} {#3} { \l__fontspec_fontopts_clist, \l__fontspec_leftover_clist } {#5}
   \group_end:
@@ -1060,8 +1289,8 @@
     \__fontspec_load_external_fontoptions:Nn \l_fontspec_fontname_tl {#1}
     \prop_get:NVNF \g__fontspec_fontopts_prop \l_fontspec_fontname_tl \l__fontspec_fontopts_clist
      { \clist_clear:N \l__fontspec_fontopts_clist }
-    \__fontspec_font_set:Nnn \l_fontspec_font {\__fontspec_fullname:n {\l_fontspec_fontname_tl}} {\f@size pt}
-    \__fontspec_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {#1} }
+    \__fontspec_primitive_font_set:Nnn \l_fontspec_font { \__fontspec_construct_font_call:nn {\l_fontspec_fontname_tl} {} } {\f@size pt}
+    \__fontspec_primitive_font_if_null:NT \l_fontspec_font { \__fontspec_error:nx {font-not-found} {#1} }
  }
 \cs_new:Nn \__fontspec_declare_shape:nnnn
  {
@@ -1069,25 +1298,33 @@
   \tl_clear:N \l__fontspec_nfss_sc_tl
   \tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
 
-  \exp_args:Nx \clist_map_inline:nn {#4}
-   {
+  \exp_args:Nx \clist_map_inline:nn {#4} { \__fontspec_setup_single_size:nn {#3} {##1} }
+
+  \__fontspec_declare_shapes_normal:nn {#1} {#2}
+  \__fontspec_declare_shapes_smcaps:nn {#1} {#2}
+  \__fontspec_declare_shape_slanted:nn {#1} {#2}
+  \__fontspec_declare_shape_loginfo:nn {#1} {#2}
+ }
+\cs_generate_variant:Nn \__fontspec_declare_shape:nnnn {nnxx}
+\cs_new:Nn \__fontspec_setup_single_size:nn
+  {
     \tl_clear:N \l__fontspec_size_tl
     \tl_set_eq:NN \l__fontspec_sizedfont_tl \l__fontspec_saved_fontname_tl % in case not spec'ed
 
-    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n ##1 }
+    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n #2 }
       \l__fontspec_sizing_leftover_clist
     \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
 
     % "normal"
     \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
-    \__fontspec_setup_nfss:Nnn \l__fontspec_nfss_tl {#3} {}
+    \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#1} {\l__fontspec_sizing_leftover_clist} {}
 
     % small caps
     \clist_set_eq:NN \l__fontspec_fontfeat_curr_clist \l__fontspec_fontfeat_sc_clist
 
     \bool_if:NF \l__fontspec_nosc_bool
      {
-      \tl_if_empty:NTF \l_fontspec_fontname_sc_tl
+      \tl_if_empty:NTF \l__fontspec_fontname_sc_tl
        {
         \__fontspec_make_smallcaps:TF
          {
@@ -1097,60 +1334,47 @@
           \bool_set_true:N \l__fontspec_nosc_bool
          }
        }
-       { \__fontspec_load_fontname:n {\l_fontspec_fontname_sc_tl} }% local for each size
+       { \__fontspec_load_fontname:n {\l__fontspec_fontname_sc_tl} }% local for each size
      }
 
     \bool_if:NF \l__fontspec_nosc_bool
      {
-      \__fontspec_setup_nfss:Nnn \l__fontspec_nfss_sc_tl {#3} {\l__fontspec_fontfeat_curr_clist}
+      \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_sc_tl
+        {#1} {\l__fontspec_sizing_leftover_clist} {\l__fontspec_fontfeat_curr_clist}
      }
-
-   }
-
-  \__fontspec_declare_shapes_normal:nn {#1} {#2}
-  \__fontspec_declare_shapes_smcaps:nn {#1} {#2}
-  \__fontspec_declare_shape_slanted:nn {#1} {#2}
-  \__fontspec_declare_shape_loginfo:nn {#1} {#2}
- }
-\cs_generate_variant:Nn \__fontspec_declare_shape:nnnn {nnxx}
-
-\cs_new:Nn \__fontspec_setup_nfss:Nnn
+  }
+\cs_new:Nn \__fontspec_setup_nfss:Nnnn
  {
-  \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist
-   { #2 , \l__fontspec_sizing_leftover_clist , #3 }
+
+  \__fontspec_get_features:Nn \l__fontspec_rawfeatures_sclist { #2 , #3 , #4 }
 
   \tl_put_right:Nx #1
    {
     <\l__fontspec_size_tl> \l__fontspec_scale_tl
-    \__fontspec_fontwrap:n
-     {
-      \__fontspec_fullname:n { \l_fontspec_fontname_tl }
-      : \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist
-     }
+      \__fontspec_construct_font_call:nn { \l_fontspec_fontname_tl }
+        { \l__fontspec_pre_feat_sclist \l__fontspec_rawfeatures_sclist }
    }
  }
-
 \cs_new:Nn \__fontspec_declare_shapes_normal:nn
   {
     \__fontspec_DeclareFontShape:xxxxxx {\l__fontspec_nfss_enc_tl} {\l_fontspec_family_tl}
       {#1} {#2} {\l__fontspec_nfss_tl}{\l__fontspec_postadjust_tl}
   }
-
 \cs_new:Nn \__fontspec_declare_shapes_smcaps:nn
   {
-    \bool_if:NF \l__fontspec_nosc_bool
+    \tl_if_empty:NF \l__fontspec_nfss_sc_tl
      {
       \__fontspec_DeclareFontShape:xxxxxx {\l__fontspec_nfss_enc_tl} {\l_fontspec_family_tl} {#1}
         { \__fontspec_combo_sc_shape:n {#2} } {\l__fontspec_nfss_sc_tl} {\l__fontspec_postadjust_tl}
      }
   }
+
 \cs_new:Nn \__fontspec_combo_sc_shape:n
   {
     \tl_if_exist:cTF { \__fontspec_shape_merge:nn {#1} {\scdefault} }
          { \tl_use:c { \__fontspec_shape_merge:nn {#1} {\scdefault} } }
          { \scdefault }
   }
-
 \cs_new:Nn \__fontspec_DeclareFontShape:nnnnnn
  {
   \group_begin:
@@ -1176,6 +1400,7 @@
  {
   \tl_gput_right:Nx \l_fontspec_defined_shapes_tl
    {
+    \exp_not:n { \\ }
     -~ \exp_not:N \str_case:nn {#1/#2}
      {
        {\mddefault/\updefault} {'normal'~}
@@ -1205,7 +1430,6 @@
      }
    }
  }
-\cs_generate_variant:Nn \tl_if_empty:nF {f}
 \clist_set:Nn \l__fontspec_pre_feat_sclist
  {
   \bool_if:NT \l__fontspec_ot_bool
@@ -1217,226 +1441,148 @@
      }
    }
  }
-\cs_set:Nn \__fontspec_get_features:Nn
+\cs_set:Nn \__fontspec_make_ot_smallcaps:TF
  {
-  \sclist_clear:N \l__fontspec_rawfeatures_sclist
-  \tl_clear:N \l__fontspec_scale_tl
-  \tl_set_eq:NN \l__fontspec_opacity_tl \g__fontspec_opacity_tl
-  \tl_set_eq:NN \l__fontspec_hexcol_tl \g__fontspec_hexcol_tl
-  \tl_set_eq:NN \l__fontspec_postadjust_tl \g__fontspec_postadjust_tl
-  \tl_clear:N \l__fontspec_wordspace_adjust_tl
-  \tl_clear:N \l__fontspec_punctspace_adjust_tl
-
-  \keys_set_known:nxN {fontspec-renderer} {\l__fontspec_fontfeat_clist,#2}
-    \l__fontspec_keys_leftover_clist
-  \keys_set:nx {fontspec} {\l__fontspec_keys_leftover_clist}
-  \str_if_eq_x:nnF { \l__fontspec_hexcol_tl \l__fontspec_opacity_tl }
-                   { \g__fontspec_hexcol_tl \g__fontspec_opacity_tl }
+  \__fontspec_check_ot_feat:nTF {smcp} {#1} {#2}
+ }
+\cs_set:Nn \__fontspec_make_smallcaps:TF
+ {
+  \bool_if:NTF \l__fontspec_ot_bool
+   { \__fontspec_make_ot_smallcaps:TF {#1} {#2} }
    {
-    \__fontspec_update_featstr:n { color = \l__fontspec_hexcol_tl\l__fontspec_opacity_tl }
+     \bool_if:NT \l__fontspec_atsui_bool
+      { \__fontspec_make_AAT_feature_string:nnTF {3}{3} {#1} {#2} }
    }
-
-  \tl_set_eq:NN #1 \l__fontspec_rawfeatures_sclist
  }
-\tl_clear:N \l__fontspec_family_label_tl
-\tl_clear:N \l_fontspec_fontname_bf_tl
-\tl_clear:N \l_fontspec_fontname_it_tl
-\tl_clear:N \l_fontspec_fake_slant_tl
-\tl_clear:N \l_fontspec_fake_embolden_tl
-\tl_clear:N \l_fontspec_fontname_bfit_tl
-\tl_clear:N \l_fontspec_fontname_sl_tl
-\tl_clear:N \l_fontspec_fontname_bfsl_tl
-\tl_clear:N \l_fontspec_fontname_sc_tl
-\tl_clear:N \l__fontspec_fontfeat_up_clist
-\tl_clear:N \l__fontspec_fontfeat_bf_clist
-\tl_clear:N \l__fontspec_fontfeat_it_clist
-\tl_clear:N \l__fontspec_fontfeat_bfit_clist
-\tl_clear:N \l__fontspec_fontfeat_sl_clist
-\tl_clear:N \l__fontspec_fontfeat_bfsl_clist
-\tl_clear:N \l__fontspec_fontfeat_sc_clist
-\tl_clear:N \l__fontspec_script_name_tl
-\tl_clear:N \l_fontspec_script_tl
-\tl_clear:N \l__fontspec_lang_name_tl
-\tl_clear:N \l_fontspec_lang_tl
-\tl_set:Nn  \g__fontspec_postadjust_tl { \l__fontspec_wordspace_adjust_tl \l__fontspec_punctspace_adjust_tl }
-
-\clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}}
-\tl_new:N  \g__fontspec_hexcol_tl
-\tl_new:N  \g__fontspec_opacity_tl
-\tl_set:Nn \g__fontspec_hexcol_tl {000000}
-\tl_set:Nn \g__fontspec_opacity_tl {FF~}
+\cs_new:Nn \__fontspec_update_featstr:n
+  {
+    \bool_if:NF \l__fontspec_firsttime_bool
+      {
+        \tl_gset:Nx \g__fontspec_single_feat_tl { #1 }
+        \tl_gput_right:Nx  \l__fontspec_rawfeatures_sclist {#1;}
+      }
+  }
+\cs_new:Nn \__fontspec_remove_clashing_featstr:n
+  {
+    \clist_map_inline:nn {#1}
+      {
+        \tl_gremove_all:Nn \l__fontspec_rawfeatures_sclist {##1;}
+      }
+  }
 \cs_set:Npn \__fontspec_init:
  {
   \bool_set_false:N \l__fontspec_ot_bool
   \bool_set_true:N \l__fontspec_firsttime_bool
-  \cs_set:Npn \__fontspec_namewrap:n ##1 { ##1 }
+  \__fontspec_font_is_name:
+  \tl_clear:N \l__fontspec_font_path_tl
   \tl_clear:N \l__fontspec_optical_size_tl
+  \tl_clear:N \l__fontspec_ttc_index_tl
   \tl_clear:N \l_fontspec_renderer_tl
   \tl_clear:N \l_fontspec_defined_shapes_tl
   \tl_clear:N \g__fontspec_curr_series_tl
   \tl_gset_eq:NN \l__fontspec_nfss_enc_tl \g_fontspec_encoding_tl
 
-  % 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: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} }
-    {\ttdefault} { \tl_set:Nn \l__fontspec_family_label_tl {\g__fontspec_ttfamily_family} }
-   }{}
-
  }
-\cs_set:Nn \fontspec_make_ot_smallcaps:TF
+\cs_new:Nn \__fontspec_init_fontface:
+  {
+    \tl_clear:N \l__fontspec_rawfeatures_sclist
+    \tl_clear:N \l__fontspec_scale_tl
+    \tl_set_eq:NN \l__fontspec_opacity_tl \g__fontspec_opacity_tl
+    \tl_set_eq:NN \l__fontspec_hexcol_tl \g__fontspec_hexcol_tl
+    \tl_set_eq:NN \l__fontspec_postadjust_tl \g__fontspec_postadjust_tl
+    \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
  {
-  \fontspec_check_ot_feat:nTF {+smcp} {#1} {#2}
+  \__fontspec_iv_str_to_num:w #1 \q_nil #2 \c_empty_tl \c_empty_tl \q_nil
  }
-\cs_set:Nn \__fontspec_make_smallcaps:TF
+\cs_set:Npn \__fontspec_iv_str_to_num:w #1 \q_nil #2#3#4#5#6 \q_nil
  {
-  \bool_if:NTF \l__fontspec_ot_bool
-   { \fontspec_make_ot_smallcaps:TF {#1} {#2} }
+  \int_set:Nn #1
    {
-     \bool_if:NT \l__fontspec_atsui_bool
-      { \fontspec_make_AAT_feature_string:nnTF {3}{3} {#1} {#2} }
+      `#2 * "1000000
+    + `#3 * "10000
+    + \ifx \c_empty_tl #4 32 \else `#4 \fi * "100
+    + \ifx \c_empty_tl #5 32 \else `#5 \fi
    }
  }
-\cs_set_eq:NN \sclist_clear:N \tl_clear:N
-\cs_new:Nn \sclist_gput_right:Nn
- { \tl_gput_right:Nn #1 {#2;} }
-\cs_generate_variant:Nn \sclist_gput_right:Nn {Nx}
-\cs_new:Nn \__fontspec_update_featstr:n
+\cs_generate_variant:Nn \__fontspec_iv_str_to_num:Nn {No}
+\cs_new:Nn \__fontspec_define_opentype_feature_group:n
+  {
+    \keys_define:nn {fontspec-opentype} { #1 .multichoice: }
+  }
+\cs_new:Nn \__fontspec_feat_prop_add:nn
+  {
+    \tl_if_empty:nF {#1}
+     {
+      \prop_if_in:NnF \g__fontspec_OT_features_prop {#1}
+        {
+          \prop_gput:Nnn \g__fontspec_OT_features_prop {#1} {#2}
+        }
+     }
+  }
+\cs_new:Nn \__fontspec_define_opentype_feature:nnnnn
  {
-  \bool_if:NF \l__fontspec_firsttime_bool
+  \__fontspec_feat_prop_add:nn {#3} {#1\,=\,#2}
+  \keys_define:nn {fontspec-opentype}
    {
-    \sclist_gput_right:Nx \l__fontspec_rawfeatures_sclist {#1}
+    #1/#2 .code:n = { \__fontspec_make_OT_feature:nnn {#3} {#4} {#5} }
    }
  }
-\cs_new:Nn \fontspec_make_feature:nnn
+\cs_new:Nn \__fontspec_feat_off:n {#1Off}
+\cs_new:Nn \__fontspec_feat_reset:n {#1Reset}
+\cs_new:Nn \__fontspec_define_opentype_onoffreset:nnnnn
  {
-  \bool_if:NTF \l__fontspec_ot_bool
-   { \fontspec_make_OT_feature:n {#3} }
-   {
-     \bool_if:NT \l__fontspec_atsui_bool
-      { \fontspec_make_AAT_feature:nn {#1}{#2} }
-   }
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} {#2} {#3} {+#4} {#5}
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} { \__fontspec_feat_off:n   {#2} } {#3} {-#4} {}
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} { \__fontspec_feat_reset:n {#2} } {} {} {+#4,-#4}
  }
-\cs_generate_variant:Nn \fontspec_make_feature:nnn {nnx}
-\cs_new:Nn \fontspec_make_AAT_feature:nn
+\cs_new:Nn \__fontspec_define_opentype_onreset:nnnnn
  {
-  \tl_if_empty:nTF {#1}
-   { \__fontspec_warning:n {aat-feature-not-exist} }
-   {
-     \fontspec_make_AAT_feature_string:nnTF {#1}{#2}
-      {
-       \__fontspec_update_featstr:n {\l_fontspec_feature_string_tl}
-     }
-     { \__fontspec_warning:nx {aat-feature-not-exist-in-font} {#1,#2} }
-   }
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} {#2} {#3} {#4} {#5}
+  \exp_args:Nnx \__fontspec_define_opentype_feature:nnnnn {#1} { \__fontspec_feat_reset:n {#2} } {} {} {#4}
  }
-\cs_new:Nn \fontspec_make_OT_feature:n
- {
-  \tl_if_empty:nTF {#1}
-   { \__fontspec_warning:n {icu-feature-not-exist} }
-   {
-     \fontspec_check_ot_feat:nTF {#1}
+\cs_new:Nn \__fontspec_make_OT_feature:nnn
+  {
+
+    \bool_set_true:N \l__fontspec_proceed_bool
+    \bool_set_true:N  \l__fontspec_check_feat_bool
+
+    \tl_if_empty:nT {#1} { \bool_set_false:N \l__fontspec_check_feat_bool }
+    \bool_if:NT \l__fontspec_check_feat_bool
       {
-       \__fontspec_update_featstr:n {#1}
+        \__fontspec_check_ot_feat:nF {#1}
+          {
+            \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1}
+            \bool_set_false:N \l__fontspec_proceed_bool
+          }
       }
-      { \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1} }
-   }
- }
-\cs_new_protected:Nn \fontspec_make_numbered_feature:nn
- {
-  \fontspec_check_ot_feat:nTF {#1}
-   {
-    \__fontspec_update_featstr:n { #1 = #2 }
-   }
-   { \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1} }
- }
-\cs_generate_variant:Nn \fontspec_make_numbered_feature:nn {xn}
-\cs_new:Nn \__fontspec_define_font_feature:n
- {
-  \keys_define:nn {fontspec} { #1 .multichoice: }
- }
-\cs_new:Nn \__fontspec_define_feature_option:nnnnn
- {
-  \keys_define:nn {fontspec}
-   {
-    #1/#2 .code:n = { \fontspec_make_feature:nnn{#3}{#4}{#5} }
-   }
- }
-\cs_new:Nn \fontspec_define_numbered_feat:nnnn
- {
-  \keys_define:nn {fontspec}
-   {
-    #1/#2 .code:n =
-      { \fontspec_make_numbered_feature:nn {#3}{#4} }
-   }
- }
-\prg_new_conditional:Nnn \fontspec_make_AAT_feature_string:nn {TF,T,F}
- {
-  \tl_set:Nx \l_tmpa_tl { \XeTeXfeaturename \l_fontspec_font #1 }
-  \tl_if_empty:NTF \l_tmpa_tl
-   { \prg_return_false: }
-   {
-    \int_compare:nTF { \XeTeXisexclusivefeature\l_fontspec_font #1 > 0 }
-     {
-      \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
-     }
-     {
-      \int_if_even:nTF {#2}
-       {
-        \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
-       }
-       {
-        \tl_set:Nx \l_tmpb_tl
-         {
-          \XeTeXselectorname\l_fontspec_font #1\space \numexpr#2-1\relax
-         }
-        \tl_if_empty:NF \l_tmpb_tl { \tl_put_left:Nn \l_tmpb_tl {!} }
-       }
-    }
-    \tl_if_empty:NTF \l_tmpb_tl
-     { \prg_return_false: }
-     {
-      \tl_set:Nx \l_fontspec_feature_string_tl { \l_tmpa_tl = \l_tmpb_tl }
-      \prg_return_true:
-     }
-   }
- }
-\cs_set:Nn \fontspec_iv_str_to_num:Nn
- {
-  \fontspec_iv_str_to_num:w #1 \q_nil #2 \c_empty_tl \c_empty_tl \q_nil
- }
-\cs_set:Npn \fontspec_iv_str_to_num:w #1 \q_nil #2#3#4#5#6 \q_nil
- {
-  \int_set:Nn #1
-   {
-      `#2 * "1000000
-    + `#3 * "10000
-    + \ifx \c_empty_tl #4 32 \else `#4 \fi * "100
-    + \ifx \c_empty_tl #5 32 \else `#5 \fi
-   }
- }
-\cs_generate_variant:Nn \fontspec_iv_str_to_num:Nn {No}
-\cs_set:Nn \fontspec_v_str_to_num:Nn
- {
-  \bool_if:nTF
-   {
-    \tl_if_head_eq_charcode_p:nN {#2} {+} ||
-    \tl_if_head_eq_charcode_p:nN {#2} {-}
-   }
-   { \fontspec_iv_str_to_num:No #1 { \use_none:n #2 } }
-   { \fontspec_iv_str_to_num:Nn #1 {#2} }
- }
-\prg_new_conditional:Nnn \fontspec_check_script:n {TF}
+
+    \bool_if:NT \l__fontspec_proceed_bool
+      {
+        \exp_args:Nx \__fontspec_remove_clashing_featstr:n
+          { #2 , \__fontspec_swap_plus_minus:n {#2} , #3 }
+
+        \__fontspec_update_featstr:n {#2}
+      }
+  }
+\cs_generate_variant:Nn \__fontspec_make_OT_feature:nnn {xxx}
+\cs_new:Nn \__fontspec_swap_plus_minus:n { \__fontspec_swap_plus_minus_aux:NNNNN #1 }
+\cs_new:Nn \__fontspec_swap_plus_minus_aux:NNNNN
+  { \str_case:nn {#1} { {+} {-#2#3#4#5} {-} {+#2#3#4#5} } }
+\prg_new_conditional:Nnn \__fontspec_check_script:n {TF}
+  {
+    \bool_if:NTF \l__fontspec_never_check_bool
+      { \prg_return_true: }
  {
-  \fontspec_iv_str_to_num:Nn \l_fontspec_strnum_int {#1}
+  \__fontspec_iv_str_to_num:Nn \l__fontspec_strnum_int {#1}
   \int_set:Nn \l_tmpb_int { \XeTeXOTcountscripts \l_fontspec_font }
   \int_zero:N \l_tmpa_int
   \bool_set_false:N \l__fontspec_check_bool
   \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
    {
-    \ifnum \XeTeXOTscripttag\l_fontspec_font \l_tmpa_int = \l_fontspec_strnum_int
+    \ifnum \XeTeXOTscripttag\l_fontspec_font \l_tmpa_int = \l__fontspec_strnum_int
       \bool_set_true:N \l__fontspec_check_bool
       \int_set:Nn \l_tmpa_int {\l_tmpb_int}
     \else
@@ -1445,16 +1591,20 @@
    }
   \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
  }
-\prg_new_conditional:Nnn \fontspec_check_lang:n {TF}
+ }
+\prg_new_conditional:Nnn \__fontspec_check_lang:n {TF}
+  {
+    \bool_if:NTF \l__fontspec_never_check_bool
+      { \prg_return_true: }
  {
-  \fontspec_iv_str_to_num:Nn \l_fontspec_strnum_int {#1}
+  \__fontspec_iv_str_to_num:Nn \l__fontspec_strnum_int {#1}
   \int_set:Nn \l_tmpb_int
-   { \XeTeXOTcountlanguages \l_fontspec_font \l_fontspec_script_int }
+   { \XeTeXOTcountlanguages \l_fontspec_font \l__fontspec_script_int }
   \int_zero:N \l_tmpa_int
   \bool_set_false:N \l__fontspec_check_bool
   \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
    {
-    \ifnum\XeTeXOTlanguagetag\l_fontspec_font\l_fontspec_script_int \l_tmpa_int =\l_fontspec_strnum_int
+    \ifnum\XeTeXOTlanguagetag\l_fontspec_font\l__fontspec_script_int \l_tmpa_int =\l__fontspec_strnum_int
       \bool_set_true:N \l__fontspec_check_bool
       \int_set:Nn \l_tmpa_int {\l_tmpb_int}
     \else
@@ -1463,21 +1613,25 @@
    }
   \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
  }
-\prg_new_conditional:Nnn \fontspec_check_ot_feat:n {TF,T}
+  }
+\prg_new_conditional:Nnn \__fontspec_check_ot_feat:n {TF,F}
+  {
+    \bool_if:NTF \l__fontspec_never_check_bool
+      { \prg_return_true: }
  {
   \int_set:Nn \l_tmpb_int
    {
     \XeTeXOTcountfeatures \l_fontspec_font
-                          \l_fontspec_script_int
-                          \l_fontspec_language_int
+                          \l__fontspec_script_int
+                          \l__fontspec_language_int
    }
-  \fontspec_v_str_to_num:Nn \l_fontspec_strnum_int {#1}
+  \__fontspec_iv_str_to_num:Nn \l__fontspec_strnum_int {#1}
   \int_zero:N \l_tmpa_int
   \bool_set_false:N \l__fontspec_check_bool
   \bool_until_do:nn { \int_compare_p:nNn \l_tmpa_int = \l_tmpb_int }
    {
-    \ifnum\XeTeXOTfeaturetag\l_fontspec_font\l_fontspec_script_int\l_fontspec_language_int
-         \l_tmpa_int =\l_fontspec_strnum_int
+    \ifnum\XeTeXOTfeaturetag\l_fontspec_font\l__fontspec_script_int\l__fontspec_language_int
+         \l_tmpa_int =\l__fontspec_strnum_int
       \bool_set_true:N \l__fontspec_check_bool
       \int_set:Nn \l_tmpa_int {\l_tmpb_int}
     \else
@@ -1486,35 +1640,221 @@
    }
   \bool_if:NTF \l__fontspec_check_bool \prg_return_true: \prg_return_false:
  }
-
-\cs_new:Nn \__fontspec_keys_define_code:nnn
+  }
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {aalt}{Access~All~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {abvf}{Above-base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {abvm}{Above-base~Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {abvs}{Above-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {afrc}{Alternative~Fractions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {akhn}{Akhands}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {blwf}{Below-base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {blwm}{Below-base~Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {blws}{Below-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {calt}{Contextual~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {case}{Case-Sensitive~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ccmp}{Glyph~Composition~/~Decomposition}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cfar}{Conjunct~Form~After~Ro}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cjct}{Conjunct~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {clig}{Contextual~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cpct}{Centered~CJK~Punctuation}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cpsp}{Capital~Spacing}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cswh}{Contextual~Swash}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {curs}{Cursive~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {cvNN}{Character~Variant~$N$}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {c2pc}{Petite~Capitals~From~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {c2sc}{Small~Capitals~From~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dist}{Distances}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dlig}{Discretionary~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dnom}{Denominators}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {dtls}{Dotless~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {expt}{Expert~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {falt}{Final~Glyph~on~Line~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fin2}{Terminal~Forms~\#2}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fin3}{Terminal~Forms~\#3}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fina}{Terminal~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {flac}{Flattened~accent~forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {frac}{Fractions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {fwid}{Full~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {half}{Half~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {haln}{Halant~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {halt}{Alternate~Half~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hist}{Historical~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hkna}{Horizontal~Kana~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hlig}{Historical~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hngl}{Hangul}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hojo}{Hojo~Kanji~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {hwid}{Half~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {init}{Initial~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {isol}{Isolated~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ital}{Italics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jalt}{Justification~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp78}{JIS78~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp83}{JIS83~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp90}{JIS90~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {jp04}{JIS2004~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {kern}{Kerning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {lfbd}{Left~Bounds}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {liga}{Standard~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ljmo}{Leading~Jamo~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {lnum}{Lining~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {locl}{Localized~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ltra}{Left-to-right~alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ltrm}{Left-to-right~mirrored~forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mark}{Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {med2}{Medial~Forms~\#2}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {medi}{Medial~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mgrk}{Mathematical~Greek}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mkmk}{Mark~to~Mark~Positioning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {mset}{Mark~Positioning~via~Substitution}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {nalt}{Alternate~Annotation~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {nlck}{NLC~Kanji~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {nukt}{Nukta~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {numr}{Numerators}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {onum}{Oldstyle~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {opbd}{Optical~Bounds}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ordn}{Ordinals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ornm}{Ornaments}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {palt}{Proportional~Alternate~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pcap}{Petite~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pkna}{Proportional~Kana}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pnum}{Proportional~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pref}{Pre-Base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pres}{Pre-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pstf}{Post-base~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {psts}{Post-base~Substitutions}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {pwid}{Proportional~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {qwid}{Quarter~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rand}{Randomize}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rclt}{Required~Contextual~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rkrf}{Rakar~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rlig}{Required~Ligatures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rphf}{Reph~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rtbd}{Right~Bounds}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rtla}{Right-to-left~alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rtlm}{Right-to-left~mirrored~forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ruby}{Ruby~Notation~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {rvrn}{Required~Variation~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {salt}{Stylistic~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {sinf}{Scientific~Inferiors}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {size}{Optical~size}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {smcp}{Small~Capitals}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {smpl}{Simplified~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ssNN}{Stylistic~Set~$N$}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {ssty}{Math~script~style~alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {stch}{Stretching~Glyph~Decomposition}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {subs}{Subscript}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {sups}{Superscript}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {swsh}{Swash}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {titl}{Titling}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {tjmo}{Trailing~Jamo~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {tnam}{Traditional~Name~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {tnum}{Tabular~Figures}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {trad}{Traditional~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {twid}{Third~Widths}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {unic}{Unicase}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {valt}{Alternate~Vertical~Metrics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vatu}{Vattu~Variants}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vert}{Vertical~Writing}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vhal}{Alternate~Vertical~Half~Metrics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vjmo}{Vowel~Jamo~Forms}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vkna}{Vertical~Kana~Alternates}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vkrn}{Vertical~Kerning}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vpal}{Proportional~Alternate~Vertical~Metrics}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vrt2}{Vertical~Alternates~and~Rotation}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {vrtr}{Vertical~Alternates~for~Rotation}
+\prop_gput:Nnn \g__fontspec_all_opentype_feature_names_prop {zero}{Slashed~Zero}
+
+
+\cs_new:Nn \__fontspec_define_aat_feature_group:n
+  { \keys_define:nn {fontspec-aat} { #1 .multichoice: } }
+\cs_new:Nn \__fontspec_define_aat_feature:nnnn
+ {
+  \keys_define:nn {fontspec-aat}
+   {
+    #1/#2 .code:n = { \__fontspec_make_AAT_feature:nn {#3}{#4} }
+   }
+ }
+
+\cs_new:Nn \__fontspec_make_AAT_feature:nn
  {
-  \keys_define:nn {#1} { #2 .code:n = {#3} }
+  \tl_if_empty:nTF {#1}
+   { \__fontspec_warning:n {aat-feature-not-exist} }
+   {
+     \__fontspec_make_AAT_feature_string:nnTF {#1}{#2}
+      {
+       \__fontspec_update_featstr:n {\l_fontspec_feature_string_tl}
+     }
+     { \__fontspec_warning:nx {aat-feature-not-exist-in-font} {#1,#2} }
+   }
  }
+\prg_new_conditional:Nnn \__fontspec_make_AAT_feature_string:nn {TF,T,F}
+ {
+  \tl_set:Nx \l_tmpa_tl { \XeTeXfeaturename \l_fontspec_font #1 }
+  \tl_if_empty:NTF \l_tmpa_tl
+   { \prg_return_false: }
+   {
+    \int_compare:nTF { \XeTeXisexclusivefeature\l_fontspec_font #1 > 0 }
+     {
+      \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
+     }
+     {
+      \int_if_even:nTF {#2}
+       {
+        \tl_set:Nx \l_tmpb_tl {\XeTeXselectorname\l_fontspec_font #1\space #2}
+       }
+       {
+        \tl_set:Nx \l_tmpb_tl
+         {
+          \XeTeXselectorname\l_fontspec_font #1\space \numexpr#2-1\relax
+         }
+        \tl_if_empty:NF \l_tmpb_tl { \tl_put_left:Nn \l_tmpb_tl {!} }
+       }
+    }
+    \tl_if_empty:NTF \l_tmpb_tl
+     { \prg_return_false: }
+     {
+      \tl_set:Nx \l_fontspec_feature_string_tl { \l_tmpa_tl = \l_tmpb_tl }
+      \prg_return_true:
+     }
+   }
+ }
+
+\clist_set:Nn \g__fontspec_all_keyval_modules_clist
+  {
+    fontspec, fontspec-opentype, fontspec-aat,
+    fontspec-preparse, fontspec-preparse-external, fontspec-preparse-nested,
+    fontspec-renderer
+  }
+\cs_new:Nn \__fontspec_keys_define_code:nnn
+  {
+   \keys_define:nn {#1} { #2 .code:n = {#3} }
+  }
 \cs_new:Nn \__fontspec_aff_error:n
   {
     \__fontspec_keys_define_code:nnn {fontspec-addfeatures} {#1}
       { \__fontspec_error:nx {not-in-addfontfeatures} {#1} }
   }
-\bool_new:N \l__fontspec_external_bool
-\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {ExternalLocation}
+\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {Path}
  {
   \bool_set_true:N \l__fontspec_nobf_bool
   \bool_set_true:N \l__fontspec_noit_bool
   \bool_set_true:N \l__fontspec_external_bool
-  \cs_set:Npn \__fontspec_namewrap:n ##1 { [ #1 ##1 ] }
+  \tl_set:Nn \l__fontspec_font_path_tl {#1}
+  \__fontspec_font_is_file:
   \keys_set:nn {fontspec-renderer} {Renderer=OpenType}
  }
-\aliasfontfeature{ExternalLocation}{Path}
+\aliasfontfeature{Path}{ExternalLocation}
+\__fontspec_keys_define_code:nnn {fontspec} {Path} {}
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {Extension}
  {
   \tl_set:Nn \l__fontspec_extension_tl {#1}
   \bool_if:NF \l__fontspec_external_bool
    {
-    \keys_set:nn {fontspec-preparse-external} {ExternalLocation}
+    \keys_set:nn {fontspec-preparse-external} {Path}
    }
  }
 \tl_clear:N \l__fontspec_extension_tl
+\__fontspec_keys_define_code:nnn {fontspec} {Extension} {}
 \keys_define:nn {fontspec-renderer}
  {
   Renderer .choices:nn =
@@ -1523,6 +1863,7 @@
     \int_compare:nTF {\l_keys_choice_int <= 4} {
       \tl_set:Nv \l_fontspec_renderer_tl
         { g_fontspec_renderer_tag_ \l_keys_choice_tl }
+      \tl_gset:Nx \g__fontspec_single_feat_tl { \l_fontspec_renderer_tl }
      }
      {
       \__fontspec_warning:nx {only-luatex-feature} {Renderer=Full/Basic}
@@ -1545,7 +1886,16 @@
     \keys_set:nn {fontspec-renderer} {Renderer=OpenType}
   \tl_set:Nn \l__fontspec_lang_name_tl {#1}
  }
-\seq_new:N \g__fontspec_bf_series_seq
+\__fontspec_keys_define_code:nnn {fontspec-preparse} {FontIndex}
+ {
+  \str_if_eq_x:nnF { \str_lower_case:f {\l__fontspec_extension_tl} } {.ttc}
+    { \__fontspec_warning:n {font-index-needs-ttc} }
+  \tl_set:Nn \l__fontspec_ttc_index_tl {:#1}
+ }
+\__fontspec_keys_define_code:nnn {fontspec} {FontIndex}
+ {
+  \tl_set:Nn \l__fontspec_ttc_index_tl {:#1}
+ }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldSeries}
  {
   \tl_gset:Nx \g__fontspec_curr_series_tl { #1 }
@@ -1553,14 +1903,12 @@
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {UprightFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_up_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_up_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {FontName}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_up_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_up_tl {#1}
  }
-\cs_generate_variant:Nn \tl_if_eq:nnT {ox}
-\cs_generate_variant:Nn \prop_put:Nnn {NxV}
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldFont}
  {
   \tl_if_empty:nTF {#1}
@@ -1577,7 +1925,7 @@
       \seq_put_right:Nx \g__fontspec_bf_series_seq {\bfdefault}
      }
     \tl_if_eq:oxT \g__fontspec_curr_series_tl {\bfdefault}
-     { \tl_set_eq:NN \l_fontspec_fontname_bf_tl \l__fontspec_curr_bfname_tl }
+     { \tl_set_eq:NN \l__fontspec_fontname_bf_tl \l__fontspec_curr_bfname_tl }
 
 
     \prop_put:NxV \l__fontspec_nfss_prop
@@ -1585,7 +1933,6 @@
 
    }
  }
-\prop_new:N \l__fontspec_nfss_prop
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {ItalicFont}
  {
   \tl_if_empty:nTF {#1}
@@ -1594,20 +1941,20 @@
    }
    {
     \bool_set_false:N \l__fontspec_noit_bool
-    \fontspec_complete_fontname:Nn \l_fontspec_fontname_it_tl {#1}
+    \fontspec_complete_fontname:Nn \l__fontspec_fontname_it_tl {#1}
    }
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldItalicFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_bfit_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_bfit_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {SlantedFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_sl_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_sl_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {BoldSlantedFont}
  {
-  \fontspec_complete_fontname:Nn \l_fontspec_fontname_bfsl_tl {#1}
+  \fontspec_complete_fontname:Nn \l__fontspec_fontname_bfsl_tl {#1}
  }
 \__fontspec_keys_define_code:nnn {fontspec} {SmallCapsFont}
  {
@@ -1617,15 +1964,9 @@
    }
    {
     \bool_set_false:N \l__fontspec_nosc_bool
-    \fontspec_complete_fontname:Nn \l_fontspec_fontname_sc_tl {#1}
+    \fontspec_complete_fontname:Nn \l__fontspec_fontname_sc_tl {#1}
    }
  }
-\cs_set:Nn \fontspec_complete_fontname:Nn
- {
-  \tl_set:Nx #1 {#2}
-  \tl_replace_all:Nnx #1 {*} {\l__fontspec_basename_tl}
- }
-\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
 \__fontspec_keys_define_code:nnn {fontspec-preparse} {UprightFeatures}
  {
   \clist_set:Nn \l__fontspec_fontfeat_up_clist {#1}
@@ -1700,7 +2041,6 @@
   \tl_if_exist:NT \l_fontspec_family_tl
    { \cs_undefine:c {g__fontspec_ \l_fontspec_family_tl _prop} }
  }
-\prop_new:N \l__fontspec_nfssfont_prop
 \__fontspec_keys_define_code:nnn {fontspec} {FontFace}
  {
   \tl_set:No \l__fontspec_arg_tl { \use_iii:nnn #1 }
@@ -1718,20 +2058,6 @@
   \__fontspec_add_nfssfont:nnnn
    {\use_i:nnn #1}{\use_ii:nnn #1}{\l__fontspec_this_font_tl}{\l__fontspec_this_feat_tl}
  }
-\cs_new:Nn \__fontspec_add_nfssfont:nnnn
- {
-  \tl_set:Nx \l__fontspec_this_font_tl {#3}
-
-  \tl_if_empty:xTF {#4}
-   { \clist_set:Nn \l__fontspec_sizefeat_clist {Size={-}} }
-   { \keys_set_known:noN {fontspec-preparse-nested} {#4} \l__fontspec_tmp_tl }
-
-  \tl_if_empty:NF \l__fontspec_this_font_tl
-   {
-    \prop_put:Nxx \l__fontspec_nfssfont_prop {#1/#2}
-     { {#1}{#2}{\l__fontspec_this_font_tl}{#4}{\l__fontspec_sizefeat_clist} }
-   }
- }
 \__fontspec_keys_define_code:nnn {fontspec} {Scale}
  {
   \str_case:nnF {#1}
@@ -1764,7 +2090,7 @@
     \settoheight #1
      {
       \str_if_eq:nnTF {#3} {\font} \rmfamily #3
-      \int_case:nnn #2
+      \int_case:nnF #2
        {
          {5} {x} % x-height
          {8} {X} % cap-height
@@ -1841,7 +2167,7 @@
     \tl_if_single:nTF {#1}
      { \tl_set:Nn \l_fontspec_hyphenchar_tl {`#1} }
      { \tl_set:Nn \l_fontspec_hyphenchar_tl { #1} }
-    \font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
+    \__fontspec_primitive_font_glyph_if_exist:NnTF \l_fontspec_font {\l_fontspec_hyphenchar_tl}
      {
       \tl_put_right:Nn \l__fontspec_postadjust_tl
         { \hyphenchar \font = \l_fontspec_hyphenchar_tl \scan_stop: }
@@ -1880,7 +2206,6 @@
   \tl_set:Nn \l__fontspec_opacity_tl {#7#8}
  }
 \aliasfontfeature{Color}{Colour}
-\int_new:N \l__fontspec_tmp_int
 \__fontspec_keys_define_code:nnn {fontspec} {Opacity}
  {
   \int_set:Nn \l__fontspec_tmp_int {255}
@@ -1900,10 +2225,6 @@
  {
   \__fontspec_update_featstr:n { mapping = #1 }
  }
-\__fontspec_keys_define_code:nnn {fontspec} {FeatureFile}
- {
-  \__fontspec_update_featstr:n { featurefile = #1 }
- }
 \__fontspec_keys_define_code:nnn {fontspec} {Weight}
  {
   \__fontspec_update_featstr:n{weight=#1}
@@ -1960,17 +2281,17 @@
    {
     \bool_if:NT \l__fontspec_firsttime_bool
      {
-      \tl_set:Nn \l_fontspec_fake_slant_tl {#1}
+      \tl_set:Nn \l__fontspec_fake_slant_tl {#1}
       \clist_put_right:Nn \l__fontspec_fontfeat_it_clist {FakeSlant=#1}
-      \tl_set_eq:NN \l_fontspec_fontname_it_tl \l_fontspec_fontname_tl
+      \tl_set_eq:NN \l__fontspec_fontname_it_tl \l_fontspec_fontname_tl
       \bool_set_false:N \l__fontspec_noit_bool
 
-      \tl_if_empty:NF \l_fontspec_fake_embolden_tl
+      \tl_if_empty:NF \l__fontspec_fake_embolden_tl
        {
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist
-         {FakeBold=\l_fontspec_fake_embolden_tl}
+         {FakeBold=\l__fontspec_fake_embolden_tl}
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist {FakeSlant=#1}
-        \tl_set_eq:NN \l_fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
+        \tl_set_eq:NN \l__fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
        }
      }
    },
@@ -1982,154 +2303,247 @@
    {
     \bool_if:NT \l__fontspec_firsttime_bool
      {
-      \tl_set:Nn \l_fontspec_fake_embolden_tl {#1}
+      \tl_set:Nn \l__fontspec_fake_embolden_tl {#1}
       \clist_put_right:Nn \l__fontspec_fontfeat_bf_clist {FakeBold=#1}
-      \tl_set_eq:NN \l_fontspec_fontname_bf_tl \l_fontspec_fontname_tl
+      \tl_set_eq:NN \l__fontspec_fontname_bf_tl \l_fontspec_fontname_tl
       \bool_set_false:N \l__fontspec_nobf_bool
 
-      \tl_if_empty:NF \l_fontspec_fake_slant_tl
+      \tl_if_empty:NF \l__fontspec_fake_slant_tl
        {
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist
-         {FakeSlant=\l_fontspec_fake_slant_tl}
+         {FakeSlant=\l__fontspec_fake_slant_tl}
         \clist_put_right:Nx \l__fontspec_fontfeat_bfit_clist {FakeBold=#1}
-        \tl_set_eq:NN \l_fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
+        \tl_set_eq:NN \l__fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
        }
      }
    },
   AutoFakeBold .default:n = {1.5}
 }
-\__fontspec_define_font_feature:n{Ligatures}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Required}       {1}{0}{+rlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoRequired}     {1}{1}{-rlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Common}         {1}{2}{+liga}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoCommon}       {1}{3}{-liga}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Rare}           {1}{4}{+dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoRare}         {1}{5}{-dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Discretionary}  {1}{4}{+dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoDiscretionary}{1}{5}{-dlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Contextual}     {}{}  {+clig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoContextual}   {}{}  {-clig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Historic}       {}{}  {+hlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoHistoric}     {}{}  {-hlig}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Logos}          {1}{6} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoLogos}        {1}{7} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Rebus}          {1}{8} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoRebus}        {1}{9} {}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Diphthong}      {1}{10}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoDiphthong}    {1}{11}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Squared}        {1}{12}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoSquared}      {1}{13}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{AbbrevSquared}  {1}{14}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoAbbrevSquared}{1}{15}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{Icelandic}      {1}{32}{}
-\__fontspec_define_feature_option:nnnnn{Ligatures}{NoIcelandic}    {1}{33}{}
-\keys_define:nn {fontspec}
+\__fontspec_keys_define_code:nnn {fontspec} {RawFeature}
  {
-  Ligatures / TeX .code:n =
-   {
-    \__fontspec_update_featstr:n { mapping = tex-text }
-   }
+  \__fontspec_update_featstr:n {#1}
  }
-\__fontspec_define_font_feature:n{Letters}
-\__fontspec_define_feature_option:nnnnn{Letters}{Normal}             {3}{0}{}
-\__fontspec_define_feature_option:nnnnn{Letters}{Uppercase}          {3}{1}{+case}
-\__fontspec_define_feature_option:nnnnn{Letters}{Lowercase}          {3}{2}{}
-\__fontspec_define_feature_option:nnnnn{Letters}{SmallCaps}          {3}{3}{+smcp}
-\__fontspec_define_feature_option:nnnnn{Letters}{PetiteCaps}         {} {} {+pcap}
-\__fontspec_define_feature_option:nnnnn{Letters}{UppercaseSmallCaps} {} {} {+c2sc}
-\__fontspec_define_feature_option:nnnnn{Letters}{UppercasePetiteCaps}{} {} {+c2pc}
-\__fontspec_define_feature_option:nnnnn{Letters}{InitialCaps}        {3}{4}{}
-\__fontspec_define_feature_option:nnnnn{Letters}{Unicase}            {} {} {+unic}
-\__fontspec_define_feature_option:nnnnn{Letters}{Random}             {} {} {+rand}
-\__fontspec_define_font_feature:n{Numbers}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Monospaced}   {6} {0}{+tnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Proportional} {6} {1}{+pnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Lowercase}    {21}{0}{+onum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{OldStyle}     {21}{0}{+onum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Uppercase}    {21}{1}{+lnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{Lining}       {21}{1}{+lnum}
-\__fontspec_define_feature_option:nnnnn{Numbers}{SlashedZero}  {14}{5}{+zero}
-\__fontspec_define_feature_option:nnnnn{Numbers}{NoSlashedZero}{14}{4}{-zero}
-\luatex_if_engine:T
- {
-  \__fontspec_define_feature_option:nnnnn{Numbers}{Arabic}{}{}{+anum}
- }
-\__fontspec_define_font_feature:n  {Contextuals}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{Swash}        {} {} {+cswh}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoSwash}      {} {} {-cswh}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{Alternate}    {} {} {+calt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoAlternate}  {} {} {-calt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{WordInitial}  {8}{0}{+init}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoWordInitial}{8}{1}{-init}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{WordFinal}    {8}{2}{+fina}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoWordFinal}  {8}{3}{-fina}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{LineInitial}  {8}{4}{}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoLineInitial}{8}{5}{}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{LineFinal}    {8}{6}{+falt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoLineFinal}  {8}{7}{-falt}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{Inner}        {8}{8}{+medi}
-\__fontspec_define_feature_option:nnnnn{Contextuals}{NoInner}      {8}{9}{-medi}
-\__fontspec_define_font_feature:n{Diacritics}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{Show}        {9}{0}{}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{Hide}        {9}{1}{}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{Decompose}   {9}{2}{}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{MarkToBase}  {}{}{+mark}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoMarkToBase}{}{}{-mark}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{MarkToMark}  {}{}{+mkmk}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoMarkToMark}{}{}{-mkmk}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{AboveBase}   {}{}{+abvm}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoAboveBase} {}{}{-abvm}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{BelowBase}   {}{}{+blwm}
-\__fontspec_define_feature_option:nnnnn{Diacritics}{NoBelowBase} {}{}{-blwm}
-\__fontspec_define_font_feature:n{Kerning}
-\__fontspec_define_feature_option:nnnnn{Kerning}{Uppercase}{}{}{+cpsp}
-\__fontspec_define_feature_option:nnnnn{Kerning}{On}       {}{}{+kern}
-\__fontspec_define_feature_option:nnnnn{Kerning}{Off}      {}{}{-kern}
-\__fontspec_define_font_feature:n{VerticalPosition}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Normal}     {10}{0}{}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Superior}   {10}{1}{+sups}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Inferior}   {10}{2}{+subs}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Ordinal}    {10}{3}{+ordn}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Numerator}  {}  {} {+numr}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{Denominator}{}  {} {+dnom}
-\__fontspec_define_feature_option:nnnnn{VerticalPosition}{ScientificInferior}{}{}{+sinf}
-\__fontspec_define_font_feature:n{Fractions}
-\__fontspec_define_feature_option:nnnnn{Fractions}{On}       {11}{1}{+frac}
-\__fontspec_define_feature_option:nnnnn{Fractions}{Off}      {11}{0}{-frac}
-\__fontspec_define_feature_option:nnnnn{Fractions}{Diagonal} {11}{2}{}
-\__fontspec_define_feature_option:nnnnn{Fractions}{Alternate}{}  {} {+afrc}
-\__fontspec_define_font_feature:n { Alternate }
-\keys_define:nn {fontspec}
+
+\__fontspec_feat_prop_add:nn {salt} { Alternate\,=\,$N$ }
+\__fontspec_feat_prop_add:nn {nalt} { Annotation\,=\,$N$ }
+\__fontspec_feat_prop_add:nn {ornm} { Ornament\,=\,$N$ }
+\__fontspec_feat_prop_add:nn {cvNN} { CharacterVariant\,=\,$N$:$M$ }
+\__fontspec_feat_prop_add:nn {ssNN} { StylisticSet\,=\,$N$ }
+\__fontspec_define_opentype_feature_group:n {Ligatures}
+\__fontspec_define_opentype_feature:nnnnn {Ligatures} {ResetAll} {} {}
+  {
+    +dlig,-dlig,+rlig,-rlig,+liga,-liga,+dlig,-dlig,+clig,-clig,+hlig,-hlig,
+  mapping = tex-text
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Required}      {rlig} {rlig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Common}        {liga} {liga} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Rare}          {dlig} {dlig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Discretionary} {dlig} {dlig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Contextual}    {clig} {clig} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Ligatures} {Historic}      {hlig} {hlig} {}
+\__fontspec_define_opentype_onreset:nnnnn {Ligatures} {TeX} {} { mapping = tex-text } {}
+\__fontspec_define_opentype_feature_group:n {Letters}
+\__fontspec_define_opentype_feature:nnnnn   {Letters} {ResetAll} {} {}
+  {
+    +case,+smcp,+pcap,+c2sc,+c2pc,+unic,+rand,
+    -case,-smcp,-pcap,-c2sc,-c2pc,-unic,-rand
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {Uppercase} {case} {case} {+smcp,+pcap,+c2sc,+c2pc,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {SmallCaps} {smcp} {smcp} {+pcap,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {PetiteCaps} {pcap} {pcap} {+smcp,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {UppercaseSmallCaps} {c2sc} {c2sc} {+c2pc,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {UppercasePetiteCaps} {c2pc} {c2pc} {+c2sc,+unic,+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {Unicase} {unic} {unic} {+rand}
+\__fontspec_define_opentype_onoffreset:nnnnn {Letters} {Random} {rand} {rand} {+unic}
+\__fontspec_define_opentype_feature_group:n {Numbers}
+\__fontspec_define_opentype_feature:nnnnn   {Numbers} {ResetAll} {} {}
+  {
+    +tnum,-tnum,
+    +pnum,-pnum,
+    +onum,-onum,
+    +lnum,-lnum,
+    +zero,-zero,
+    +anum,-anum,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Monospaced}   {tnum} {tnum} {+pnum,-pnum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Proportional} {pnum} {pnum} {+tnum,-tnum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Lowercase}    {onum} {onum} {+lnum,-lnum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {Uppercase}    {lnum} {lnum} {+onum,-onum}
+\__fontspec_define_opentype_onoffreset:nnnnn {Numbers} {SlashedZero}  {zero} {zero} {}
+\aliasfontfeatureoption {Numbers} {Lowercase} {OldStyle}
+\aliasfontfeatureoption {Numbers} {Uppercase} {Lining}
+\__fontspec_define_opentype_feature_group:n  {VerticalPosition}
+\__fontspec_define_opentype_feature:nnnnn    {VerticalPosition} {ResetAll} {} {}
+  {
+    +sups,-sups,
+    +subs,-subs,
+    +ordn,-ordn,
+    +numr,-numr,
+    +dnom,-dnom,
+    +sinf,-sinf,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Superior}           {sups} {sups} {+subs,+ordn,+numr,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Inferior}           {subs} {subs} {+sups,+ordn,+numr,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Ordinal}            {ordn} {ordn} {+sups,+subs,+numr,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Numerator}          {numr} {numr} {+sups,+subs,+ordn,+dnom,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {Denominator}        {dnom} {dnom} {+sups,+subs,+ordn,+numr,+sinf}
+\__fontspec_define_opentype_onoffreset:nnnnn {VerticalPosition} {ScientificInferior} {sinf} {sinf} {+sups,+subs,+ordn,+numr,+dnom}
+\__fontspec_define_opentype_feature_group:n  {Contextuals}
+\__fontspec_define_opentype_feature:nnnnn    {Contextuals} {ResetAll} {} {}
+  {
+    +cswh,-cswh,
+    +calt,-calt,
+    +init,-init,
+    +fina,-fina,
+    +falt,-falt,
+    +medi,-medi,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {Swash}       {cswh} {cswh} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {Alternate}   {calt} {calt} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {WordInitial} {init} {init} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {WordFinal}   {fina} {fina} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {LineFinal}   {falt} {falt} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Contextuals} {Inner}       {medi} {medi} {}
+\__fontspec_define_opentype_feature_group:n  {Diacritics}
+\__fontspec_define_opentype_feature:nnnnn    {Diacritics} {ResetAll} {} {}
+  {
+    +mark,-mark,
+    +mkmk,-mkmk,
+    +abvm,-abvm,
+    +blwm,-blwm,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {MarkToBase} {mark} {mark} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {MarkToMark} {mkmk} {mkmk} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {AboveBase}  {abvm} {abvm} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Diacritics} {BelowBase}  {blwm} {blwm} {}
+\__fontspec_define_opentype_feature_group:n  {Kerning}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {ResetAll} {} {}
+  {
+    +cpsp,-cpsp,
+    +kern,-kern,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Kerning} {Uppercase} {cpsp} {cpsp} {}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {On}        {kern} {+kern} {-kern}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {Off}       {kern} {-kern} {+kern}
+\__fontspec_define_opentype_feature:nnnnn    {Kerning} {Reset}     {} {} {+kern,-kern}
+\__fontspec_define_opentype_feature_group:n  {Fractions}
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {ResetAll} {} {}
+  {
+    +frac,-frac,
+    +afrc,-afrc,
+  }
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {On}    {frac} {+frac} {}
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {Off}   {frac} {-frac} {}
+\__fontspec_define_opentype_feature:nnnnn    {Fractions} {Reset} {} {} {+frac,-frac}
+\__fontspec_define_opentype_onoffreset:nnnnn {Fractions} {Alternate} {afrc} {afrc} {-frac}
+
+\__fontspec_define_opentype_feature_group:n  {Style}
+\__fontspec_define_opentype_feature:nnnnn    {Style} {ResetAll} {} {}
+  {
+    +salt,-salt,
+    +ital,-ital,
+    +ruby,-ruby,
+    +swsh,-swsh,
+    +hist,-hist,
+    +titl,-titl,
+    +hkna,-hkna,
+    +vkna,-vkna,
+    +ssty=0,-ssty=0,
+    +ssty=1,-ssty=1,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Alternate}        {salt} {salt} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Italic}           {ital} {ital} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Ruby}             {ruby} {ruby} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Swash}            {swsh} {swsh} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Cursive}          {swsh} {curs} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {Historic}         {hist} {hist} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {TitlingCaps}      {titl} {titl} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {HorizontalKana}   {hkna} {hkna} {+vkna,+pkna}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {VerticalKana}     {vkna} {vkna} {+hkna,+pkna}
+\__fontspec_define_opentype_onoffreset:nnnnn {Style} {ProportionalKana} {pkna} {pkna} {+vkna,+hkna}
+\__fontspec_define_opentype_feature:nnnnn    {Style} {MathScript}       {ssty} {+ssty=0} {+ssty=1}
+\__fontspec_define_opentype_feature:nnnnn    {Style} {MathScriptScript} {ssty} {+ssty=1} {+ssty=0}
+\__fontspec_define_opentype_feature_group:n  {CJKShape}
+\__fontspec_define_opentype_feature:nnnnn    {CJKShape} {ResetAll} {} {}
+  {
+    +trad,-trad,
+    +smpl,-smpl,
+    +jp78,-jp78,
+    +jp83,-jp83,
+    +jp90,-jp90,
+    +jp04,-jp04,
+    +expt,-expt,
+    +nlck,-nlck,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {Traditional} {trad} {trad} {+smpl,+jp78,+jp83,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {Simplified}  {smpl} {smpl} {+trad,+jp78,+jp83,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1978}     {jp78} {jp78} {+trad,+smpl,+jp83,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1983}     {jp83} {jp83} {+trad,+smpl,+jp78,+jp90,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS1990}     {jp90} {jp90} {+trad,+smpl,+jp78,+jp83,+jp04,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {JIS2004}     {jp04} {jp04} {+trad,+smpl,+jp78,+jp83,+jp90,+expt,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {Expert}      {expt} {expt} {+trad,+smpl,+jp78,+jp83,+jp90,+jp04,+nlck}
+\__fontspec_define_opentype_onoffreset:nnnnn {CJKShape} {NLC}         {nlck} {nlck} {+trad,+smpl,+jp78,+jp83,+jp90,+jp04,+expt}
+\__fontspec_define_opentype_feature_group:n  {CharacterWidth}
+\__fontspec_define_opentype_feature:nnnnn    {CharacterWidth} {ResetAll} {} {}
+  {
+    +pwid,-pwid,
+    +fwid,-fwid,
+    +hwid,-hwid,
+    +twid,-twid,
+    +qwid,-qwid,
+    +palt,-palt,
+    +halt,-halt,
+  }
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Proportional}          {pwid} {pwid} {+fwid,+hwid,+twid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Full}                  {fwid} {fwid} {+pwid,+hwid,+twid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Half}                  {hwid} {hwid} {+pwid,+fwid,+twid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Third}                 {twid} {twid} {+pwid,+fwid,+hwid,+qwid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {Quarter}               {qwid} {qwid} {+pwid,+fwid,+hwid,+twid,+palt,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {AlternateProportional} {palt} {palt} {+pwid,+fwid,+hwid,+twid,+qwid,+halt}
+\__fontspec_define_opentype_onoffreset:nnnnn {CharacterWidth} {AlternateHalf}         {halt} {halt} {+pwid,+fwid,+hwid,+twid,+qwid,+palt}
+\__fontspec_define_opentype_feature_group:n {Vertical}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {RotatedGlyphs}         {vrt2} {vrt2} {+vrtr,+vert}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {AlternatesForRotation} {vrtr} {vrtr} {+vrt2}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {Alternates}            {vert} {vert} {+vrt2}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {KanaAlternates}        {vkna} {vkna} {+hkna}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {Kerning}               {vkrn} {vkrn} {}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {AlternateMetrics}      {valt} {valt} {+vhal,+vpal,+kern}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {HalfMetrics}           {vhal} {vhal} {+valt,+vpal,+kern}
+\__fontspec_define_opentype_onoffreset:nnnnn {Vertical} {ProportionalMetrics}   {vpal} {vpal} {+valt,+vhal}
+\__fontspec_define_opentype_feature_group:n  {Alternate}
+\keys_define:nn {fontspec-opentype}
  {
   Alternate .default:n = {0} ,
   Alternate / unknown .code:n =
    {
     \clist_map_inline:nn {#1}
-      { \fontspec_make_feature:nnx {17}{##1} { \fontspec_salt:n {##1} } }
+      { \__fontspec_make_OT_feature:nnn {salt}{ +salt = ##1 }{} }
    }
  }
-\cs_set:Nn \fontspec_salt:n { +salt = #1 }
-\__fontspec_define_font_feature:n {Variant}
-\keys_define:nn {fontspec}
+\aliasfontfeature{Alternate}{StylisticAlternates}
+\__fontspec_define_opentype_feature_group:n  {Variant}
+\keys_define:nn {fontspec-opentype}
  {
   Variant .default:n = {0} ,
   Variant / unknown .code:n =
    {
     \clist_map_inline:nn {#1}
-      { \fontspec_make_feature:nnx {18}{##1} { +ss \two@digits {##1} } }
+      {
+        \__fontspec_make_OT_feature:xxx { ss \two@digits {##1} } { +ss \two@digits {##1} } {}
+      }
    }
  }
 \aliasfontfeature{Variant}{StylisticSet}
-\__fontspec_define_font_feature:n { CharacterVariant }
+\__fontspec_define_opentype_feature_group:n  {CharacterVariant}
 \use:x
  {
   \cs_new:Npn \exp_not:N \fontspec_parse_cv:w
       ##1 \c_colon_str ##2 \c_colon_str ##3 \exp_not:N \q_nil
    {
-     \fontspec_make_numbered_feature:xn
-       { +cv \exp_not:N \two@digits {##1} } {##2}
+     \__fontspec_make_OT_feature:xxx
+       { cv \exp_not:N \two@digits {##1} } { +cv \exp_not:N \two@digits {##1} = ##2 } {}
    }
-  \keys_define:nn {fontspec}
+  \keys_define:nn {fontspec-opentype}
    {
     CharacterVariant / unknown .code:n =
      {
@@ -2141,90 +2555,53 @@
      }
    }
  }
-\__fontspec_define_font_feature:n{Style}
-\__fontspec_define_feature_option:nnnnn{Style}{Alternate}     {}  {} {+salt}
-\__fontspec_define_feature_option:nnnnn{Style}{Italic}        {32}{2}{+ital}
-\__fontspec_define_feature_option:nnnnn{Style}{Ruby}          {28}{2}{+ruby}
-\__fontspec_define_feature_option:nnnnn{Style}{Swash}         {}  {} {+swsh}
-\__fontspec_define_feature_option:nnnnn{Style}{Historic}      {}  {} {+hist}
-\__fontspec_define_feature_option:nnnnn{Style}{Display}       {19}{1}{}
-\__fontspec_define_feature_option:nnnnn{Style}{Engraved}      {19}{2}{}
-\__fontspec_define_feature_option:nnnnn{Style}{TitlingCaps}   {19}{4}{+titl}
-\__fontspec_define_feature_option:nnnnn{Style}{TallCaps}      {19}{5}{}
-\__fontspec_define_feature_option:nnnnn{Style}{HorizontalKana}{}  {} {+hkna}
-\__fontspec_define_feature_option:nnnnn{Style}{VerticalKana}  {}  {} {+vkna}
-\fontspec_define_numbered_feat:nnnn {Style} {MathScript}       {+ssty} {0}
-\fontspec_define_numbered_feat:nnnn {Style} {MathScriptScript} {+ssty} {1}
-\__fontspec_define_font_feature:n{CJKShape}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{Traditional}{20}{0} {+trad}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{Simplified} {20}{1} {+smpl}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS1978}    {20}{2} {+jp78}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS1983}    {20}{3} {+jp83}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS1990}    {20}{4} {+jp90}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{Expert}     {20}{10}{+expt}
-\__fontspec_define_feature_option:nnnnn{CJKShape}{NLC}        {20}{13}{+nlck}
-\__fontspec_define_font_feature:n{CharacterWidth}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Proportional}{22}{0}{+pwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Full}{22}{1}{+fwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Half}{22}{2}{+hwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Third}{22}{3}{+twid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Quarter}{22}{4}{+qwid}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{AlternateProportional}{22}{5}{+palt}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{AlternateHalf}{22}{6}{+halt}
-\__fontspec_define_feature_option:nnnnn{CharacterWidth}{Default}{22}{7}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Off}{24}{0}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Box}{24}{1}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{RoundedBox}{24}{2}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Circle}{24}{3}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{BlackCircle}{24}{4}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Parenthesis}{24}{5}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Period}{24}{6}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{RomanNumerals}{24}{7}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{Diamond}{24}{8}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{BlackSquare}{24}{9}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{BlackRoundSquare}{24}{10}{}
-\__fontspec_define_feature_option:nnnnn{Annotation}{DoubleCircle}{24}{11}{}
-\__fontspec_define_font_feature:n { Annotation }
-\keys_define:nn {fontspec}
+\__fontspec_define_opentype_feature_group:n {Annotation}
+\keys_define:nn {fontspec-opentype}
  {
   Annotation .default:n = {0} ,
   Annotation / unknown .code:n =
    {
-    \fontspec_make_feature:nnx {}{}{ +nalt=#1 }
+    \__fontspec_make_OT_feature:nnn {nalt} {+nalt=#1} {}
    }
  }
-\keys_define:nn {fontspec}
+\__fontspec_define_opentype_feature_group:n  {Ornament}
+\keys_define:nn {fontspec-opentype}
  {
-  Vertical .choice: ,
-  Vertical / RotatedGlyphs .code:n =
+  Ornament .default:n = {0} ,
+  Ornament / unknown .code:n =
    {
-    \bool_if:NTF \l__fontspec_ot_bool
-     {
-      \fontspec_make_feature:nnn{}{}{+vrt2}
-      \__fontspec_update_featstr:n {vertical}
-     }
-     {
-      \__fontspec_update_featstr:n {vertical}
-     }
+    \__fontspec_make_OT_feature:nnn {ornm} { +ornm=#1 } {}
    }
  }
-\keys_define:nn { fontspec } { Script .choice: }
+\keys_define:nn { fontspec-opentype } { Script .choice: }
 \cs_new:Nn \fontspec_new_script:nn
  {
-  \keys_define:nn { fontspec } { Script / #1 .code:n =
+  \keys_define:nn { fontspec-opentype } { Script / #1 .code:n =
+    \bool_set_false:N \l__fontspec_script_exist_bool
     \clist_map_inline:nn {#2}
      {
-      \fontspec_check_script:nTF {####1}
+      \__fontspec_check_script:nTF {####1}
        {
         \tl_set:Nn \l_fontspec_script_tl {####1}
-        \int_set:Nn \l_fontspec_script_int {\l_fontspec_strnum_int}
+        \int_set:Nn \l__fontspec_script_int {\l__fontspec_strnum_int}
+        \bool_set_true:N \l__fontspec_script_exist_bool
+        \tl_gset:Nx \g__fontspec_single_feat_tl { script=####1 }
         \clist_map_break:
        }
+       { }
+     }
+    \bool_if:NF \l__fontspec_script_exist_bool
+     {
+      \str_if_eq:nnTF {#1} {Latin}
        {
-        \fontspec_check_script:nTF {latn}
+        \__fontspec_warning:nx {script-not-exist} {#1}
+       }
+       {
+        \__fontspec_check_script:nTF {latn}
          {
           \__fontspec_warning:nx {script-not-exist-latn} {#1}
-          \keys_set:nn {fontspec} {Script=Latin}
+          \tl_set:Nn \l_fontspec_script_tl {latn}
+          \int_set:Nn \l__fontspec_script_int {\l__fontspec_strnum_int}
          }
          {
           \__fontspec_warning:nx {script-not-exist} {#1}
@@ -2233,296 +2610,745 @@
      }
    }
  }
-\newfontscript{Arabic}{arab}            \newfontscript{Armenian}{armn}
+\keys_define:nn { fontspec-opentype } { Language .choice: }
+\cs_new:Nn \fontspec_new_lang:nn
+ {
+  \keys_define:nn { fontspec-opentype } { Language / #1 .code:n =
+  \__fontspec_check_lang:nTF {#2}
+     {
+      \tl_set:Nn \l_fontspec_lang_tl {#2}
+      \int_set:Nn \l__fontspec_language_int {\l__fontspec_strnum_int}
+      \tl_gset:Nx \g__fontspec_single_feat_tl { language=#2 }
+     }
+     {
+      \__fontspec_warning:nx {language-not-exist} {#1}
+      \keys_set:nn { fontspec-opentype } { Language = Default }
+     }
+  }
+ }
+\__fontspec_keys_define_code:nnn {fontspec-opentype}{ Language / Default }
+ {
+  \tl_set:Nn \l_fontspec_lang_tl {DFLT}
+  \int_zero:N \l__fontspec_language_int
+  \tl_gset:Nn \g__fontspec_single_feat_tl { language=DFLT }
+ }
+\keys_define:nn {fontspec-opentype}
+ {
+  Language / Turkish .code:n =
+   {
+    \__fontspec_check_lang:nTF {TRK}
+     {
+      \int_set:Nn \l__fontspec_language_int {\l__fontspec_strnum_int}
+      \tl_set:Nn \l_fontspec_lang_tl {TRK}
+      \tl_gset:Nn \g__fontspec_single_feat_tl { language=TRK }
+     }
+     {
+      \__fontspec_check_lang:nTF {TUR}
+       {
+        \int_set:Nn \l__fontspec_language_int {\l__fontspec_strnum_int}
+        \tl_set:Nn \l_fontspec_lang_tl {TUR}
+        \tl_gset:Nn \g__fontspec_single_feat_tl { language=TUR }
+       }
+       {
+        \__fontspec_warning:nx {language-not-exist} {Turkish}
+        \keys_set:nn {fontspec-opentype} {Language=Default}
+       }
+     }
+   }
+ }
+\cs_new:Nn \__fontspec_ot_compat:nn
+  {
+    \aliasfontfeatureoption {#1} {#2Off} {No#2}
+  }
+\__fontspec_ot_compat:nn {Ligatures}   {Rare}
+\__fontspec_ot_compat:nn {Ligatures}   {Required}
+\__fontspec_ot_compat:nn {Ligatures}   {Common}
+\__fontspec_ot_compat:nn {Ligatures}   {Discretionary}
+\__fontspec_ot_compat:nn {Ligatures}   {Contextual}
+\__fontspec_ot_compat:nn {Ligatures}   {Historic}
+\__fontspec_ot_compat:nn {Numbers}     {SlashedZero}
+\__fontspec_ot_compat:nn {Contextuals} {Swash}
+\__fontspec_ot_compat:nn {Contextuals} {Alternate}
+\__fontspec_ot_compat:nn {Contextuals} {WordInitial}
+\__fontspec_ot_compat:nn {Contextuals} {WordFinal}
+\__fontspec_ot_compat:nn {Contextuals} {LineFinal}
+\__fontspec_ot_compat:nn {Contextuals} {Inner}
+\__fontspec_ot_compat:nn {Diacritics}  {MarkToBase}
+\__fontspec_ot_compat:nn {Diacritics}  {MarkToMark}
+\__fontspec_ot_compat:nn {Diacritics}  {AboveBase}
+\__fontspec_ot_compat:nn {Diacritics}  {BelowBase}
+
+\newfontscript{Arabic}{arab}
+\newfontscript{Armenian}{armn}
 \newfontscript{Balinese}{bali}
 \newfontscript{Bengali}{bng2,beng}
-\newfontscript{Bopomofo}{bopo}          \newfontscript{Braille}{brai}
-\newfontscript{Buginese}{bugi}          \newfontscript{Buhid}{buhd}
+\newfontscript{Bopomofo}{bopo}
+\newfontscript{Braille}{brai}
+\newfontscript{Buginese}{bugi}
+\newfontscript{Buhid}{buhd}
 \newfontscript{Byzantine~Music}{byzm}
 \newfontscript{Canadian~Syllabics}{cans}
 \newfontscript{Cherokee}{cher}
-\newfontscript{CJK~Ideographic}{hani}   \newfontscript{Coptic}{copt}
-\newfontscript{Cypriot~Syllabary}{cprt} \newfontscript{Cyrillic}{cyrl}
-\newfontscript{Default}{DFLT}           \newfontscript{Deseret}{dsrt}
+\newfontscript{CJK~Ideographic}{hani}
+\newfontscript{Coptic}{copt}
+\newfontscript{Cypriot~Syllabary}{cprt}
+\newfontscript{Cyrillic}{cyrl}
+\newfontscript{Default}{DFLT}
+\newfontscript{Deseret}{dsrt}
 \newfontscript{Devanagari}{dev2,deva}
 \newfontscript{Ethiopic}{ethi}
-\newfontscript{Georgian}{geor}          \newfontscript{Glagolitic}{glag}
-\newfontscript{Gothic}{goth}            \newfontscript{Greek}{grek}
+\newfontscript{Georgian}{geor}
+\newfontscript{Glagolitic}{glag}
+\newfontscript{Gothic}{goth}
+\newfontscript{Greek}{grek}
 \newfontscript{Gujarati}{gjr2,gujr}
 \newfontscript{Gurmukhi}{gur2,guru}
-\newfontscript{Hangul~Jamo}{jamo}       \newfontscript{Hangul}{hang}
-\newfontscript{Hanunoo}{hano}           \newfontscript{Hebrew}{hebr}
+\newfontscript{Hangul~Jamo}{jamo}
+\newfontscript{Hangul}{hang}
+\newfontscript{Hanunoo}{hano}
+\newfontscript{Hebrew}{hebr}
 \newfontscript{Hiragana~and~Katakana}{kana}
 \newfontscript{Javanese}{java}
 \newfontscript{Kannada}{knd2,knda}
-\newfontscript{Kharosthi}{khar}         \newfontscript{Khmer}{khmr}
-\newfontscript{Lao}{lao~}               \newfontscript{Latin}{latn}
-\newfontscript{Limbu}{limb}             \newfontscript{Linear~B}{linb}
+\newfontscript{Kharosthi}{khar}
+\newfontscript{Khmer}{khmr}
+\newfontscript{Lao}{lao~}
+\newfontscript{Latin}{latn}
+\newfontscript{Limbu}{limb}
+\newfontscript{Linear~B}{linb}
 \newfontscript{Malayalam}{mlm2,mlym}
 \newfontscript{Math}{math}
 \newfontscript{Mongolian}{mong}
-\newfontscript{Musical~Symbols}{musc}   \newfontscript{Myanmar}{mymr}
-\newfontscript{N'ko}{nko~}              \newfontscript{Ogham}{ogam}
+\newfontscript{Musical~Symbols}{musc}
+\newfontscript{Myanmar}{mymr}
+\newfontscript{N'ko}{nko~}
+\newfontscript{Ogham}{ogam}
 \newfontscript{Old~Italic}{ital}
 \newfontscript{Old~Persian~Cuneiform}{xpeo}
 \newfontscript{Oriya}{ory2,orya}
 \newfontscript{Osmanya}{osma}
-\newfontscript{Phags-pa}{phag}          \newfontscript{Phoenician}{phnx}
-\newfontscript{Runic}{runr}             \newfontscript{Shavian}{shaw}
+\newfontscript{Phags-pa}{phag}
+\newfontscript{Phoenician}{phnx}
+\newfontscript{Runic}{runr}
+\newfontscript{Shavian}{shaw}
 \newfontscript{Sinhala}{sinh}
 \newfontscript{Sumero-Akkadian~Cuneiform}{xsux}
-\newfontscript{Syloti~Nagri}{sylo}      \newfontscript{Syriac}{syrc}
-\newfontscript{Tagalog}{tglg}           \newfontscript{Tagbanwa}{tagb}
-\newfontscript{Tai~Le}{tale}            \newfontscript{Tai~Lu}{talu}
+\newfontscript{Syloti~Nagri}{sylo}
+\newfontscript{Syriac}{syrc}
+\newfontscript{Tagalog}{tglg}
+\newfontscript{Tagbanwa}{tagb}
+\newfontscript{Tai~Le}{tale}
+\newfontscript{Tai~Lu}{talu}
 \newfontscript{Tamil}{tml2,taml}
 \newfontscript{Telugu}{tel2,telu}
-\newfontscript{Thaana}{thaa}            \newfontscript{Thai}{thai}
-\newfontscript{Tibetan}{tibt}           \newfontscript{Tifinagh}{tfng}
-\newfontscript{Ugaritic~Cuneiform}{ugar}\newfontscript{Yi}{yi~~}
+\newfontscript{Thaana}{thaa}
+\newfontscript{Thai}{thai}
+\newfontscript{Tibetan}{tibt}
+\newfontscript{Tifinagh}{tfng}
+\newfontscript{Ugaritic~Cuneiform}{ugar}
+\newfontscript{Yi}{yi~~}
 \newfontscript{Kana}{kana}
 \newfontscript{Maths}{math}
 \newfontscript{CJK}{hani}
-\keys_define:nn { fontspec } { Language .choice: }
-\cs_new:Nn \fontspec_new_lang:nn
- {
-  \keys_define:nn { fontspec } { Language / #1 .code:n =
-    \fontspec_check_lang:nTF {#2}
-     {
-      \tl_set:Nn \l_fontspec_lang_tl {#2}
-      \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-     }
-     {
-      \__fontspec_warning:nx {language-not-exist} {#1}
-      \keys_set:nn { fontspec } { Language = Default }
-     }
-  }
- }
-\newfontlanguage{Abaza}{ABA}\newfontlanguage{Abkhazian}{ABK}
-\newfontlanguage{Adyghe}{ADY}\newfontlanguage{Afrikaans}{AFK}
-\newfontlanguage{Afar}{AFR}\newfontlanguage{Agaw}{AGW}
-\newfontlanguage{Altai}{ALT}\newfontlanguage{Amharic}{AMH}
-\newfontlanguage{Arabic}{ARA}\newfontlanguage{Aari}{ARI}
-\newfontlanguage{Arakanese}{ARK}\newfontlanguage{Assamese}{ASM}
-\newfontlanguage{Athapaskan}{ATH}\newfontlanguage{Avar}{AVR}
-\newfontlanguage{Awadhi}{AWA}\newfontlanguage{Aymara}{AYM}
-\newfontlanguage{Azeri}{AZE}\newfontlanguage{Badaga}{BAD}
-\newfontlanguage{Baghelkhandi}{BAG}\newfontlanguage{Balkar}{BAL}
-\newfontlanguage{Baule}{BAU}\newfontlanguage{Berber}{BBR}
-\newfontlanguage{Bench}{BCH}\newfontlanguage{Bible~Cree}{BCR}
-\newfontlanguage{Belarussian}{BEL}\newfontlanguage{Bemba}{BEM}
-\newfontlanguage{Bengali}{BEN}\newfontlanguage{Bulgarian}{BGR}
-\newfontlanguage{Bhili}{BHI}\newfontlanguage{Bhojpuri}{BHO}
-\newfontlanguage{Bikol}{BIK}\newfontlanguage{Bilen}{BIL}
-\newfontlanguage{Blackfoot}{BKF}\newfontlanguage{Balochi}{BLI}
-\newfontlanguage{Balante}{BLN}\newfontlanguage{Balti}{BLT}
-\newfontlanguage{Bambara}{BMB}\newfontlanguage{Bamileke}{BML}
-\newfontlanguage{Breton}{BRE}\newfontlanguage{Brahui}{BRH}
-\newfontlanguage{Braj~Bhasha}{BRI}\newfontlanguage{Burmese}{BRM}
-\newfontlanguage{Bashkir}{BSH}\newfontlanguage{Beti}{BTI}
-\newfontlanguage{Catalan}{CAT}\newfontlanguage{Cebuano}{CEB}
-\newfontlanguage{Chechen}{CHE}\newfontlanguage{Chaha~Gurage}{CHG}
-\newfontlanguage{Chattisgarhi}{CHH}\newfontlanguage{Chichewa}{CHI}
-\newfontlanguage{Chukchi}{CHK}\newfontlanguage{Chipewyan}{CHP}
-\newfontlanguage{Cherokee}{CHR}\newfontlanguage{Chuvash}{CHU}
-\newfontlanguage{Comorian}{CMR}\newfontlanguage{Coptic}{COP}
-\newfontlanguage{Cree}{CRE}\newfontlanguage{Carrier}{CRR}
-\newfontlanguage{Crimean~Tatar}{CRT}\newfontlanguage{Church~Slavonic}{CSL}
-\newfontlanguage{Czech}{CSY}\newfontlanguage{Danish}{DAN}
-\newfontlanguage{Dargwa}{DAR}\newfontlanguage{Woods~Cree}{DCR}
+
+\newfontlanguage{Abaza}{ABA}
+\newfontlanguage{Abkhazian}{ABK}
+\newfontlanguage{Adyghe}{ADY}
+\newfontlanguage{Afrikaans}{AFK}
+\newfontlanguage{Afar}{AFR}
+\newfontlanguage{Agaw}{AGW}
+\newfontlanguage{Altai}{ALT}
+\newfontlanguage{Amharic}{AMH}
+\newfontlanguage{Arabic}{ARA}
+\newfontlanguage{Aari}{ARI}
+\newfontlanguage{Arakanese}{ARK}
+\newfontlanguage{Assamese}{ASM}
+\newfontlanguage{Athapaskan}{ATH}
+\newfontlanguage{Avar}{AVR}
+\newfontlanguage{Awadhi}{AWA}
+\newfontlanguage{Aymara}{AYM}
+\newfontlanguage{Azeri}{AZE}
+\newfontlanguage{Badaga}{BAD}
+\newfontlanguage{Baghelkhandi}{BAG}
+\newfontlanguage{Balkar}{BAL}
+\newfontlanguage{Baule}{BAU}
+\newfontlanguage{Berber}{BBR}
+\newfontlanguage{Bench}{BCH}
+\newfontlanguage{Bible~Cree}{BCR}
+\newfontlanguage{Belarussian}{BEL}
+\newfontlanguage{Bemba}{BEM}
+\newfontlanguage{Bengali}{BEN}
+\newfontlanguage{Bulgarian}{BGR}
+\newfontlanguage{Bhili}{BHI}
+\newfontlanguage{Bhojpuri}{BHO}
+\newfontlanguage{Bikol}{BIK}
+\newfontlanguage{Bilen}{BIL}
+\newfontlanguage{Blackfoot}{BKF}
+\newfontlanguage{Balochi}{BLI}
+\newfontlanguage{Balante}{BLN}
+\newfontlanguage{Balti}{BLT}
+\newfontlanguage{Bambara}{BMB}
+\newfontlanguage{Bamileke}{BML}
+\newfontlanguage{Breton}{BRE}
+\newfontlanguage{Brahui}{BRH}
+\newfontlanguage{Braj~Bhasha}{BRI}
+\newfontlanguage{Burmese}{BRM}
+\newfontlanguage{Bashkir}{BSH}
+\newfontlanguage{Beti}{BTI}
+\newfontlanguage{Catalan}{CAT}
+\newfontlanguage{Cebuano}{CEB}
+\newfontlanguage{Chechen}{CHE}
+\newfontlanguage{Chaha~Gurage}{CHG}
+\newfontlanguage{Chattisgarhi}{CHH}
+\newfontlanguage{Chichewa}{CHI}
+\newfontlanguage{Chukchi}{CHK}
+\newfontlanguage{Chipewyan}{CHP}
+\newfontlanguage{Cherokee}{CHR}
+\newfontlanguage{Chuvash}{CHU}
+\newfontlanguage{Comorian}{CMR}
+\newfontlanguage{Coptic}{COP}
+\newfontlanguage{Cree}{CRE}
+\newfontlanguage{Carrier}{CRR}
+\newfontlanguage{Crimean~Tatar}{CRT}
+\newfontlanguage{Church~Slavonic}{CSL}
+\newfontlanguage{Czech}{CSY}
+\newfontlanguage{Danish}{DAN}
+\newfontlanguage{Dargwa}{DAR}
+\newfontlanguage{Woods~Cree}{DCR}
 \newfontlanguage{German}{DEU}
-\newfontlanguage{Dogri}{DGR}\newfontlanguage{Divehi}{DIV}
-\newfontlanguage{Djerma}{DJR}\newfontlanguage{Dangme}{DNG}
-\newfontlanguage{Dinka}{DNK}\newfontlanguage{Dungan}{DUN}
-\newfontlanguage{Dzongkha}{DZN}\newfontlanguage{Ebira}{EBI}
-\newfontlanguage{Eastern~Cree}{ECR}\newfontlanguage{Edo}{EDO}
-\newfontlanguage{Efik}{EFI}\newfontlanguage{Greek}{ELL}
-\newfontlanguage{English}{ENG}\newfontlanguage{Erzya}{ERZ}
-\newfontlanguage{Spanish}{ESP}\newfontlanguage{Estonian}{ETI}
-\newfontlanguage{Basque}{EUQ}\newfontlanguage{Evenki}{EVK}
-\newfontlanguage{Even}{EVN}\newfontlanguage{Ewe}{EWE}
+\newfontlanguage{Dogri}{DGR}
+\newfontlanguage{Divehi}{DIV}
+\newfontlanguage{Djerma}{DJR}
+\newfontlanguage{Dangme}{DNG}
+\newfontlanguage{Dinka}{DNK}
+\newfontlanguage{Dungan}{DUN}
+\newfontlanguage{Dzongkha}{DZN}
+\newfontlanguage{Ebira}{EBI}
+\newfontlanguage{Eastern~Cree}{ECR}
+\newfontlanguage{Edo}{EDO}
+\newfontlanguage{Efik}{EFI}
+\newfontlanguage{Greek}{ELL}
+\newfontlanguage{English}{ENG}
+\newfontlanguage{Erzya}{ERZ}
+\newfontlanguage{Spanish}{ESP}
+\newfontlanguage{Estonian}{ETI}
+\newfontlanguage{Basque}{EUQ}
+\newfontlanguage{Evenki}{EVK}
+\newfontlanguage{Even}{EVN}
+\newfontlanguage{Ewe}{EWE}
 \newfontlanguage{French~Antillean}{FAN}
 \newfontlanguage{Farsi}{FAR}
 \newfontlanguage{Parsi}{FAR}
 \newfontlanguage{Persian}{FAR}
-\newfontlanguage{Finnish}{FIN}\newfontlanguage{Fijian}{FJI}
-\newfontlanguage{Flemish}{FLE}\newfontlanguage{Forest~Nenets}{FNE}
-\newfontlanguage{Fon}{FON}\newfontlanguage{Faroese}{FOS}
-\newfontlanguage{French}{FRA}\newfontlanguage{Frisian}{FRI}
-\newfontlanguage{Friulian}{FRL}\newfontlanguage{Futa}{FTA}
-\newfontlanguage{Fulani}{FUL}\newfontlanguage{Ga}{GAD}
-\newfontlanguage{Gaelic}{GAE}\newfontlanguage{Gagauz}{GAG}
-\newfontlanguage{Galician}{GAL}\newfontlanguage{Garshuni}{GAR}
-\newfontlanguage{Garhwali}{GAW}\newfontlanguage{Ge'ez}{GEZ}
-\newfontlanguage{Gilyak}{GIL}\newfontlanguage{Gumuz}{GMZ}
-\newfontlanguage{Gondi}{GON}\newfontlanguage{Greenlandic}{GRN}
-\newfontlanguage{Garo}{GRO}\newfontlanguage{Guarani}{GUA}
-\newfontlanguage{Gujarati}{GUJ}\newfontlanguage{Haitian}{HAI}
-\newfontlanguage{Halam}{HAL}\newfontlanguage{Harauti}{HAR}
-\newfontlanguage{Hausa}{HAU}\newfontlanguage{Hawaiin}{HAW}
-\newfontlanguage{Hammer-Banna}{HBN}\newfontlanguage{Hiligaynon}{HIL}
-\newfontlanguage{Hindi}{HIN}\newfontlanguage{High~Mari}{HMA}
-\newfontlanguage{Hindko}{HND}\newfontlanguage{Ho}{HO}
-\newfontlanguage{Harari}{HRI}\newfontlanguage{Croatian}{HRV}
-\newfontlanguage{Hungarian}{HUN}\newfontlanguage{Armenian}{HYE}
-\newfontlanguage{Igbo}{IBO}\newfontlanguage{Ijo}{IJO}
-\newfontlanguage{Ilokano}{ILO}\newfontlanguage{Indonesian}{IND}
-\newfontlanguage{Ingush}{ING}\newfontlanguage{Inuktitut}{INU}
-\newfontlanguage{Irish}{IRI}\newfontlanguage{Irish~Traditional}{IRT}
-\newfontlanguage{Icelandic}{ISL}\newfontlanguage{Inari~Sami}{ISM}
-\newfontlanguage{Italian}{ITA}\newfontlanguage{Hebrew}{IWR}
-\newfontlanguage{Javanese}{JAV}\newfontlanguage{Yiddish}{JII}
-\newfontlanguage{Japanese}{JAN}\newfontlanguage{Judezmo}{JUD}
-\newfontlanguage{Jula}{JUL}\newfontlanguage{Kabardian}{KAB}
-\newfontlanguage{Kachchi}{KAC}\newfontlanguage{Kalenjin}{KAL}
-\newfontlanguage{Kannada}{KAN}\newfontlanguage{Karachay}{KAR}
-\newfontlanguage{Georgian}{KAT}\newfontlanguage{Kazakh}{KAZ}
-\newfontlanguage{Kebena}{KEB}\newfontlanguage{Khutsuri~Georgian}{KGE}
-\newfontlanguage{Khakass}{KHA}\newfontlanguage{Khanty-Kazim}{KHK}
-\newfontlanguage{Khmer}{KHM}\newfontlanguage{Khanty-Shurishkar}{KHS}
-\newfontlanguage{Khanty-Vakhi}{KHV}\newfontlanguage{Khowar}{KHW}
-\newfontlanguage{Kikuyu}{KIK}\newfontlanguage{Kirghiz}{KIR}
-\newfontlanguage{Kisii}{KIS}\newfontlanguage{Kokni}{KKN}
-\newfontlanguage{Kalmyk}{KLM}\newfontlanguage{Kamba}{KMB}
-\newfontlanguage{Kumaoni}{KMN}\newfontlanguage{Komo}{KMO}
-\newfontlanguage{Komso}{KMS}\newfontlanguage{Kanuri}{KNR}
-\newfontlanguage{Kodagu}{KOD}\newfontlanguage{Korean~Old~Hangul}{KOH}
-\newfontlanguage{Konkani}{KOK}\newfontlanguage{Kikongo}{KON}
-\newfontlanguage{Komi-Permyak}{KOP}\newfontlanguage{Korean}{KOR}
-\newfontlanguage{Komi-Zyrian}{KOZ}\newfontlanguage{Kpelle}{KPL}
-\newfontlanguage{Krio}{KRI}\newfontlanguage{Karakalpak}{KRK}
-\newfontlanguage{Karelian}{KRL}\newfontlanguage{Karaim}{KRM}
-\newfontlanguage{Karen}{KRN}\newfontlanguage{Koorete}{KRT}
-\newfontlanguage{Kashmiri}{KSH}\newfontlanguage{Khasi}{KSI}
-\newfontlanguage{Kildin~Sami}{KSM}\newfontlanguage{Kui}{KUI}
-\newfontlanguage{Kulvi}{KUL}\newfontlanguage{Kumyk}{KUM}
-\newfontlanguage{Kurdish}{KUR}\newfontlanguage{Kurukh}{KUU}
-\newfontlanguage{Kuy}{KUY}\newfontlanguage{Koryak}{KYK}
-\newfontlanguage{Ladin}{LAD}\newfontlanguage{Lahuli}{LAH}
-\newfontlanguage{Lak}{LAK}\newfontlanguage{Lambani}{LAM}
-\newfontlanguage{Lao}{LAO}\newfontlanguage{Latin}{LAT}
-\newfontlanguage{Laz}{LAZ}\newfontlanguage{L-Cree}{LCR}
-\newfontlanguage{Ladakhi}{LDK}\newfontlanguage{Lezgi}{LEZ}
-\newfontlanguage{Lingala}{LIN}\newfontlanguage{Low~Mari}{LMA}
-\newfontlanguage{Limbu}{LMB}\newfontlanguage{Lomwe}{LMW}
-\newfontlanguage{Lower~Sorbian}{LSB}\newfontlanguage{Lule~Sami}{LSM}
-\newfontlanguage{Lithuanian}{LTH}\newfontlanguage{Luba}{LUB}
-\newfontlanguage{Luganda}{LUG}\newfontlanguage{Luhya}{LUH}
-\newfontlanguage{Luo}{LUO}\newfontlanguage{Latvian}{LVI}
-\newfontlanguage{Majang}{MAJ}\newfontlanguage{Makua}{MAK}
-\newfontlanguage{Malayalam~Traditional}{MAL}\newfontlanguage{Mansi}{MAN}
-\newfontlanguage{Marathi}{MAR}\newfontlanguage{Marwari}{MAW}
-\newfontlanguage{Mbundu}{MBN}\newfontlanguage{Manchu}{MCH}
-\newfontlanguage{Moose~Cree}{MCR}\newfontlanguage{Mende}{MDE}
-\newfontlanguage{Me'en}{MEN}\newfontlanguage{Mizo}{MIZ}
-\newfontlanguage{Macedonian}{MKD}\newfontlanguage{Male}{MLE}
-\newfontlanguage{Malagasy}{MLG}\newfontlanguage{Malinke}{MLN}
-\newfontlanguage{Malayalam~Reformed}{MLR}\newfontlanguage{Malay}{MLY}
-\newfontlanguage{Mandinka}{MND}\newfontlanguage{Mongolian}{MNG}
-\newfontlanguage{Manipuri}{MNI}\newfontlanguage{Maninka}{MNK}
-\newfontlanguage{Manx~Gaelic}{MNX}\newfontlanguage{Moksha}{MOK}
-\newfontlanguage{Moldavian}{MOL}\newfontlanguage{Mon}{MON}
-\newfontlanguage{Moroccan}{MOR}\newfontlanguage{Maori}{MRI}
-\newfontlanguage{Maithili}{MTH}\newfontlanguage{Maltese}{MTS}
-\newfontlanguage{Mundari}{MUN}\newfontlanguage{Naga-Assamese}{NAG}
-\newfontlanguage{Nanai}{NAN}\newfontlanguage{Naskapi}{NAS}
-\newfontlanguage{N-Cree}{NCR}\newfontlanguage{Ndebele}{NDB}
-\newfontlanguage{Ndonga}{NDG}\newfontlanguage{Nepali}{NEP}
-\newfontlanguage{Newari}{NEW}\newfontlanguage{Nagari}{NGR}
-\newfontlanguage{Norway~House~Cree}{NHC}\newfontlanguage{Nisi}{NIS}
-\newfontlanguage{Niuean}{NIU}\newfontlanguage{Nkole}{NKL}
-\newfontlanguage{N'ko}{NKO}\newfontlanguage{Dutch}{NLD}
-\newfontlanguage{Nogai}{NOG}\newfontlanguage{Norwegian}{NOR}
-\newfontlanguage{Northern~Sami}{NSM}\newfontlanguage{Northern~Tai}{NTA}
-\newfontlanguage{Esperanto}{NTO}\newfontlanguage{Nynorsk}{NYN}
-\newfontlanguage{Oji-Cree}{OCR}\newfontlanguage{Ojibway}{OJB}
-\newfontlanguage{Oriya}{ORI}\newfontlanguage{Oromo}{ORO}
-\newfontlanguage{Ossetian}{OSS}\newfontlanguage{Palestinian~Aramaic}{PAA}
-\newfontlanguage{Pali}{PAL}\newfontlanguage{Punjabi}{PAN}
-\newfontlanguage{Palpa}{PAP}\newfontlanguage{Pashto}{PAS}
-\newfontlanguage{Polytonic~Greek}{PGR}\newfontlanguage{Pilipino}{PIL}
-\newfontlanguage{Palaung}{PLG}\newfontlanguage{Polish}{PLK}
-\newfontlanguage{Provencal}{PRO}\newfontlanguage{Portuguese}{PTG}
-\newfontlanguage{Chin}{QIN}\newfontlanguage{Rajasthani}{RAJ}
-\newfontlanguage{R-Cree}{RCR}\newfontlanguage{Russian~Buriat}{RBU}
-\newfontlanguage{Riang}{RIA}\newfontlanguage{Rhaeto-Romanic}{RMS}
-\newfontlanguage{Romanian}{ROM}\newfontlanguage{Romany}{ROY}
-\newfontlanguage{Rusyn}{RSY}\newfontlanguage{Ruanda}{RUA}
-\newfontlanguage{Russian}{RUS}\newfontlanguage{Sadri}{SAD}
-\newfontlanguage{Sanskrit}{SAN}\newfontlanguage{Santali}{SAT}
-\newfontlanguage{Sayisi}{SAY}\newfontlanguage{Sekota}{SEK}
-\newfontlanguage{Selkup}{SEL}\newfontlanguage{Sango}{SGO}
-\newfontlanguage{Shan}{SHN}\newfontlanguage{Sibe}{SIB}
-\newfontlanguage{Sidamo}{SID}\newfontlanguage{Silte~Gurage}{SIG}
-\newfontlanguage{Skolt~Sami}{SKS}\newfontlanguage{Slovak}{SKY}
-\newfontlanguage{Slavey}{SLA}\newfontlanguage{Slovenian}{SLV}
-\newfontlanguage{Somali}{SML}\newfontlanguage{Samoan}{SMO}
-\newfontlanguage{Sena}{SNA}\newfontlanguage{Sindhi}{SND}
-\newfontlanguage{Sinhalese}{SNH}\newfontlanguage{Soninke}{SNK}
-\newfontlanguage{Sodo~Gurage}{SOG}\newfontlanguage{Sotho}{SOT}
-\newfontlanguage{Albanian}{SQI}\newfontlanguage{Serbian}{SRB}
-\newfontlanguage{Saraiki}{SRK}\newfontlanguage{Serer}{SRR}
-\newfontlanguage{South~Slavey}{SSL}\newfontlanguage{Southern~Sami}{SSM}
-\newfontlanguage{Suri}{SUR}\newfontlanguage{Svan}{SVA}
-\newfontlanguage{Swedish}{SVE}\newfontlanguage{Swadaya~Aramaic}{SWA}
-\newfontlanguage{Swahili}{SWK}\newfontlanguage{Swazi}{SWZ}
-\newfontlanguage{Sutu}{SXT}\newfontlanguage{Syriac}{SYR}
-\newfontlanguage{Tabasaran}{TAB}\newfontlanguage{Tajiki}{TAJ}
-\newfontlanguage{Tamil}{TAM}\newfontlanguage{Tatar}{TAT}
-\newfontlanguage{TH-Cree}{TCR}\newfontlanguage{Telugu}{TEL}
-\newfontlanguage{Tongan}{TGN}\newfontlanguage{Tigre}{TGR}
-\newfontlanguage{Tigrinya}{TGY}\newfontlanguage{Thai}{THA}
-\newfontlanguage{Tahitian}{THT}\newfontlanguage{Tibetan}{TIB}
-\newfontlanguage{Turkmen}{TKM}\newfontlanguage{Temne}{TMN}
-\newfontlanguage{Tswana}{TNA}\newfontlanguage{Tundra~Nenets}{TNE}
-\newfontlanguage{Tonga}{TNG}\newfontlanguage{Todo}{TOD}
-\newfontlanguage{Tsonga}{TSG}\newfontlanguage{Turoyo~Aramaic}{TUA}
-\newfontlanguage{Tulu}{TUL}\newfontlanguage{Tuvin}{TUV}
-\newfontlanguage{Twi}{TWI}\newfontlanguage{Udmurt}{UDM}
-\newfontlanguage{Ukrainian}{UKR}\newfontlanguage{Urdu}{URD}
-\newfontlanguage{Upper~Sorbian}{USB}\newfontlanguage{Uyghur}{UYG}
-\newfontlanguage{Uzbek}{UZB}\newfontlanguage{Venda}{VEN}
-\newfontlanguage{Vietnamese}{VIT}\newfontlanguage{Wa}{WA}
-\newfontlanguage{Wagdi}{WAG}\newfontlanguage{West-Cree}{WCR}
-\newfontlanguage{Welsh}{WEL}\newfontlanguage{Wolof}{WLF}
-\newfontlanguage{Tai~Lue}{XBD}\newfontlanguage{Xhosa}{XHS}
-\newfontlanguage{Yakut}{YAK}\newfontlanguage{Yoruba}{YBA}
-\newfontlanguage{Y-Cree}{YCR}\newfontlanguage{Yi~Classic}{YIC}
-\newfontlanguage{Yi~Modern}{YIM}\newfontlanguage{Chinese~Hong~Kong}{ZHH}
+\newfontlanguage{Finnish}{FIN}
+\newfontlanguage{Fijian}{FJI}
+\newfontlanguage{Flemish}{FLE}
+\newfontlanguage{Forest~Nenets}{FNE}
+\newfontlanguage{Fon}{FON}
+\newfontlanguage{Faroese}{FOS}
+\newfontlanguage{French}{FRA}
+\newfontlanguage{Frisian}{FRI}
+\newfontlanguage{Friulian}{FRL}
+\newfontlanguage{Futa}{FTA}
+\newfontlanguage{Fulani}{FUL}
+\newfontlanguage{Ga}{GAD}
+\newfontlanguage{Gaelic}{GAE}
+\newfontlanguage{Gagauz}{GAG}
+\newfontlanguage{Galician}{GAL}
+\newfontlanguage{Garshuni}{GAR}
+\newfontlanguage{Garhwali}{GAW}
+\newfontlanguage{Ge'ez}{GEZ}
+\newfontlanguage{Gilyak}{GIL}
+\newfontlanguage{Gumuz}{GMZ}
+\newfontlanguage{Gondi}{GON}
+\newfontlanguage{Greenlandic}{GRN}
+\newfontlanguage{Garo}{GRO}
+\newfontlanguage{Guarani}{GUA}
+\newfontlanguage{Gujarati}{GUJ}
+\newfontlanguage{Haitian}{HAI}
+\newfontlanguage{Halam}{HAL}
+\newfontlanguage{Harauti}{HAR}
+\newfontlanguage{Hausa}{HAU}
+\newfontlanguage{Hawaiin}{HAW}
+\newfontlanguage{Hammer-Banna}{HBN}
+\newfontlanguage{Hiligaynon}{HIL}
+\newfontlanguage{Hindi}{HIN}
+\newfontlanguage{High~Mari}{HMA}
+\newfontlanguage{Hindko}{HND}
+\newfontlanguage{Ho}{HO}
+\newfontlanguage{Harari}{HRI}
+\newfontlanguage{Croatian}{HRV}
+\newfontlanguage{Hungarian}{HUN}
+\newfontlanguage{Armenian}{HYE}
+\newfontlanguage{Igbo}{IBO}
+\newfontlanguage{Ijo}{IJO}
+\newfontlanguage{Ilokano}{ILO}
+\newfontlanguage{Indonesian}{IND}
+\newfontlanguage{Ingush}{ING}
+\newfontlanguage{Inuktitut}{INU}
+\newfontlanguage{Irish}{IRI}
+\newfontlanguage{Irish~Traditional}{IRT}
+\newfontlanguage{Icelandic}{ISL}
+\newfontlanguage{Inari~Sami}{ISM}
+\newfontlanguage{Italian}{ITA}
+\newfontlanguage{Hebrew}{IWR}
+\newfontlanguage{Javanese}{JAV}
+\newfontlanguage{Yiddish}{JII}
+\newfontlanguage{Japanese}{JAN}
+\newfontlanguage{Judezmo}{JUD}
+\newfontlanguage{Jula}{JUL}
+\newfontlanguage{Kabardian}{KAB}
+\newfontlanguage{Kachchi}{KAC}
+\newfontlanguage{Kalenjin}{KAL}
+\newfontlanguage{Kannada}{KAN}
+\newfontlanguage{Karachay}{KAR}
+\newfontlanguage{Georgian}{KAT}
+\newfontlanguage{Kazakh}{KAZ}
+\newfontlanguage{Kebena}{KEB}
+\newfontlanguage{Khutsuri~Georgian}{KGE}
+\newfontlanguage{Khakass}{KHA}
+\newfontlanguage{Khanty-Kazim}{KHK}
+\newfontlanguage{Khmer}{KHM}
+\newfontlanguage{Khanty-Shurishkar}{KHS}
+\newfontlanguage{Khanty-Vakhi}{KHV}
+\newfontlanguage{Khowar}{KHW}
+\newfontlanguage{Kikuyu}{KIK}
+\newfontlanguage{Kirghiz}{KIR}
+\newfontlanguage{Kisii}{KIS}
+\newfontlanguage{Kokni}{KKN}
+\newfontlanguage{Kalmyk}{KLM}
+\newfontlanguage{Kamba}{KMB}
+\newfontlanguage{Kumaoni}{KMN}
+\newfontlanguage{Komo}{KMO}
+\newfontlanguage{Komso}{KMS}
+\newfontlanguage{Kanuri}{KNR}
+\newfontlanguage{Kodagu}{KOD}
+\newfontlanguage{Korean~Old~Hangul}{KOH}
+\newfontlanguage{Konkani}{KOK}
+\newfontlanguage{Kikongo}{KON}
+\newfontlanguage{Komi-Permyak}{KOP}
+\newfontlanguage{Korean}{KOR}
+\newfontlanguage{Komi-Zyrian}{KOZ}
+\newfontlanguage{Kpelle}{KPL}
+\newfontlanguage{Krio}{KRI}
+\newfontlanguage{Karakalpak}{KRK}
+\newfontlanguage{Karelian}{KRL}
+\newfontlanguage{Karaim}{KRM}
+\newfontlanguage{Karen}{KRN}
+\newfontlanguage{Koorete}{KRT}
+\newfontlanguage{Kashmiri}{KSH}
+\newfontlanguage{Khasi}{KSI}
+\newfontlanguage{Kildin~Sami}{KSM}
+\newfontlanguage{Kui}{KUI}
+\newfontlanguage{Kulvi}{KUL}
+\newfontlanguage{Kumyk}{KUM}
+\newfontlanguage{Kurdish}{KUR}
+\newfontlanguage{Kurukh}{KUU}
+\newfontlanguage{Kuy}{KUY}
+\newfontlanguage{Koryak}{KYK}
+\newfontlanguage{Ladin}{LAD}
+\newfontlanguage{Lahuli}{LAH}
+\newfontlanguage{Lak}{LAK}
+\newfontlanguage{Lambani}{LAM}
+\newfontlanguage{Lao}{LAO}
+\newfontlanguage{Latin}{LAT}
+\newfontlanguage{Laz}{LAZ}
+\newfontlanguage{L-Cree}{LCR}
+\newfontlanguage{Ladakhi}{LDK}
+\newfontlanguage{Lezgi}{LEZ}
+\newfontlanguage{Lingala}{LIN}
+\newfontlanguage{Low~Mari}{LMA}
+\newfontlanguage{Limbu}{LMB}
+\newfontlanguage{Lomwe}{LMW}
+\newfontlanguage{Lower~Sorbian}{LSB}
+\newfontlanguage{Lule~Sami}{LSM}
+\newfontlanguage{Lithuanian}{LTH}
+\newfontlanguage{Luba}{LUB}
+\newfontlanguage{Luganda}{LUG}
+\newfontlanguage{Luhya}{LUH}
+\newfontlanguage{Luo}{LUO}
+\newfontlanguage{Latvian}{LVI}
+\newfontlanguage{Majang}{MAJ}
+\newfontlanguage{Makua}{MAK}
+\newfontlanguage{Malayalam~Traditional}{MAL}
+\newfontlanguage{Mansi}{MAN}
+\newfontlanguage{Marathi}{MAR}
+\newfontlanguage{Marwari}{MAW}
+\newfontlanguage{Mbundu}{MBN}
+\newfontlanguage{Manchu}{MCH}
+\newfontlanguage{Moose~Cree}{MCR}
+\newfontlanguage{Mende}{MDE}
+\newfontlanguage{Me'en}{MEN}
+\newfontlanguage{Mizo}{MIZ}
+\newfontlanguage{Macedonian}{MKD}
+\newfontlanguage{Male}{MLE}
+\newfontlanguage{Malagasy}{MLG}
+\newfontlanguage{Malinke}{MLN}
+\newfontlanguage{Malayalam~Reformed}{MLR}
+\newfontlanguage{Malay}{MLY}
+\newfontlanguage{Mandinka}{MND}
+\newfontlanguage{Mongolian}{MNG}
+\newfontlanguage{Manipuri}{MNI}
+\newfontlanguage{Maninka}{MNK}
+\newfontlanguage{Manx~Gaelic}{MNX}
+\newfontlanguage{Moksha}{MOK}
+\newfontlanguage{Moldavian}{MOL}
+\newfontlanguage{Mon}{MON}
+\newfontlanguage{Moroccan}{MOR}
+\newfontlanguage{Maori}{MRI}
+\newfontlanguage{Maithili}{MTH}
+\newfontlanguage{Maltese}{MTS}
+\newfontlanguage{Mundari}{MUN}
+\newfontlanguage{Naga-Assamese}{NAG}
+\newfontlanguage{Nanai}{NAN}
+\newfontlanguage{Naskapi}{NAS}
+\newfontlanguage{N-Cree}{NCR}
+\newfontlanguage{Ndebele}{NDB}
+\newfontlanguage{Ndonga}{NDG}
+\newfontlanguage{Nepali}{NEP}
+\newfontlanguage{Newari}{NEW}
+\newfontlanguage{Nagari}{NGR}
+\newfontlanguage{Norway~House~Cree}{NHC}
+\newfontlanguage{Nisi}{NIS}
+\newfontlanguage{Niuean}{NIU}
+\newfontlanguage{Nkole}{NKL}
+\newfontlanguage{N'ko}{NKO}
+\newfontlanguage{Dutch}{NLD}
+\newfontlanguage{Nogai}{NOG}
+\newfontlanguage{Norwegian}{NOR}
+\newfontlanguage{Northern~Sami}{NSM}
+\newfontlanguage{Northern~Tai}{NTA}
+\newfontlanguage{Esperanto}{NTO}
+\newfontlanguage{Nynorsk}{NYN}
+\newfontlanguage{Oji-Cree}{OCR}
+\newfontlanguage{Ojibway}{OJB}
+\newfontlanguage{Oriya}{ORI}
+\newfontlanguage{Oromo}{ORO}
+\newfontlanguage{Ossetian}{OSS}
+\newfontlanguage{Palestinian~Aramaic}{PAA}
+\newfontlanguage{Pali}{PAL}
+\newfontlanguage{Punjabi}{PAN}
+\newfontlanguage{Palpa}{PAP}
+\newfontlanguage{Pashto}{PAS}
+\newfontlanguage{Polytonic~Greek}{PGR}
+\newfontlanguage{Pilipino}{PIL}
+\newfontlanguage{Palaung}{PLG}
+\newfontlanguage{Polish}{PLK}
+\newfontlanguage{Provencal}{PRO}
+\newfontlanguage{Portuguese}{PTG}
+\newfontlanguage{Chin}{QIN}
+\newfontlanguage{Rajasthani}{RAJ}
+\newfontlanguage{R-Cree}{RCR}
+\newfontlanguage{Russian~Buriat}{RBU}
+\newfontlanguage{Riang}{RIA}
+\newfontlanguage{Rhaeto-Romanic}{RMS}
+\newfontlanguage{Romanian}{ROM}
+\newfontlanguage{Romany}{ROY}
+\newfontlanguage{Rusyn}{RSY}
+\newfontlanguage{Ruanda}{RUA}
+\newfontlanguage{Russian}{RUS}
+\newfontlanguage{Sadri}{SAD}
+\newfontlanguage{Sanskrit}{SAN}
+\newfontlanguage{Santali}{SAT}
+\newfontlanguage{Sayisi}{SAY}
+\newfontlanguage{Sekota}{SEK}
+\newfontlanguage{Selkup}{SEL}
+\newfontlanguage{Sango}{SGO}
+\newfontlanguage{Shan}{SHN}
+\newfontlanguage{Sibe}{SIB}
+\newfontlanguage{Sidamo}{SID}
+\newfontlanguage{Silte~Gurage}{SIG}
+\newfontlanguage{Skolt~Sami}{SKS}
+\newfontlanguage{Slovak}{SKY}
+\newfontlanguage{Slavey}{SLA}
+\newfontlanguage{Slovenian}{SLV}
+\newfontlanguage{Somali}{SML}
+\newfontlanguage{Samoan}{SMO}
+\newfontlanguage{Sena}{SNA}
+\newfontlanguage{Sindhi}{SND}
+\newfontlanguage{Sinhalese}{SNH}
+\newfontlanguage{Soninke}{SNK}
+\newfontlanguage{Sodo~Gurage}{SOG}
+\newfontlanguage{Sotho}{SOT}
+\newfontlanguage{Albanian}{SQI}
+\newfontlanguage{Serbian}{SRB}
+\newfontlanguage{Saraiki}{SRK}
+\newfontlanguage{Serer}{SRR}
+\newfontlanguage{South~Slavey}{SSL}
+\newfontlanguage{Southern~Sami}{SSM}
+\newfontlanguage{Suri}{SUR}
+\newfontlanguage{Svan}{SVA}
+\newfontlanguage{Swedish}{SVE}
+\newfontlanguage{Swadaya~Aramaic}{SWA}
+\newfontlanguage{Swahili}{SWK}
+\newfontlanguage{Swazi}{SWZ}
+\newfontlanguage{Sutu}{SXT}
+\newfontlanguage{Syriac}{SYR}
+\newfontlanguage{Tabasaran}{TAB}
+\newfontlanguage{Tajiki}{TAJ}
+\newfontlanguage{Tamil}{TAM}
+\newfontlanguage{Tatar}{TAT}
+\newfontlanguage{TH-Cree}{TCR}
+\newfontlanguage{Telugu}{TEL}
+\newfontlanguage{Tongan}{TGN}
+\newfontlanguage{Tigre}{TGR}
+\newfontlanguage{Tigrinya}{TGY}
+\newfontlanguage{Thai}{THA}
+\newfontlanguage{Tahitian}{THT}
+\newfontlanguage{Tibetan}{TIB}
+\newfontlanguage{Turkmen}{TKM}
+\newfontlanguage{Temne}{TMN}
+\newfontlanguage{Tswana}{TNA}
+\newfontlanguage{Tundra~Nenets}{TNE}
+\newfontlanguage{Tonga}{TNG}
+\newfontlanguage{Todo}{TOD}
+\newfontlanguage{Tsonga}{TSG}
+\newfontlanguage{Turoyo~Aramaic}{TUA}
+\newfontlanguage{Tulu}{TUL}
+\newfontlanguage{Tuvin}{TUV}
+\newfontlanguage{Twi}{TWI}
+\newfontlanguage{Udmurt}{UDM}
+\newfontlanguage{Ukrainian}{UKR}
+\newfontlanguage{Urdu}{URD}
+\newfontlanguage{Upper~Sorbian}{USB}
+\newfontlanguage{Uyghur}{UYG}
+\newfontlanguage{Uzbek}{UZB}
+\newfontlanguage{Venda}{VEN}
+\newfontlanguage{Vietnamese}{VIT}
+\newfontlanguage{Wa}{WA}
+\newfontlanguage{Wagdi}{WAG}
+\newfontlanguage{West-Cree}{WCR}
+\newfontlanguage{Welsh}{WEL}
+\newfontlanguage{Wolof}{WLF}
+\newfontlanguage{Tai~Lue}{XBD}
+\newfontlanguage{Xhosa}{XHS}
+\newfontlanguage{Yakut}{YAK}
+\newfontlanguage{Yoruba}{YBA}
+\newfontlanguage{Y-Cree}{YCR}
+\newfontlanguage{Yi~Classic}{YIC}
+\newfontlanguage{Yi~Modern}{YIM}
+\newfontlanguage{Chinese~Hong~Kong}{ZHH}
 \newfontlanguage{Chinese~Phonetic}{ZHP}
 \newfontlanguage{Chinese~Simplified}{ZHS}
-\newfontlanguage{Chinese~Traditional}{ZHT}\newfontlanguage{Zande}{ZND}
+\newfontlanguage{Chinese~Traditional}{ZHT}
+\newfontlanguage{Zande}{ZND}
 \newfontlanguage{Zulu}{ZUL}
-\keys_define:nn {fontspec}
+
+
+\__fontspec_define_aat_feature_group:n {Ligatures}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Required} {1} {0}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoRequired} {1} {1}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Common} {1} {2}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoCommon} {1} {3}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Rare} {1} {4}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoRare} {1} {5}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Discretionary} {1} {4}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoDiscretionary} {1} {5}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Logos} {1} {6}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoLogos} {1} {7}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Rebus} {1} {8}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoRebus} {1} {9}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Diphthong} {1} {10}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoDiphthong} {1} {11}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Squared} {1} {12}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoSquared} {1} {13}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {AbbrevSquared} {1} {14}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoAbbrevSquared} {1} {15}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {Icelandic} {1} {32}
+\__fontspec_define_aat_feature:nnnn      {Ligatures} {NoIcelandic} {1} {33}
+\keys_define:nn {fontspec-aat}
  {
-  Language / Turkish .code:n =
+  Ligatures / TeX .code:n =
    {
-    \fontspec_check_lang:nTF {TRK}
-     {
-      \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-      \tl_set:Nn \l_fontspec_lang_tl {TRK}
-     }
-     {
-      \fontspec_check_lang:nTF {TUR}
-       {
-        \int_set:Nn \l_fontspec_language_int {\l_fontspec_strnum_int}
-        \tl_set:Nn \l_fontspec_lang_tl {TUR}
-       }
-       {
-        \__fontspec_warning:nx {language-not-exist} {Turkish}
-        \keys_set:nn {fontspec} {Language=Default}
-       }
-     }
+    \__fontspec_update_featstr:n { mapping = tex-text }
    }
  }
-\__fontspec_keys_define_code:nnn {fontspec}{ Language / Default }
+\__fontspec_define_aat_feature_group:n {Letters}
+\__fontspec_define_aat_feature:nnnn      {Letters} {Normal} {3} {0}
+\__fontspec_define_aat_feature:nnnn      {Letters} {Uppercase} {3} {1}
+\__fontspec_define_aat_feature:nnnn      {Letters} {Lowercase} {3} {2}
+\__fontspec_define_aat_feature:nnnn      {Letters} {SmallCaps} {3} {3}
+\__fontspec_define_aat_feature:nnnn      {Letters} {InitialCaps} {3} {4}
+\__fontspec_define_aat_feature_group:n {Numbers}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {Monospaced} {6} {0}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {Proportional} {6} {1}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {Lowercase} {21} {0}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {OldStyle} {21} {0}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {Uppercase} {21} {1}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {Lining} {21} {1}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {SlashedZero} {14} {5}
+\__fontspec_define_aat_feature:nnnn      {Numbers} {NoSlashedZero} {14} {4}
+\__fontspec_define_aat_feature_group:n   {Contextuals}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {WordInitial} {8} {0}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {NoWordInitial} {8} {1}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {WordFinal} {8} {2}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {NoWordFinal} {8} {3}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {LineInitial} {8} {4}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {NoLineInitial} {8} {5}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {LineFinal} {8} {6}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {NoLineFinal} {8} {7}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {Inner} {8} {8}
+\__fontspec_define_aat_feature:nnnn      {Contextuals} {NoInner} {8} {9}
+\__fontspec_define_aat_feature_group:n {Diacritics}
+\__fontspec_define_aat_feature:nnnn      {Diacritics} {Show} {9} {0}
+\__fontspec_define_aat_feature:nnnn      {Diacritics} {Hide} {9} {1}
+\__fontspec_define_aat_feature:nnnn      {Diacritics} {Decompose} {9} {2}
+\__fontspec_define_aat_feature_group:n {VerticalPosition}
+\__fontspec_define_aat_feature:nnnn      {VerticalPosition} {Normal} {10} {0}
+\__fontspec_define_aat_feature:nnnn      {VerticalPosition} {Superior} {10} {1}
+\__fontspec_define_aat_feature:nnnn      {VerticalPosition} {Inferior} {10} {2}
+\__fontspec_define_aat_feature:nnnn      {VerticalPosition} {Ordinal} {10} {3}
+\__fontspec_define_aat_feature_group:n {Fractions}
+\__fontspec_define_aat_feature:nnnn      {Fractions} {On} {11} {1}
+\__fontspec_define_aat_feature:nnnn      {Fractions} {Off} {11} {0}
+\__fontspec_define_aat_feature:nnnn      {Fractions} {Diagonal} {11} {2}
+\__fontspec_define_aat_feature_group:n  { Alternate }
+\keys_define:nn {fontspec-aat}
  {
-  \tl_set:Nn \l_fontspec_lang_tl {DFLT}
-  \int_zero:N \l_fontspec_language_int
+  Alternate .default:n = {0} ,
+  Alternate / unknown .code:n =
+   {
+    \clist_map_inline:nn {#1}
+      {
+        \__fontspec_make_AAT_feature:nn {17}{##1}
+      }
+   }
  }
-\__fontspec_keys_define_code:nnn {fontspec} {RawFeature}
+\__fontspec_define_aat_feature_group:n  {Variant}
+\keys_define:nn {fontspec-aat}
  {
-  \__fontspec_update_featstr:n {#1}
+  Variant .default:n = {0} ,
+  Variant / unknown .code:n =
+   {
+    \clist_map_inline:nn {#1}
+      { \__fontspec_make_AAT_feature:nn {18}{##1} }
+   }
+ }
+\aliasfontfeature{Variant}{StylisticSet}
+\__fontspec_define_aat_feature_group:n  {Vertical}
+\keys_define:nn {fontspec-aat}
+ {
+  Vertical .choice: ,
+  Vertical / RotatedGlyphs .code:n =
+    {
+      \__fontspec_update_featstr:n {vertical}
+    }
  }
+
+\__fontspec_define_aat_feature_group:n {Style}
+\__fontspec_define_aat_feature:nnnn      {Style} {Italic} {32} {2}
+\__fontspec_define_aat_feature:nnnn      {Style} {Ruby} {28} {2}
+\__fontspec_define_aat_feature:nnnn      {Style} {Display} {19} {1}
+\__fontspec_define_aat_feature:nnnn      {Style} {Engraved} {19} {2}
+\__fontspec_define_aat_feature:nnnn      {Style} {TitlingCaps} {19} {4}
+\__fontspec_define_aat_feature:nnnn      {Style} {TallCaps} {19} {5}
+\__fontspec_define_aat_feature_group:n {CJKShape}
+\__fontspec_define_aat_feature:nnnn      {CJKShape} {Traditional} {20} {0}
+\__fontspec_define_aat_feature:nnnn      {CJKShape} {Simplified} {20} {1}
+\__fontspec_define_aat_feature:nnnn      {CJKShape} {JIS1978} {20} {2}
+\__fontspec_define_aat_feature:nnnn      {CJKShape} {JIS1983} {20} {3}
+\__fontspec_define_aat_feature:nnnn      {CJKShape} {JIS1990} {20} {4}
+\__fontspec_define_aat_feature:nnnn      {CJKShape} {Expert} {20} {10}
+\__fontspec_define_aat_feature:nnnn      {CJKShape} {NLC} {20} {13}
+\__fontspec_define_aat_feature_group:n {CharacterWidth}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {Proportional} {22} {0}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {Full} {22} {1}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {Half} {22} {2}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {Third} {22} {3}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {Quarter} {22} {4}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {AlternateProportional} {22} {5}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {AlternateHalf} {22} {6}
+\__fontspec_define_aat_feature:nnnn      {CharacterWidth} {Default} {22} {7}
+\__fontspec_define_aat_feature_group:n {Annotation}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {Off} {24} {0}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {Box} {24} {1}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {RoundedBox} {24} {2}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {Circle} {24} {3}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {BlackCircle} {24} {4}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {Parenthesis} {24} {5}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {Period} {24} {6}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {RomanNumerals} {24} {7}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {Diamond} {24} {8}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {BlackSquare} {24} {9}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {BlackRoundSquare} {24} {10}
+\__fontspec_define_aat_feature:nnnn      {Annotation} {DoubleCircle} {24} {11}
+
+\providecommand\UnicodeFontFile[2]{"[#1]:#2"}
+\providecommand\UnicodeFontName[2]{"#1:#2"}
+\providecommand\UnicodeFontTeXLigatures{mapping=tex-text;}
+\providecommand\add@unicode@accent[2]{#2\char#1\relax}
+\providecommand\DeclareUnicodeAccent[3]{%
+  \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
+}
+\DeclareDocumentCommand \EncodingCommand {mO{}m}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingCommand }
+    \DeclareTextCommand{#1}{\UnicodeEncodingName}[#2]{#3}
+  }
+\DeclareDocumentCommand \EncodingAccent {mm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingAccent }
+    \DeclareTextCommand{#1}{\UnicodeEncodingName}{\add@unicode@accent{#2}}
+  }
+\DeclareDocumentCommand \EncodingSymbol {mm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingSymbol }
+    \DeclareTextSymbol{#1}{\UnicodeEncodingName}{#2}
+  }
+\DeclareDocumentCommand \EncodingComposite {mmm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingComposite }
+    \DeclareTextComposite{#1}{\UnicodeEncodingName}{#2}{#3}
+  }
+\DeclareDocumentCommand \EncodingCompositeCommand {mmm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \EncodingCompositeCommand }
+    \DeclareTextCompositeCommand{#1}{\UnicodeEncodingName}{#2}{#3}
+  }
+\DeclareDocumentCommand \DeclareUnicodeEncoding {mm}
+  {
+    \DeclareFontEncoding{#1}{}{}
+    \DeclareErrorFont{#1}{lmr}{m}{n}{10}
+    \DeclareFontSubstitution{#1}{lmr}{m}{n}
+    \DeclareFontFamily{#1}{lmr}{}
+
+    \DeclareFontShape{#1}{lmr}{m}{n}
+      {<->\UnicodeFontFile{lmroman10-regular}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{m}{it}
+      {<->\UnicodeFontFile{lmroman10-italic}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{m}{sc}
+      {<->\UnicodeFontFile{lmromancaps10-regular}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{bx}{n}
+      {<->\UnicodeFontFile{lmroman10-bold}{\UnicodeFontTeXLigatures}}{}
+    \DeclareFontShape{#1}{lmr}{bx}{it}
+      {<->\UnicodeFontFile{lmroman10-bolditalic}{\UnicodeFontTeXLigatures}}{}
+
+    \tl_set_eq:NN \l__fontspec_prev_unicode_name_tl \UnicodeEncodingName
+    \tl_set:Nn \UnicodeEncodingName {#1}
+    \bool_set_true:N \l__fontspec_defining_encoding_bool
+    #2
+    \bool_set_false:N \l__fontspec_defining_encoding_bool
+    \tl_set_eq:NN \UnicodeEncodingName \l__fontspec_prev_unicode_name_tl
+  }
+\DeclareDocumentCommand \UndeclareSymbol {m}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \UndeclareSymbol }
+    \UndeclareTextCommand {#1} {\UnicodeEncodingName}
+  }
+
+\DeclareDocumentCommand \UndeclareComposite {mm}
+  {
+    \bool_if:NF \l__fontspec_defining_encoding_bool
+      { \__fontspec_error:nn {only-inside-encdef} \UndeclareComposite }
+    \cs_undefine:c
+      { \c_backslash_str \UnicodeEncodingName \token_to_str:N #1 - \tl_to_str:n {#2} }
+  }
 \@ifpackageloaded{euler}
  {
   \bool_set_true:N \g__fontspec_pkg_euler_loaded_bool
@@ -2661,7 +3487,7 @@
 \tl_set:Nn \zf@enc { \g_fontspec_encoding_tl }
 \cs_set:Npn \zf@fontspec #1 #2
  {
-  \fontspec_select:nn {#1} {#2}
+  \__fontspec_select_font_family:nn {#1} {#2}
   \tl_set:Nn \zf@family { \l_fontspec_family_tl }
   \tl_set:Nn \zf@basefont { \l_fontspec_font }
  }
@@ -2722,27 +3548,45 @@
   \not@math@alphabet\upshape\relax
   \fontspec_merge_shape:n\updefault
  }
-\int_new:N \l__fontspec_em_int
-\int_new:N \l__fontspec_emdef_int
 \cs_new_protected:Npn \emfontdeclare #1
   {
-    \int_zero:N \l__fontspec_emdef_int
-    \clist_map_inline:nn {#1}
-      {
-        \int_incr:N \l__fontspec_emdef_int
-        \cs_set:cpn {__fontspec_em_font_ \int_use:N \l__fontspec_emdef_int _switch:} {##1}
-      }
+    \prop_clear:N \g__fontspec_em_prop
+    \int_zero:N   \l__fontspec_emdef_int
+    \group_begin:
+      \normalfont
+      \clist_map_inline:nn {\emreset,#1}
+        {
+          ##1
+          \prop_gput:NxV \g__fontspec_em_prop { \f@series/\f@shape } { \l__fontspec_emdef_int }
+          \prop_gput:Nxn \g__fontspec_em_prop { switch-\int_use:N \l__fontspec_emdef_int } { ##1 }
+          \int_incr:N \l__fontspec_emdef_int
+        }
+    \group_end:
   }
 \DeclareRobustCommand \em
   {
     \@nomath\em
+
+    \prop_get:NxNT \g__fontspec_em_prop { \f@series/\f@shape } \l__fontspec_em_tmp_tl
+      { \int_set:Nn \l__fontspec_em_int { \l__fontspec_em_tmp_tl } }
+
     \int_incr:N \l__fontspec_em_int
-    \use:c {__fontspec_em_font_ \int_use:N \l__fontspec_em_int _switch:}
+
+    \prop_get:NxNTF \g__fontspec_em_prop { switch-\int_use:N \l__fontspec_em_int } \l__fontspec_em_switch_tl
+      { \l__fontspec_em_switch_tl }
+      {
+        \int_zero:N \l__fontspec_em_int
+        \emreset
+      }
+
   }
 \DeclareTextFontCommand{\emph}{\em}
+\cs_set:Npn \emreset { \upshape }
 \cs_set:Npn \emshape { \itshape }
 \cs_set:Npn \eminnershape { \upshape }
 \emfontdeclare{ \emshape, \eminnershape }
+\cs_set:Npn \reset@font { \normalfont \int_zero:N \l__fontspec_em_int }
+\cs_new:Nn \fontspec_set_em_level:n { \int_set:Nn \l__fontspec_em_int {#1} }
 \DeclareRobustCommand{\-}
  {
   \discretionary
@@ -2757,7 +3601,7 @@
 \def\xlx@defaulthyphenchar{`\-}
 \cs_new:Nn \fontspec_visible_space:
  {
-  \font_glyph_if_exist:NnTF \font {"2423}
+  \__fontspec_primitive_font_glyph_if_exist:NnTF \font {"2423}
    { \char"2423\scan_stop: }
    { \fontspec_visible_space_fallback: }
  }
@@ -2844,15 +3688,15 @@
   { \addfontfeature{Numbers=Lining} #1 }
  }
 %% ------------------------------------------------
-%% Copyright 2004--2016 Will Robertson <wspr81@gmail.com>
+%% Copyright 2004--2017 Will Robertson <wspr81@gmail.com>
 %% Copyright 2009--2013   Khaled Hosny <khaledhosny@eglug.org>
 %% 
 %% Distributable under the LaTeX Project Public License, version 1.3c or higher.
 %% The latest version of this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is "maintained" by Will Robertson.
-%% It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec-example.tex.
-%% And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
+%% It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec*.tex.
+%% And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf.
 %% ------------------------------------------------
 %%
 %% End of file `fontspec-xetex.sty'.
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index 0d3b3c170ce..9ab8febf070 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
@@ -7,7 +7,7 @@
 --  fontspec-lua.dtx  (with options: `lua')
 --  ------------------------------------------------
 --  The FONTSPEC package for XeLaTeX/LuaLaTeX
---  (C)  2004--2016  Will Robertson and Khaled Hosny
+--  (C)  2004--2017  Will Robertson and Khaled Hosny
 --  License information appended.
 --  ------------------------------------------------
 fontspec          = fontspec or {}
@@ -26,8 +26,14 @@ local err, warn, info, log = luatexbase.provides_module(fontspec.module)
 fontspec.log     = log  or (function (s) luatexbase.module_info("fontspec", s)    end)
 fontspec.warning = warn or (function (s) luatexbase.module_warning("fontspec", s) end)
 fontspec.error   = err  or (function (s) luatexbase.module_error("fontspec", s)   end)
-local function tempswatrue()  tex.sprint([[\FontspecSetCheckBoolTrue ]]) end
-local function tempswafalse() tex.sprint([[\FontspecSetCheckBoolFalse]]) end
+local latex
+if luatexbase.registernumber then
+    latex = luatexbase.registernumber("catcodetable@latex")
+else
+    latex = luatexbase.catcodetables.CatcodeTableLaTeX
+end
+local function tempswatrue()  tex.sprint(latex,[[\FontspecSetCheckBoolTrue ]]) end
+local function tempswafalse() tex.sprint(latex,[[\FontspecSetCheckBoolFalse]]) end
 function fontspec.check_ot_script(fnt, script)
     if luaotfload.aux.provides_script(font.id(fnt), script) then
         tempswatrue()
@@ -65,15 +71,15 @@ function fontspec.mathfontdimen(fnt, str)
     end
 end
 --  ------------------------------------------------
---  Copyright 2004--2016 Will Robertson <wspr81@gmail.com>
+--  Copyright 2004--2017 Will Robertson <wspr81@gmail.com>
 --  Copyright 2009--2013   Khaled Hosny <khaledhosny@eglug.org>
 --  
 --  Distributable under the LaTeX Project Public License, version 1.3c or higher.
 --  The latest version of this license is at: http://www.latex-project.org/lppl.txt
 --  
 --  This work is "maintained" by Will Robertson.
---  It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec-example.tex.
---  And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
+--  It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec*.tex.
+--  And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf.
 --  ------------------------------------------------
 -- 
 --  End of file `fontspec.lua'.
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
index c50a7097202..18d22d63594 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -7,13 +7,13 @@
 %% fontspec.dtx  (with options: `fontspec,load')
 %% ------------------------------------------------
 %% The FONTSPEC package for XeLaTeX/LuaLaTeX
-%% (C)  2004--2016  Will Robertson and Khaled Hosny
+%% (C)  2004--2017  Will Robertson and Khaled Hosny
 %% License information appended.
 %% ------------------------------------------------
 \RequirePackage{expl3}
 \RequirePackage{xparse}
 \ProvidesExplPackage{fontspec}%
-  {2016/02/01}{2.5a}{Font selection for XeLaTeX and LuaLaTeX}
+  {2017/01/02}{2.5c}{Font selection for XeLaTeX and LuaLaTeX}
 \sys_if_engine_luatex:T
   { \RequirePackage{luaotfload}
     \directlua{require("fontspec")}
@@ -27,15 +27,15 @@
  }
 \msg_fatal:nn {fontspec} {cannot-use-pdftex}
 %% ------------------------------------------------
-%% Copyright 2004--2016 Will Robertson <wspr81@gmail.com>
+%% Copyright 2004--2017 Will Robertson <wspr81@gmail.com>
 %% Copyright 2009--2013   Khaled Hosny <khaledhosny@eglug.org>
 %% 
 %% Distributable under the LaTeX Project Public License, version 1.3c or higher.
 %% The latest version of this license is at: http://www.latex-project.org/lppl.txt
 %% 
 %% This work is "maintained" by Will Robertson.
-%% It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec-example.tex.
-%% And the derived files: fontspec*.sty,fontspec.lua, and fontspec.pdf.
+%% It consists of the files: fontspec*.dtx, fontspec.cfg, fontspec*.tex.
+%% And the derived files: fontspec*.sty,fontspec.lua, fontspec.pdf.
 %% ------------------------------------------------
 %%
 %% End of file `fontspec.sty'.
diff --git a/Master/texmf-dist/tex/latex/fontspec/tuenc.def b/Master/texmf-dist/tex/latex/fontspec/tuenc.def
index ab0fb8d987e..9800bd7e73e 100644
--- a/Master/texmf-dist/tex/latex/fontspec/tuenc.def
+++ b/Master/texmf-dist/tex/latex/fontspec/tuenc.def
@@ -1,90 +1,394 @@
+%%
+%% This is file `tuenc.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ltoutenc.dtx  (with options: `TU')
+%% 
+%% This is a generated file.
+%% 
+%% The source is maintained by the LaTeX Project team and bug
+%% reports for it can be opened at http://latex-project.org/bugs.html
+%% (but please observe conditions on bug reports sent to that address!)
+%% 
+%% 
+%% Copyright 1993-2016
+%% The LaTeX3 Project and any individual authors listed elsewhere
+%% in this file.
+%% 
+%% This file was generated from file(s) of the LaTeX base system.
+%% --------------------------------------------------------------
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%% 
+%% This file has the LPPL maintenance status "maintained".
+%% 
+%% This file may only be distributed together with a copy of the LaTeX
+%% base system. You may however distribute the LaTeX base system without
+%% such generated files.
+%% 
+%% The list of all files belonging to the LaTeX base distribution is
+%% given in the file `manifest.txt'. See also `legal.txt' for additional
+%% information.
+%% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
+%%% From File: ltoutenc.dtx
 \ProvidesFile{tuenc.def}
-    [2016/01/29 v0.1 Unicode font encoding for LaTeX2e]
-
-%%%%%%
-% Please consider this encoding definition to be experimental!
-%%%%%%
-
+ [2016/12/11 v2.0a
+         Standard LaTeX file]
 \providecommand\UnicodeEncodingName{TU}
-
-
-%% WRAPPERS NEEDED FOR FONT LOADING (.fd FILE COMMANDS)
-
 \begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax\else
-  \def\UnicodeFontTeXLigatures{mapping=tex-text;}
-\fi
-
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname directlua\endcsname\relax\else
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname directlua\endcsname\relax
+    \PackageWarningNoLine{fontenc}
+      {\UnicodeEncodingName\space
+       encoding is only available with XeTeX and LuaTeX.\MessageBreak
+       Defaulting to T1 encoding}
+      \def\encodingdefault{T1}
+    \expandafter\expandafter\expandafter\endinput
+  \else
+    \def\UnicodeFontTeXLigatures{mapping=tex-text;}
+  \fi
+\else
   \def\UnicodeFontTeXLigatures{+tlig;} % "+trep;" no longer needed
 \fi
-
 \def\UnicodeFontFile#1#2{"[#1]:#2"}
 \def\UnicodeFontName#1#2{"#1:#2"}
-
-% Alternative luaotfload definitions for LuaLaTeX:
-%    \def\UnicodeFontFile#1#2{"file:#1:#2"}
-%    \def\UnicodeFontName#1#2{"name:#1:#2"}
-
-
-%% COMMANDS NEEDED TO DEFINE UNICODE COMMANDS AND ACCENTS
-
-% Accents in Unicode are postpended: 
+\DeclareFontEncoding\UnicodeEncodingName{}{}
 \def\add@unicode@accent#1#2{#2\char#1\relax}
-
-\def\DeclareUnicodeCommand#1#2{%
-  \DeclareTextCommand{#1}{\LastDeclaredEncoding}{#2}%
-}
-
-\def\DeclareUnicodeAccent#1#2{%
-  \DeclareTextCommand{#1}{\LastDeclaredEncoding}{\add@unicode@accent{#2}}%
-}
-
-\def\DeclareUnicodeSymbol#1#2{%
-  \DeclareTextSymbol{#1}{\LastDeclaredEncoding}{#2}%
-}
-
-\def\DeclareUnicodeComposite#1#2#3{%
-  \DeclareTextComposite{#1}{\LastDeclaredEncoding}{#2}{#3}%
-}
-
-\def\DeclareUnicodeCompositeCommand#1#2#3{%
-  \DeclareTextCompositeCommand{#1}{\LastDeclaredEncoding}{#2}{#3}%
-}
-
-
-%% COMMANDS FOR DEFINING NEW ENCODINGS FROM FONT RANGES
-
-\def\NewUnicodeEncoding#1{%
-  \DeclareFontEncoding{#1}{}{}
-  \DeclareErrorFont{\LastDeclaredEncoding}{lmr}{m}{n}{10}
-  \DeclareFontSubstitution{\LastDeclaredEncoding}{lmr}{m}{n}
-  \DeclareFontFamily{\LastDeclaredEncoding}{lmr}{}
-  \DeclareFontShape{\LastDeclaredEncoding}{lmr}{m}{n}
-       {<->\UnicodeFontFile{lmroman10-regular}{\UnicodeFontTeXLigatures}}{}
-  \DeclareFontShape{\LastDeclaredEncoding}{lmr}{m}{it}
-       {<->\UnicodeFontFile{lmroman10-italic}{\UnicodeFontTeXLigatures}}{}
-  \DeclareFontShape{\LastDeclaredEncoding}{lmr}{m}{sc}
-       {<->\UnicodeFontFile{lmromancaps10-regular}{\UnicodeFontTeXLigatures}}{}
-  \DeclareFontShape{\LastDeclaredEncoding}{lmr}{bx}{n}
-       {<->\UnicodeFontFile{lmroman10-bold}{\UnicodeFontTeXLigatures}}{}
-  \DeclareFontShape{\LastDeclaredEncoding}{lmr}{bx}{it}
-       {<->\UnicodeFontFile{lmroman10-bolditalic}{\UnicodeFontTeXLigatures}}{}
-}
-
-\def\DeclareUnicodeEncoding#1#2#3{%
-  \NewUnicodeEncoding{#1}%
-  \@for\@ii:=#2\do{%
-    \InputIfFileExists{tufontrange-\@ii.def}{}{%
-      \@latex@error{Unicode font range file `tufontrange-\@ii.def' not found}{\@ehd}%
-    }%
-  }%
-  #3%
+\def\DeclareUnicodeAccent#1#2#3{%
+  \DeclareTextCommand{#1}{#2}{\add@unicode@accent{#3}}%
 }
-
-%% THE ENCODING ITSELF
-
-\DeclareUnicodeEncoding{\UnicodeEncodingName}{T1,TS1}{}
-
+\DeclareTextSymbol{\textexclamdown}      \UnicodeEncodingName{"00A1}
+\DeclareTextSymbol{\textcent}            \UnicodeEncodingName{"00A2}
+\DeclareTextSymbol{\textsterling}        \UnicodeEncodingName{"00A3}
+\DeclareTextSymbol{\textcurrency}        \UnicodeEncodingName{"00A4}
+\DeclareTextSymbol{\textyen}             \UnicodeEncodingName{"00A5}
+\DeclareTextSymbol{\textbrokenbar}       \UnicodeEncodingName{"00A6}
+\DeclareTextSymbol{\textsection}         \UnicodeEncodingName{"00A7}
+\DeclareTextSymbol{\textasciidieresis}   \UnicodeEncodingName{"00A8}
+\DeclareTextSymbol{\textcopyright}       \UnicodeEncodingName{"00A9}
+\DeclareTextSymbol{\textordfeminine}     \UnicodeEncodingName{"00AA}
+\DeclareTextSymbol{\guillemotleft}       \UnicodeEncodingName{"00AB}
+\DeclareTextSymbol{\textlnot}            \UnicodeEncodingName{"00AC}
+\DeclareTextSymbol{\textregistered}      \UnicodeEncodingName{"00AE}
+\DeclareTextSymbol{\textasciimacron}     \UnicodeEncodingName{"00AF}
+\DeclareTextSymbol{\textdegree}          \UnicodeEncodingName{"00B0}
+\DeclareTextSymbol{\textpm}              \UnicodeEncodingName{"00B1}
+\DeclareTextSymbol{\texttwosuperior}     \UnicodeEncodingName{"00B2}
+\DeclareTextSymbol{\textthreesuperior}   \UnicodeEncodingName{"00B3}
+\DeclareTextSymbol{\textasciiacute}      \UnicodeEncodingName{"00B4}
+\DeclareTextSymbol{\textmu}              \UnicodeEncodingName{"00B5}
+\DeclareTextSymbol{\textparagraph}       \UnicodeEncodingName{"00B6}
+\DeclareTextSymbol{\textperiodcentered}  \UnicodeEncodingName{"00B7}
+\DeclareTextSymbol{\textonesuperior}     \UnicodeEncodingName{"00B9}
+\DeclareTextSymbol{\textordmasculine}    \UnicodeEncodingName{"00BA}
+\DeclareTextSymbol{\guillemotright}      \UnicodeEncodingName{"00BB}
+\DeclareTextSymbol{\textonequarter}      \UnicodeEncodingName{"00BC}
+\DeclareTextSymbol{\textonehalf}         \UnicodeEncodingName{"00BD}
+\DeclareTextSymbol{\textthreequarters}   \UnicodeEncodingName{"00BE}
+\DeclareTextSymbol{\textquestiondown}    \UnicodeEncodingName{"00BF}
+\DeclareTextSymbol{\AE}                  \UnicodeEncodingName{"00C6}
+\DeclareTextSymbol{\DH}                  \UnicodeEncodingName{"00D0}
+\DeclareTextSymbol{\texttimes}           \UnicodeEncodingName{"00D7}
+\DeclareTextSymbol{\O}                   \UnicodeEncodingName{"00D8}
+\DeclareTextSymbol{\TH}                  \UnicodeEncodingName{"00DE}
+\DeclareTextSymbol{\ss}                  \UnicodeEncodingName{"00DF}
+\DeclareTextSymbol{\ae}                  \UnicodeEncodingName{"00E6}
+\DeclareTextSymbol{\dh}                  \UnicodeEncodingName{"00F0}
+\DeclareTextSymbol{\textdiv}             \UnicodeEncodingName{"00F7}
+\DeclareTextSymbol{\o}                   \UnicodeEncodingName{"00F8}
+\DeclareTextSymbol{\th}                  \UnicodeEncodingName{"00FE}
+\DeclareTextSymbol{\DJ}                  \UnicodeEncodingName{"0110}
+\DeclareTextSymbol{\dj}                  \UnicodeEncodingName{"0111}
+\DeclareTextSymbol{\i}                   \UnicodeEncodingName{"0131}
+\DeclareTextSymbol{\IJ}                  \UnicodeEncodingName{"0132}
+\DeclareTextSymbol{\ij}                  \UnicodeEncodingName{"0133}
+\DeclareTextSymbol{\L}                   \UnicodeEncodingName{"0141}
+\DeclareTextSymbol{\l}                   \UnicodeEncodingName{"0142}
+\DeclareTextSymbol{\NG}                  \UnicodeEncodingName{"014A}
+\DeclareTextSymbol{\ng}                  \UnicodeEncodingName{"014B}
+\DeclareTextSymbol{\OE}                  \UnicodeEncodingName{"0152}
+\DeclareTextSymbol{\oe}                  \UnicodeEncodingName{"0153}
+\DeclareTextSymbol{\textflorin}          \UnicodeEncodingName{"0192}
+\DeclareTextSymbol{\j}                   \UnicodeEncodingName{"0237}
+\DeclareTextSymbol{\textasciicircum}     \UnicodeEncodingName{"02C6}
+\DeclareTextSymbol{\textasciicaron}      \UnicodeEncodingName{"02C7}
+\DeclareTextSymbol{\textasciitilde}      \UnicodeEncodingName{"02DC}
+\DeclareTextSymbol{\textasciibreve}      \UnicodeEncodingName{"02D8}
+\DeclareTextSymbol{\textacutedbl}        \UnicodeEncodingName{"02DD}
+\DeclareTextSymbol{\textgravedbl}        \UnicodeEncodingName{"02F5}
+\DeclareTextSymbol{\texttildelow}        \UnicodeEncodingName{"02F7}
+\DeclareTextSymbol{\textbaht}            \UnicodeEncodingName{"0E3F}
+\DeclareTextSymbol{\SS}                  \UnicodeEncodingName{"1E9E}
+\DeclareTextSymbol{\textcompwordmark}    \UnicodeEncodingName{"200C}
+\DeclareTextSymbol{\textendash}          \UnicodeEncodingName{"2013}
+\DeclareTextSymbol{\textemdash}          \UnicodeEncodingName{"2014}
+\DeclareTextSymbol{\textbardbl}          \UnicodeEncodingName{"2016}
+\DeclareTextSymbol{\textquoteleft}       \UnicodeEncodingName{"2018}
+\DeclareTextSymbol{\textquoteright}      \UnicodeEncodingName{"2019}
+\DeclareTextSymbol{\quotesinglbase}      \UnicodeEncodingName{"201A}
+\DeclareTextSymbol{\textquotedblleft}    \UnicodeEncodingName{"201C}
+\DeclareTextSymbol{\textquotedblright}   \UnicodeEncodingName{"201D}
+\DeclareTextSymbol{\quotedblbase}        \UnicodeEncodingName{"201E}
+\DeclareTextSymbol{\textdagger}          \UnicodeEncodingName{"2020}
+\DeclareTextSymbol{\textdaggerdbl}       \UnicodeEncodingName{"2021}
+\DeclareTextSymbol{\textbullet}          \UnicodeEncodingName{"2022}
+\DeclareTextSymbol{\textellipsis}        \UnicodeEncodingName{"2026}
+\DeclareTextSymbol{\textperthousand}     \UnicodeEncodingName{"2030}
+\DeclareTextSymbol{\textpertenthousand}  \UnicodeEncodingName{"2031}
+\DeclareTextSymbol{\guilsinglleft}       \UnicodeEncodingName{"2039}
+\DeclareTextSymbol{\guilsinglright}      \UnicodeEncodingName{"203A}
+\DeclareTextSymbol{\textreferencemark}   \UnicodeEncodingName{"203B}
+\DeclareTextSymbol{\textinterrobang}     \UnicodeEncodingName{"203D}
+\DeclareTextSymbol{\textfractionsolidus} \UnicodeEncodingName{"2044}
+\DeclareTextSymbol{\textlquill}          \UnicodeEncodingName{"2045}
+\DeclareTextSymbol{\textrquill}          \UnicodeEncodingName{"2046}
+\DeclareTextSymbol{\textasteriskcentered}\UnicodeEncodingName{"204E}
+\DeclareTextSymbol{\textdiscount}        \UnicodeEncodingName{"2052}
+\DeclareTextSymbol{\textcolonmonetary}   \UnicodeEncodingName{"20A1}
+\DeclareTextSymbol{\textlira}            \UnicodeEncodingName{"20A4}
+\DeclareTextSymbol{\textnaira}           \UnicodeEncodingName{"20A6}
+\DeclareTextSymbol{\textwon}             \UnicodeEncodingName{"20A9}
+\DeclareTextSymbol{\textdong}            \UnicodeEncodingName{"20AB}
+\DeclareTextSymbol{\texteuro}            \UnicodeEncodingName{"20AC}
+\DeclareTextSymbol{\textpeso}            \UnicodeEncodingName{"20B1}
+\DeclareTextSymbol{\textcelsius}         \UnicodeEncodingName{"2103}
+\DeclareTextSymbol{\textnumero}          \UnicodeEncodingName{"2116}
+\DeclareTextSymbol{\textcircledP}        \UnicodeEncodingName{"2117}
+\DeclareTextSymbol{\textrecipe}          \UnicodeEncodingName{"211E}
+\DeclareTextSymbol{\textservicemark}     \UnicodeEncodingName{"2120}
+\DeclareTextSymbol{\texttrademark}       \UnicodeEncodingName{"2122}
+\DeclareTextSymbol{\textohm}             \UnicodeEncodingName{"2126}
+\DeclareTextSymbol{\textmho}             \UnicodeEncodingName{"2127}
+\DeclareTextSymbol{\textestimated}       \UnicodeEncodingName{"212E}
+\DeclareTextSymbol{\textleftarrow}       \UnicodeEncodingName{"2190}
+\DeclareTextSymbol{\textuparrow}         \UnicodeEncodingName{"2191}
+\DeclareTextSymbol{\textrightarrow}      \UnicodeEncodingName{"2192}
+\DeclareTextSymbol{\textdownarrow}       \UnicodeEncodingName{"2193}
+\DeclareTextSymbol{\textminus}           \UnicodeEncodingName{"2212}
+\DeclareTextSymbol{\textsurd}            \UnicodeEncodingName{"221A}
+\DeclareTextSymbol{\textlangle}          \UnicodeEncodingName{"2329}
+\DeclareTextSymbol{\textrangle}          \UnicodeEncodingName{"232A}
+\DeclareTextSymbol{\textblank}           \UnicodeEncodingName{"2422}
+\DeclareTextSymbol{\textvisiblespace}    \UnicodeEncodingName{"2423}
+\DeclareTextSymbol{\textopenbullet}      \UnicodeEncodingName{"25E6}
+\DeclareTextSymbol{\textbigcircle}       \UnicodeEncodingName{"25EF}
+\DeclareTextSymbol{\textmusicalnote}     \UnicodeEncodingName{"266A}
+\DeclareTextSymbol{\textmarried}         \UnicodeEncodingName{"26AD}
+\DeclareTextSymbol{\textdivorced}        \UnicodeEncodingName{"26AE}
+\DeclareTextSymbol{\textinterrobangdown} \UnicodeEncodingName{"2E18}
+\DeclareUnicodeAccent{\`}                \UnicodeEncodingName{"0300}
+\DeclareUnicodeAccent{\'}                \UnicodeEncodingName{"0301}
+\DeclareUnicodeAccent{\^}                \UnicodeEncodingName{"0302}
+\DeclareUnicodeAccent{\~}                \UnicodeEncodingName{"0303}
+\DeclareUnicodeAccent{\"}                \UnicodeEncodingName{"0308}
+\DeclareUnicodeAccent{\H}                \UnicodeEncodingName{"030B}
+\DeclareUnicodeAccent{\r}                \UnicodeEncodingName{"030A}
+\DeclareUnicodeAccent{\v}                \UnicodeEncodingName{"030C}
+\DeclareUnicodeAccent{\u}                \UnicodeEncodingName{"0306}
+\DeclareUnicodeAccent{\=}                \UnicodeEncodingName{"0304}
+\DeclareUnicodeAccent{\.}                \UnicodeEncodingName{"0307}
+\DeclareUnicodeAccent{\b}                \UnicodeEncodingName{"0332}
+\DeclareUnicodeAccent{\c}                \UnicodeEncodingName{"0327}
+\DeclareUnicodeAccent{\d}                \UnicodeEncodingName{"0323}
+\DeclareUnicodeAccent{\k}                \UnicodeEncodingName{"0328}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{A}{"00C0}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{A}{"00C1}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{A}{"00C2}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{A}{"00C3}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{A}{"00C4}
+\DeclareTextComposite{\r}             \UnicodeEncodingName{A}{"00C5}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{C}{"00C7}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{E}{"00C8}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{E}{"00C9}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{E}{"00CA}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{E}{"00CB}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{I}{"00CC}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{I}{"00CD}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{I}{"00CE}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{I}{"00CF}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{N}{"00D1}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{O}{"00D2}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{O}{"00D3}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{O}{"00D4}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{O}{"00D5}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{O}{"00D6}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{U}{"00D9}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{U}{"00DA}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{U}{"00DB}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{U}{"00DC}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{Y}{"00DD}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{a}{"00E0}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{a}{"00E1}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{a}{"00E2}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{a}{"00E3}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{a}{"00E4}
+\DeclareTextComposite{\r}             \UnicodeEncodingName{a}{"00E5}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{c}{"00E7}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{e}{"00E8}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{e}{"00E9}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{e}{"00EA}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{e}{"00EB}
+\DeclareTextComposite{\`}             \UnicodeEncodingName\i {"00EC}
+\DeclareTextComposite{\'}             \UnicodeEncodingName\i {"00ED}
+\DeclareTextComposite{\^}             \UnicodeEncodingName\i {"00EE}
+\DeclareTextComposite{\"}             \UnicodeEncodingName\i {"00EF}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{n}{"00F1}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{o}{"00F2}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{o}{"00F3}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{o}{"00F4}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{o}{"00F5}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{o}{"00F6}
+\DeclareTextComposite{\`}             \UnicodeEncodingName{u}{"00F9}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{u}{"00FA}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{u}{"00FB}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{u}{"00FC}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{y}{"00FD}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{y}{"00FF}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{A}{"0100}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{a}{"0101}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{A}{"0102}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{a}{"0103}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{A}{"0104}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{a}{"0105}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{C}{"0106}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{c}{"0107}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{C}{"0108}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{c}{"0109}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{C}{"010A}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{c}{"010B}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{C}{"010C}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{c}{"010D}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{D}{"010E}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{d}{"010F}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{E}{"0112}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{e}{"0113}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{E}{"0114}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{e}{"0115}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{E}{"0116}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{e}{"0117}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{E}{"0118}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{e}{"0119}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{E}{"011A}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{e}{"011B}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{G}{"011C}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{g}{"011D}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{G}{"011E}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{g}{"011F}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{G}{"0120}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{g}{"0121}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{G}{"0122}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{g}{"0123}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{H}{"0124}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{h}{"0125}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{I}{"0128}
+\DeclareTextComposite{\~}             \UnicodeEncodingName\i {"0129}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{I}{"012A}
+\DeclareTextComposite{\=}             \UnicodeEncodingName\i {"012B}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{I}{"012C}
+\DeclareTextComposite{\u}             \UnicodeEncodingName\i {"012D}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{I}{"012E}
+\DeclareTextComposite{\k}             \UnicodeEncodingName\i {"012F}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{I}{"0130}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{J}{"0134}
+\DeclareTextComposite{\^}             \UnicodeEncodingName\j {"0135}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{K}{"0136}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{k}{"0137}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{L}{"0139}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{l}{"013A}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{L}{"013B}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{l}{"013C}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{L}{"013D}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{l}{"013E}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{N}{"0143}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{n}{"0144}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{N}{"0145}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{n}{"0146}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{N}{"0147}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{n}{"0148}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{O}{"014C}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{o}{"014D}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{O}{"014E}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{o}{"014F}
+\DeclareTextComposite{\H}             \UnicodeEncodingName{O}{"0150}
+\DeclareTextComposite{\H}             \UnicodeEncodingName{o}{"0151}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{R}{"0154}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{r}{"0155}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{R}{"0156}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{r}{"0157}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{R}{"0158}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{r}{"0159}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{S}{"015A}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{s}{"015B}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{S}{"015C}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{s}{"015D}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{S}{"015E}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{s}{"015F}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{S}{"0160}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{s}{"0161}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{T}{"0162}
+\DeclareTextComposite{\c}             \UnicodeEncodingName{t}{"0163}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{T}{"0164}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{t}{"0165}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{U}{"0168}
+\DeclareTextComposite{\~}             \UnicodeEncodingName{u}{"0169}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{U}{"016A}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{u}{"016B}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{U}{"016C}
+\DeclareTextComposite{\u}             \UnicodeEncodingName{u}{"016D}
+\DeclareTextComposite{\r}             \UnicodeEncodingName{U}{"016E}
+\DeclareTextComposite{\r}             \UnicodeEncodingName{u}{"016F}
+\DeclareTextComposite{\H}             \UnicodeEncodingName{U}{"0170}
+\DeclareTextComposite{\H}             \UnicodeEncodingName{u}{"0171}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{U}{"0172}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{u}{"0173}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{W}{"0174}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{w}{"0175}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{Y}{"0176}
+\DeclareTextComposite{\^}             \UnicodeEncodingName{y}{"0177}
+\DeclareTextComposite{\"}             \UnicodeEncodingName{Y}{"0178}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{Z}{"0179}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{z}{"017A}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{Z}{"017B}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{z}{"017C}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{Z}{"017D}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{z}{"017E}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{A}{"01CD}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{a}{"01CE}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{I}{"01CF}
+\DeclareTextComposite{\v}             \UnicodeEncodingName\i {"01D0}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{O}{"01D1}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{o}{"01D2}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{U}{"01D3}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{u}{"01D4}
+\DeclareTextComposite{\=}             \UnicodeEncodingName\AE{"01E2}
+\DeclareTextComposite{\=}             \UnicodeEncodingName\ae{"01E3}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{G}{"01E6}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{g}{"01E7}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{K}{"01E8}
+\DeclareTextComposite{\v}             \UnicodeEncodingName{k}{"01E9}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{O}{"01EA}
+\DeclareTextComposite{\k}             \UnicodeEncodingName{o}{"01EB}
+\DeclareTextComposite{\v}             \UnicodeEncodingName\j {"01F0}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{G}{"01F4}
+\DeclareTextComposite{\'}             \UnicodeEncodingName{g}{"01F5}
+\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{S}{"0218}
+\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{s}{"0219}
+\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{T}{"021A}
+\DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{t}{"021B}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{B}{"1E02}
+\DeclareTextComposite{\.}             \UnicodeEncodingName{b}{"1E03}
 \endinput
+%%
+%% End of file `tuenc.def'.
diff --git a/Master/texmf-dist/tex/latex/fontspec/tufontrange-T1.def b/Master/texmf-dist/tex/latex/fontspec/tufontrange-T1.def
deleted file mode 100644
index 27d9b14eb7f..00000000000
--- a/Master/texmf-dist/tex/latex/fontspec/tufontrange-T1.def
+++ /dev/null
@@ -1,198 +0,0 @@
-\ProvidesFile{ucfontrange-T1.def}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% T1 SYMBOLS
-
-\DeclareUnicodeAccent{\`}{"0300}
-\DeclareUnicodeAccent{\'}{"0301}
-\DeclareUnicodeAccent{\^}{"0302}
-\DeclareUnicodeAccent{\~}{"0303}
-\DeclareUnicodeAccent{\"}{"0308}
-\DeclareUnicodeAccent{\H}{"030B}
-\DeclareUnicodeAccent{\r}{"030A}
-\DeclareUnicodeAccent{\v}{"030C}
-\DeclareUnicodeAccent{\u}{"0306}
-\DeclareUnicodeAccent{\=}{"0304}
-\DeclareUnicodeAccent{\.}{"0307}
-\DeclareUnicodeAccent{\b}{"0332}
-\DeclareUnicodeAccent{\c}{"0327}
-\DeclareUnicodeAccent{\d}{"0323}
-\DeclareUnicodeAccent{\k}{"0328}
-%% \textogonekcentered %% not in unicode?
-\DeclareUnicodeSymbol{\textperthousand}{"2030}
-\DeclareUnicodeSymbol{\textpertenthousand}{"2031}
-\DeclareUnicodeSymbol{\AE}{"00C6}
-\DeclareUnicodeSymbol{\DH}{"00D0}
-\DeclareUnicodeSymbol{\DJ}{"0110}
-\DeclareUnicodeSymbol{\L} {"0141}
-\DeclareUnicodeSymbol{\NG}{"014A}
-\DeclareUnicodeSymbol{\OE}{"0152}
-\DeclareUnicodeSymbol{\O} {"00D8}
-\DeclareUnicodeSymbol{\SS}{"1E9E}
-\DeclareUnicodeSymbol{\TH}{"00DE}
-\DeclareUnicodeSymbol{\ae}{"00E6}
-\DeclareUnicodeSymbol{\dh}{"00F0}
-\DeclareUnicodeSymbol{\dj}{"0111}
-\DeclareUnicodeSymbol{\guillemotleft}{"00AB}
-\DeclareUnicodeSymbol{\guillemotright}{"00BB}
-\DeclareUnicodeSymbol{\guilsinglleft}{"2039}
-\DeclareUnicodeSymbol{\guilsinglright}{"203A}
-\DeclareUnicodeSymbol{\i} {"0131}
-\DeclareUnicodeSymbol{\j} {"0237}
-\DeclareUnicodeSymbol{\ij}{"0133}
-\DeclareUnicodeSymbol{\IJ}{"0132}
-\DeclareUnicodeSymbol{\l} {"0142}
-\DeclareUnicodeSymbol{\ng}{"014B}
-\DeclareUnicodeSymbol{\oe}{"0153}
-\DeclareUnicodeSymbol{\o} {"00F8}
-\DeclareUnicodeSymbol{\quotedblbase}{"201E}
-\DeclareUnicodeSymbol{\quotesinglbase}{"201A}
-\DeclareUnicodeSymbol{\ss}{"00DF}
-\DeclareUnicodeSymbol{\textasciicircum}{`\^}
-\DeclareUnicodeSymbol{\textasciitilde}{`\~}
-\DeclareUnicodeSymbol{\textbackslash}{`\\}
-\DeclareUnicodeSymbol{\textbar}{`\|}
-\DeclareUnicodeSymbol{\textbraceleft}{`\{}
-\DeclareUnicodeSymbol{\textbraceright}{`\}}
-\DeclareUnicodeSymbol{\textcompwordmark}{"200C}
-\DeclareUnicodeSymbol{\textdollar}{`\$}
-\DeclareUnicodeSymbol{\textemdash}{"2014}
-\DeclareUnicodeSymbol{\textendash}{"2013}
-\DeclareUnicodeSymbol{\textexclamdown}{"00A1}
-\DeclareUnicodeSymbol{\textgreater}{`\>}
-\DeclareUnicodeSymbol{\textless}{`\<}
-\DeclareUnicodeSymbol{\textquestiondown}{"00BF}
-\DeclareUnicodeSymbol{\textquotedblleft}{"201C}
-\DeclareUnicodeSymbol{\textquotedblright}{"201D}
-\DeclareUnicodeSymbol{\textquotedbl}{`\"}
-\DeclareUnicodeSymbol{\textquoteleft}{"2018}
-\DeclareUnicodeSymbol{\textquoteright}{"2019}
-\DeclareUnicodeSymbol{\textsection}{"00A7}
-\DeclareUnicodeSymbol{\textsterling}{"00A3}
-\DeclareUnicodeSymbol{\textunderscore}{`\_}
-\DeclareUnicodeSymbol{\textvisiblespace}{"2423}
-\DeclareUnicodeSymbol{\th}{"00FE}
-\DeclareUnicodeComposite{\.}{i}{`\i}
-\DeclareUnicodeComposite{\.}{\i}{`\i}
-\DeclareUnicodeComposite{\u}{A}{"0102}
-\DeclareUnicodeComposite{\k}{A}{"0104}
-\DeclareUnicodeComposite{\'}{C}{"0106}
-\DeclareUnicodeComposite{\v}{C}{"010C}
-\DeclareUnicodeComposite{\v}{D}{"010E}
-\DeclareUnicodeComposite{\v}{E}{"011A}
-\DeclareUnicodeComposite{\k}{E}{"0118}
-\DeclareUnicodeComposite{\u}{G}{"011E}
-\DeclareUnicodeComposite{\'}{L}{"0139}
-\DeclareUnicodeComposite{\v}{L}{"013D}
-\DeclareUnicodeComposite{\'}{N}{"0143}
-\DeclareUnicodeComposite{\v}{N}{"0147}
-\DeclareUnicodeComposite{\H}{O}{"0150}
-\DeclareUnicodeComposite{\'}{R}{"0154}
-\DeclareUnicodeComposite{\v}{R}{"0158}
-\DeclareUnicodeComposite{\'}{S}{"015A}
-\DeclareUnicodeComposite{\v}{S}{"0160}
-\DeclareUnicodeComposite{\c}{S}{"015F}
-\DeclareUnicodeComposite{\v}{T}{"0164}
-\DeclareUnicodeComposite{\c}{T}{"0162}
-\DeclareUnicodeComposite{\H}{U}{"0170}
-\DeclareUnicodeComposite{\r}{U}{"016E}
-\DeclareUnicodeComposite{\"}{Y}{"0178}
-\DeclareUnicodeComposite{\'}{Z}{"017A}
-\DeclareUnicodeComposite{\v}{Z}{"017D}
-\DeclareUnicodeComposite{\.}{Z}{"017B}
-\DeclareUnicodeComposite{\.}{I}{"0130}
-\DeclareUnicodeComposite{\u}{a}{"0103}
-\DeclareUnicodeComposite{\k}{a}{"0105}
-\DeclareUnicodeComposite{\'}{c}{"0107}
-\DeclareUnicodeComposite{\v}{c}{"010D}
-\DeclareUnicodeComposite{\v}{d}{"010F}
-\DeclareUnicodeComposite{\v}{e}{"011B}
-\DeclareUnicodeComposite{\k}{e}{"0119}
-\DeclareUnicodeComposite{\u}{g}{"011F}
-\DeclareUnicodeComposite{\'}{l}{"0139}
-\DeclareUnicodeComposite{\v}{l}{"013E}
-\DeclareUnicodeComposite{\'}{n}{"0144}
-\DeclareUnicodeComposite{\v}{n}{"0148}
-\DeclareUnicodeComposite{\H}{o}{"0151}
-\DeclareUnicodeComposite{\'}{r}{"0155}
-\DeclareUnicodeComposite{\v}{r}{"0159}
-\DeclareUnicodeComposite{\'}{s}{"015B}
-\DeclareUnicodeComposite{\v}{s}{"0161}
-\DeclareUnicodeComposite{\c}{s}{"015F}
-\DeclareUnicodeComposite{\v}{t}{"0165}
-\DeclareUnicodeComposite{\c}{t}{"0163}
-\DeclareUnicodeComposite{\H}{u}{"0171}
-\DeclareUnicodeComposite{\r}{u}{"016F}
-\DeclareUnicodeComposite{\"}{y}{"00FF}
-\DeclareUnicodeComposite{\'}{z}{"00FD}
-\DeclareUnicodeComposite{\v}{z}{"017E}
-\DeclareUnicodeComposite{\.}{z}{"017C}
-\DeclareUnicodeComposite{\`}{A}{"00C0}
-\DeclareUnicodeComposite{\'}{A}{"00C1}
-\DeclareUnicodeComposite{\^}{A}{"00C2}
-\DeclareUnicodeComposite{\~}{A}{"00C3}
-\DeclareUnicodeComposite{\"}{A}{"00C4}
-\DeclareUnicodeComposite{\r}{A}{"00C5}
-\DeclareUnicodeComposite{\c}{C}{"00C7}
-\DeclareUnicodeComposite{\`}{E}{"00C8}
-\DeclareUnicodeComposite{\'}{E}{"00C9}
-\DeclareUnicodeComposite{\^}{E}{"00CA}
-\DeclareUnicodeComposite{\"}{E}{"00CB}
-\DeclareUnicodeComposite{\`}{I}{"00CC}
-\DeclareUnicodeComposite{\'}{I}{"00CD}
-\DeclareUnicodeComposite{\^}{I}{"00CE}
-\DeclareUnicodeComposite{\"}{I}{"00CF}
-\DeclareUnicodeComposite{\~}{N}{"00D1}
-\DeclareUnicodeComposite{\`}{O}{"00D2}
-\DeclareUnicodeComposite{\'}{O}{"00D3}
-\DeclareUnicodeComposite{\^}{O}{"00D4}
-\DeclareUnicodeComposite{\~}{O}{"00D5}
-\DeclareUnicodeComposite{\"}{O}{"00D6}
-\DeclareUnicodeComposite{\`}{U}{"00D9}
-\DeclareUnicodeComposite{\'}{U}{"00DA}
-\DeclareUnicodeComposite{\^}{U}{"00DB}
-\DeclareUnicodeComposite{\"}{U}{"00DC}
-\DeclareUnicodeComposite{\'}{Y}{"00DD}
-\DeclareUnicodeComposite{\`}{a}{"00E0}
-\DeclareUnicodeComposite{\'}{a}{"00E1}
-\DeclareUnicodeComposite{\^}{a}{"00E2}
-\DeclareUnicodeComposite{\~}{a}{"00E3}
-\DeclareUnicodeComposite{\"}{a}{"00E4}
-\DeclareUnicodeComposite{\r}{a}{"00E5}
-\DeclareUnicodeComposite{\c}{c}{"00E7}
-\DeclareUnicodeComposite{\`}{e}{"00E8}
-\DeclareUnicodeComposite{\'}{e}{"00E9}
-\DeclareUnicodeComposite{\^}{e}{"00EA}
-\DeclareUnicodeComposite{\"}{e}{"00EB}
-\DeclareUnicodeComposite{\`}{i} {"00EC}
-\DeclareUnicodeComposite{\`}{\i}{"00EC}
-\DeclareUnicodeComposite{\'}{i} {"00ED}
-\DeclareUnicodeComposite{\'}{\i}{"00ED}
-\DeclareUnicodeComposite{\^}{i} {"00EE}
-\DeclareUnicodeComposite{\^}{\i}{"00EE}
-\DeclareUnicodeComposite{\"}{i} {"00EF}
-\DeclareUnicodeComposite{\"}{\i}{"00EF}
-\DeclareUnicodeComposite{\~}{n}{"00F1}
-\DeclareUnicodeComposite{\`}{o}{"00F2}
-\DeclareUnicodeComposite{\'}{o}{"00F3}
-\DeclareUnicodeComposite{\^}{o}{"00F4}
-\DeclareUnicodeComposite{\~}{o}{"00F5}
-\DeclareUnicodeComposite{\"}{o}{"00F6}
-\DeclareUnicodeComposite{\`}{u}{"00F9}
-\DeclareUnicodeComposite{\'}{u}{"00FA}
-\DeclareUnicodeComposite{\^}{u}{"00FB}
-\DeclareUnicodeComposite{\"}{u}{"00FC}
-\DeclareUnicodeComposite{\'}{y}{"00FD}
-\DeclareUnicodeComposite{\k}{o}{"01EB}
-\DeclareUnicodeComposite{\k}{O}{"01EA}
-
-\DeclareUnicodeComposite{\c}{G}{"0122}
-\DeclareUnicodeComposite{\c}{g}{"0123} % note this cedilla is above not below :)
-\DeclareUnicodeComposite{\c}{K}{"0136}
-\DeclareUnicodeComposite{\c}{k}{"0137}
-\DeclareUnicodeComposite{\c}{L}{"013B}
-\DeclareUnicodeComposite{\c}{l}{"013C}
-\DeclareUnicodeComposite{\c}{N}{"0145}
-\DeclareUnicodeComposite{\c}{n}{"0146}
-\DeclareUnicodeComposite{\c}{R}{"0156}
-\DeclareUnicodeComposite{\c}{r}{"0157}
diff --git a/Master/texmf-dist/tex/latex/fontspec/tufontrange-TS1.def b/Master/texmf-dist/tex/latex/fontspec/tufontrange-TS1.def
deleted file mode 100644
index 4f6fdec4141..00000000000
--- a/Master/texmf-dist/tex/latex/fontspec/tufontrange-TS1.def
+++ /dev/null
@@ -1,134 +0,0 @@
-\ProvidesFile{ucfontrange-TS1.def}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% TS1 symbols
-
-\DeclareUnicodeAccent{\capitalcedilla}{"0327}
-\DeclareUnicodeAccent{\capitalogonek}{"0328}
-\DeclareUnicodeAccent{\capitalgrave}{"0300}
-\DeclareUnicodeAccent{\capitalacute}{"0301}
-\DeclareUnicodeAccent{\capitalcircumflex}{"0302}
-\DeclareUnicodeAccent{\capitaltilde}{"0303}
-\DeclareUnicodeAccent{\capitaldieresis}{"0308}
-\DeclareUnicodeAccent{\capitalhungarumlaut}{"030B}
-\DeclareUnicodeAccent{\capitalring}{"030A}
-\DeclareUnicodeAccent{\capitalcaron}{"030C}
-\DeclareUnicodeAccent{\capitalbreve}{"0306}
-\DeclareUnicodeAccent{\capitalmacron}{"0304}
-\DeclareUnicodeAccent{\capitaldotaccent}{"0307}
-\DeclareUnicodeAccent{\t}{"0361}
-\DeclareUnicodeAccent{\capitaltie}{"0361}
-\DeclareUnicodeAccent{\newtie}{"0311}
-\DeclareUnicodeAccent{\capitalnewtie}{"0311}
-%%\DeclareUnicodeSymbol{\textcapitalcompwordmark}{23}
-%%\DeclareUnicodeSymbol{\textascendercompwordmark}{31}
-\DeclareUnicodeSymbol{\textquotestraightbase}{"201A}
-\DeclareUnicodeSymbol{\textquotestraightdblbase}{"201E}
-\DeclareUnicodeSymbol{\texttwelveudash}{"2015}
-\DeclareUnicodeSymbol{\textthreequartersemdash}{"2012}
-\DeclareUnicodeSymbol{\textleftarrow}{"2190}
-\DeclareUnicodeSymbol{\textrightarrow}{"2192}
-\DeclareUnicodeSymbol{\textblank}{"2422}
-\DeclareUnicodeSymbol{\textdollar}{`\$}
-\DeclareUnicodeSymbol{\textquotesingle}{`\'}
-\DeclareUnicodeSymbol{\textasteriskcentered}{"204E}
-%% \DeclareUnicodeSymbol{\textdblhyphen}{45}
-\DeclareUnicodeSymbol{\textfractionsolidus}{"2044}
-%%\DeclareUnicodeSymbol{\textzerooldstyle}{48}
-%%\DeclareUnicodeSymbol{\textoneoldstyle}{49}
-%%\DeclareUnicodeSymbol{\texttwooldstyle}{50}
-%%\DeclareUnicodeSymbol{\textthreeoldstyle}{51}
-%%\DeclareUnicodeSymbol{\textfouroldstyle}{52}
-%%\DeclareUnicodeSymbol{\textfiveoldstyle}{53}
-%%\DeclareUnicodeSymbol{\textsixoldstyle}{54}
-%%\DeclareUnicodeSymbol{\textsevenoldstyle}{55}
-%%\DeclareUnicodeSymbol{\texteightoldstyle}{56}
-%%\DeclareUnicodeSymbol{\textnineoldstyle}{57}
-\DeclareUnicodeSymbol{\textlangle}{"27E8}
-\DeclareUnicodeSymbol{\textminus}{"2212}
-\DeclareUnicodeSymbol{\textrangle}{"27E9}
-\DeclareUnicodeSymbol{\textmho}{"2127}
-\DeclareUnicodeSymbol{\textbigcircle}{"25EF}
-\DeclareUnicodeAccent{\textcircled}{"20DD}
-\DeclareUnicodeSymbol{\textohm}{"2126}
-\DeclareUnicodeSymbol{\textlbrackdbl}{"301A}
-\DeclareUnicodeSymbol{\textrbrackdbl}{"301B}
-\DeclareUnicodeSymbol{\textuparrow}{"2191}
-\DeclareUnicodeSymbol{\textdownarrow}{"2193}
-\DeclareUnicodeSymbol{\textasciigrave}{`\`}
-\DeclareUnicodeSymbol{\textborn}{"2605} %% actually "black star" but close enough
-\DeclareUnicodeSymbol{\textdivorced}{"26AE}
-\DeclareUnicodeSymbol{\textdied}{"2020} %% different from "dagger"??
-%% \DeclareUnicodeSymbol{\textleaf}{108}
-\DeclareUnicodeSymbol{\textmarried}{"26AD}
-\DeclareUnicodeSymbol{\textmusicalnote}{"266A}
-\DeclareUnicodeSymbol{\texttildelow}{"02F7}
-%% \DeclareUnicodeSymbol{\textdblhyphenchar}{127} %% can't obtain this without deactivating font mapping :(
-\DeclareUnicodeSymbol{\textasciibreve}{"02D8}
-\DeclareUnicodeSymbol{\textasciicaron}{"02C7}
-\DeclareUnicodeSymbol{\textacutedbl}{"02DD}
-\DeclareUnicodeSymbol{\textgravedbl}{"02F5}
-\DeclareUnicodeSymbol{\textdagger}{"2020}
-\DeclareUnicodeSymbol{\textdaggerdbl}{"2021}
-\DeclareUnicodeSymbol{\textbardbl}{"2016}
-\DeclareUnicodeSymbol{\textperthousand}{"2030}
-\DeclareUnicodeSymbol{\textbullet}{"2022}
-\DeclareUnicodeSymbol{\textcelsius}{"2103}
-%% \DeclareUnicodeSymbol{\textdollaroldstyle}{138}
-%% \DeclareUnicodeSymbol{\textcentoldstyle}{139}
-\DeclareUnicodeSymbol{\textflorin}{"0192}
-\DeclareUnicodeSymbol{\textcolonmonetary}{"20A1}
-\DeclareUnicodeSymbol{\textwon}{"20A9}
-\DeclareUnicodeSymbol{\textnaira}{"20A6}
-%% \DeclareUnicodeSymbol{\textguarani}{144}
-\DeclareUnicodeSymbol{\textpeso}{"20B1}
-\DeclareUnicodeSymbol{\textlira}{"20A4}
-\DeclareUnicodeSymbol{\textrecipe}{"211E}
-\DeclareUnicodeSymbol{\textinterrobang}{"203D}
-\DeclareUnicodeSymbol{\textinterrobangdown}{"2E18}
-\DeclareUnicodeSymbol{\textdong}{"20AB}
-\DeclareUnicodeSymbol{\texttrademark}{"2122}
-\DeclareUnicodeSymbol{\textpertenthousand}{"2031}
-\DeclareUnicodeSymbol{\textpilcrow}{"00B6}
-\DeclareUnicodeSymbol{\textbaht}{"0E3F}
-\DeclareUnicodeSymbol{\textnumero}{"2116}
-\DeclareUnicodeSymbol{\textdiscount}{"2052}
-\DeclareUnicodeSymbol{\textestimated}{"212E}
-\DeclareUnicodeSymbol{\textopenbullet}{"25E6}
-\DeclareUnicodeSymbol{\textservicemark}{"2120}
-\DeclareUnicodeSymbol{\textlquill}{"2045}
-\DeclareUnicodeSymbol{\textrquill}{"2046}
-\DeclareUnicodeSymbol{\textcent}{"00A2}
-\DeclareUnicodeSymbol{\textsterling}{"00A3}
-\DeclareUnicodeSymbol{\textcurrency}{"00A4}
-\DeclareUnicodeSymbol{\textyen}{"00A5}
-\DeclareUnicodeSymbol{\textbrokenbar}{"00A6}
-\DeclareUnicodeSymbol{\textsection}{"00A7}
-\DeclareUnicodeSymbol{\textasciidieresis}{"00A8}
-\DeclareUnicodeSymbol{\textcopyright}{"00A9}
-\DeclareUnicodeSymbol{\textordfeminine}{"00AA}
-%% \DeclareUnicodeSymbol{\textcopyleft}{171}
-\DeclareUnicodeSymbol{\textlnot}{"00AC}
-\DeclareUnicodeSymbol{\textcircledP}{"2117}
-\DeclareUnicodeSymbol{\textregistered}{"00AE}
-\DeclareUnicodeSymbol{\textasciimacron}{"00AF}
-\DeclareUnicodeSymbol{\textdegree}{"00B0}
-\DeclareUnicodeSymbol{\textpm}{"00B1}
-\DeclareUnicodeSymbol{\texttwosuperior}{"00B2}
-\DeclareUnicodeSymbol{\textthreesuperior}{"00B3}
-\DeclareUnicodeSymbol{\textasciiacute}{"00B4}
-\DeclareUnicodeSymbol{\textmu}{"00B5}
-\DeclareUnicodeSymbol{\textparagraph}{"00B6}
-\DeclareUnicodeSymbol{\textperiodcentered}{"00B7}
-\DeclareUnicodeSymbol{\textreferencemark}{"203B}
-\DeclareUnicodeSymbol{\textonesuperior}{"00B9}
-\DeclareUnicodeSymbol{\textordmasculine}{"00BA}
-\DeclareUnicodeSymbol{\textsurd}{"221A}
-\DeclareUnicodeSymbol{\textonequarter}{"00BC}
-\DeclareUnicodeSymbol{\textonehalf}{"00BD}
-\DeclareUnicodeSymbol{\textthreequarters}{"00BE}
-\DeclareUnicodeSymbol{\texteuro}{"20AC}
-\DeclareUnicodeSymbol{\texttimes}{"00D7}
-\DeclareUnicodeSymbol{\textdiv}{"00F7}
-