6 files changed, 101 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
index 3d63ff45475..8870ac5b9b1 100644
--- a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
@@ -2,6 +2,15 @@
 Change history
 ==============
 
+- v2.6f (2017-11-05)
+
+    * Fix loading of Graphite fonts and add a little documentation (a better interface is needed, though)
+    * Correct and simplify some internal code that fixes a bug in the way some fonts are displayed in `\tracingoutput` mode.
+    * This also fixes an obscure bug using the API in which a query for a selected font feature
+      would test against the upright font in the current family regardless of the face/shape actually in use.
+    * This package now complies with the `expl3` option `check-declarations`.
+
+
 - v2.6e (2017/09/22)
 
     * Re-enable use of `HyphenChar=None` in LuaLaTeX. (Hyphenation and font choice are
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx
new file mode 100644
index 00000000000..5b1e400de1b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.ltx
@@ -0,0 +1,44 @@
+%%^^A%%  fontspec-code.ltx -- part of FONTSPEC <wspr.io/fontspec>
+
+\documentclass[a4paper]{l3doc}
+\usepackage{fontspec-doc-style}
+\begin{document}
+
+\GetFileInfo{fontspec.dtx}
+\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX}
+\author{
+   \textsc{Will Robertson} and \textsc{Khaled Hosny}\\
+   \url{http://wspr.io/fontspec/}
+}
+\date{\filedate \qquad \fileversion}
+
+\maketitle
+\tableofcontents
+\newpage
+
+\def\DTX#1{\DocInput{#1}}
+\FONTSPECDTX
+
+\clearpage
+\PrintChanges
+
+\clearpage
+\setcounter{IndexColumns}{2}
+\PrintIndex
+
+\end{document}
+
+\endinput
+
+% /©
+% ------------------------------------------------
+% The FONTSPEC package  <wspr.io/fontspec>
+% ------------------------------------------------
+% Copyright  2004-2017  Will Robertson, LPPL "maintainer"
+% Copyright  2009-2013  Khaled Hosny
+% ------------------------------------------------
+% This package is free software and may be redistributed and/or modified under
+% the conditions of the LaTeX Project Public License, version 1.3c or higher
+% (your choice): <http://www.latex-project.org/lppl/>.
+% ------------------------------------------------
+% ©/
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf
new file mode 100644
index 00000000000..529af944e11
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex b/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
index 9138c3a6f74..bf2831b134b 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec-example.tex
@@ -1,4 +1,4 @@
-
+%%^^A%%  fontspec-example.tex -- part of FONTSPEC <wspr.io/fontspec>
 
 \documentclass{article}
 
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx b/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx
new file mode 100644
index 00000000000..c1eeeecdc9b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.ltx
@@ -0,0 +1,47 @@
+%%^^A%%  fontspec.ltx -- part of FONTSPEC <wspr.io/fontspec>
+
+\ifdefined \XeTeXOTcountscripts \else \makeatletter
+  \@latex@error{^^J*** The fontspec documentation can only be typeset with `xelatex` ***\@gobble}\@ehc
+\fi
+
+\documentclass[a4paper]{l3doc}
+\usepackage{fontspec-doc-style}
+\begin{document}
+
+\GetFileInfo{fontspec.dtx}
+\title{The \textsf{fontspec} package\\Font selection for \XeLaTeX\ and \LuaLaTeX}
+\author{
+   \textsc{Will Robertson} and \textsc{Khaled Hosny}\\
+   \url{http://wspr.io/fontspec/}
+}
+\date{\filedate \qquad \fileversion}
+
+\maketitle
+\tableofcontents
+\newpage
+
+\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}
+
+\end{document}
+
+\endinput
+
+% /©
+% ------------------------------------------------
+% The FONTSPEC package  <wspr.io/fontspec>
+% ------------------------------------------------
+% Copyright  2004-2017  Will Robertson, LPPL "maintainer"
+% Copyright  2009-2013  Khaled Hosny
+% ------------------------------------------------
+% This package is free software and may be redistributed and/or modified under
+% the conditions of the LaTeX Project Public License, version 1.3c or higher
+% (your choice): <http://www.latex-project.org/lppl/>.
+% ------------------------------------------------
+% ©/
diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
index dbaa1f5660c..d9cbbffc32f 100644
--- a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
+++ b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf