xltxtra (31dec18)

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

7 files changed, 245 insertions, 310 deletions

diff --git a/Master/texmf-dist/doc/latex/xltxtra/xltxtra.pdf b/Master/texmf-dist/doc/latex/xltxtra/xltxtra.pdf
deleted file mode 100644
index 6d16c22a8b7..00000000000
--- a/Master/texmf-dist/doc/latex/xltxtra/xltxtra.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/xltxtra/README b/Master/texmf-dist/doc/xelatex/xltxtra/README.md
index efbafa9cbfc..41dc9204b3b 100644
--- a/Master/texmf-dist/doc/latex/xltxtra/README
+++ b/Master/texmf-dist/doc/xelatex/xltxtra/README.md
@@ -1,5 +1,6 @@
-________________________
-THE XLTXTRA PACKAGE v0.6
+
+THE XLTXTRA PACKAGE 2018/12/31 v0.7
+===================================
 
 This package was previously used to provide a number of small
 features that are useful for XeLaTeX. As of fontspec v2, many
@@ -13,42 +14,48 @@ but is still provided for backwards compatibility. A summary:
 - Loads fontspec.
 
 - Loads Andrew Moschou's metalogo package for customised
-  \XeTeX and \XeLaTeX logos.
+  `\XeTeX` and `\XeLaTeX` logos.
 
 - Loads the realscripts package to obtain OpenType-feature
-  subscript and superscript glyphs in \textsuperscript etc.,
+  subscript and superscript glyphs in `\textsuperscript` etc.,
   including in footnotes.
 
-- \showhyphens is redefined so it now works.
+- `\showhyphens` is redefined so it now works.
 
-- Defines the dubiously useful commands
-     \vfrac - for vulgar fractions using OpenType features
-     \namedglyph - to access font glyphs by name
+- Defines the dubiously useful commands:
+  - `\vfrac` - for vulgar fractions using OpenType features
+  - `\namedglyph` - to access font glyphs by name
 
 For more information see the documentation xltxtra.pdf.
 
-______________
+
 Change History
+--------------
+
+v0.7:
+  - Change internals for `expl3` update.
+  - Remove deprecated internal command `\TeX@logo@spacing`.
+  - (No user-level changes.)
 
 v0.6:
-    Replace definition of \showhyphens with one that properly
+  - Replace definition of `\showhyphens` with one that properly
     replicates the plain TeX definition in behaviour.
 
 v0.5e:
-    Remove the code for subscripts/superscripts and load the
+  - Remove the code for subscripts/superscripts and load the
     realscripts package instead.
-    (No user-level changes.)
+  - (No user-level changes.)
 
 v0.5d:
-    Remove those parts that have been taken into fontspec v2.0.
-    (No user-level changes.)
+  - Remove those parts that have been taken into fontspec v2.0.
+  - (No user-level changes.)
 
 v0.5c:
-    Update internals for fontspec v2.0.
-    (No user-level changes.)
+  - Update internals for fontspec v2.0.
+  - (No user-level changes.)
 
 v0.5b:
-    Bug fix for "\LaTeX" when [no-logos] is used.
+  - Bug fix for `\LaTeX` when `[no-logos]` is used.
     Thanks to Enrico Gregorio for finding this.
 
 ______________
diff --git a/Master/texmf-dist/doc/xelatex/xltxtra/xltxtra.pdf b/Master/texmf-dist/doc/xelatex/xltxtra/xltxtra.pdf
new file mode 100644
index 00000000000..954083b948a
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/xltxtra/xltxtra.pdf
diff --git a/Master/texmf-dist/source/latex/xltxtra/xltxtra.ins b/Master/texmf-dist/source/latex/xltxtra/xltxtra.ins
deleted file mode 100644
index 665ce38a8da..00000000000
--- a/Master/texmf-dist/source/latex/xltxtra/xltxtra.ins
+++ /dev/null
@@ -1,58 +0,0 @@
-%%
-%% This is file `xltxtra.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% xltxtra.dtx  (with options: `batchfile')
-%%   ____________________________
-%%   The XLTXTRA package
-%%   (C) 2006-2016 Will Robertson
-%%   License information appended
-%% 
-\input docstrip.tex
-\keepsilent
-\preamble
-  ____________________________
-  The XLTXTRA package
-  (C) 2006-2016 Will Robertson
-  License information appended
-
-\endpreamble
-\postamble
-
-Copyright (C) 2006-2016 by Will Robertson <wspr81@gmail.com>
-
-Distributable under the LaTeX Project Public License,
-version 1.3c or higher (your choice). The latest version of
-this license is at: http://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status)
-by Will Robertson.
-
-This work consists of the file  xltxtra.dtx
-          and the derived files xltxtra.sty,
-                                xltxtra.ins, and
-                                xltxtra.pdf.
-
-\endpostamble
-\askforoverwritefalse
-\generate{\file{xltxtra.sty}{\from{xltxtra.dtx}{package}}}
-\endbatchfile
-%% 
-%% Copyright (C) 2006-2016 by Will Robertson <wspr81@gmail.com>
-%% 
-%% Distributable under the LaTeX Project Public License,
-%% version 1.3c or higher (your choice). The latest version of
-%% this license is at: http://www.latex-project.org/lppl.txt
-%% 
-%% This work is "maintained" (as per LPPL maintenance status)
-%% by Will Robertson.
-%% 
-%% This work consists of the file  xltxtra.dtx
-%%           and the derived files xltxtra.sty,
-%%                                 xltxtra.ins, and
-%%                                 xltxtra.pdf.
-%% 
-%%
-%% End of file `xltxtra.ins'.
diff --git a/Master/texmf-dist/source/latex/xltxtra/xltxtra.dtx b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.dtx
index f2ce62f83f2..efcb4e7b7a4 100644
--- a/Master/texmf-dist/source/latex/xltxtra/xltxtra.dtx
+++ b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.dtx
@@ -1,59 +1,160 @@
 % \iffalse
-%<*internal>
-\begingroup
-%</internal>
-%<*batchfile>
-\input docstrip.tex
-\keepsilent
-\preamble
-  ____________________________
-  The XLTXTRA package         
-  (C) 2006-2016 Will Robertson
-  License information appended
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% THE XLTXTRA PACKAGE
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Copyright (C) 2006-2018 by Will Robertson <wspr81@gmail.com>
+%%
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Will Robertson.
+%%
+%% This work consists of the files xltxtra.dtx and xltxtra.ins,
+%%           and the derived files xltxtra.sty and xltxtra.pdf.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%<*driver>
+\documentclass{ltxdoc}
 
-\endpreamble
-\postamble
+\makeatletter
 
-Copyright (C) 2006-2016 by Will Robertson <wspr81@gmail.com>
+\def\@dotsep{1000}
+\setcounter{tocdepth}{2}
 
-Distributable under the LaTeX Project Public License,
-version 1.3c or higher (your choice). The latest version of
-this license is at: http://www.latex-project.org/lppl.txt
+\setcounter{IndexColumns}{2}
+\renewenvironment{theglossary}
+  {\small\list{}{}
+     \item\relax
+     \glossary@prologue\GlossaryParms
+     \let\item\@idxitem \ignorespaces
+     \def\pfill{\hspace*{\fill}}}
+  {\endlist}
 
-This work is "maintained" (as per LPPL maintenance status) 
-by Will Robertson.
+\usepackage{array,booktabs,calc,color,enumitem,fancyvrb,graphicx,ifthen,longtable,refstyle,varioref,xltxtra}
+\usepackage[rm]{titlesec}
+\setmainfont{texgyrepagella}[
+  Extension = .otf ,
+  UprightFont = *-regular ,
+  ItalicFont = *-italic ,
+  BoldFont = *-bold ,
+  BoldItalicFont = *-bolditalic ,
+]
+\setsansfont{texgyreheros}[
+  Scale=MatchLowercase ,
+  Extension = .otf ,
+  UprightFont = *-regular ,
+  ItalicFont = *-italic ,
+  BoldFont = *-bold ,
+  BoldItalicFont = *-bolditalic ,
+]
+\setmonofont{lmmono10}[
+  Extension = .otf ,
+  UprightFont = *-regular ,
+  ItalicFont = *-italic ,
+]
 
-This work consists of the file  xltxtra.dtx
-          and the derived files xltxtra.sty,
-                                xltxtra.ins, and
-                                xltxtra.pdf.
+\linespread{1.05}      % A bit more space between lines
+\frenchspacing         % Remove space after punctuation
+
+\setlogokern{Xe}{-0.061em}
+\setlogokern{eL}{-0.057em}
+\setlogokern{La}{-0.28em}
+\setlogokern{aT}{-0.10em}
+\setlogokern{Te}{-0.0575em}
+\setlogokern{eX}{-0.072em}
+\setlogokern{eT}{-0.056em}
+\setlogokern{X2}{0.1667em}
+\setlogodrop{0.153em}
+\setLaTeXa{\scshape a}
+\setLaTeXee{\mbox{\fontspec{Times}\itshape ε}}
+\def\eTeX{{\fontspec{Times}\textit{ε}{}}-\TeX} % The eTeX logo is not (yet) covered by metalogo
+
+\definecolor{niceblue}{rgb}{0.2,0.4,0.6}
+\def\theCodelineNo{\textcolor{niceblue}{\sffamily\tiny\arabic{CodelineNo}}}
+
+\newenvironment{example}
+  {\VerbatimEnvironment
+   \begin{trivlist}\item[]
+   \begin{minipage}{\linewidth}
+   \par\noindent\hrulefill\par
+   \begin{VerbatimOut}[gobble=4]{\examplefilename}}
+  {\end{VerbatimOut}\relax
+   \begingroup
+     \color{niceblue}
+     \typesetexample
+   \endgroup\par\noindent\hrulefill\par
+   \end{minipage}\end{trivlist}}
+
+\let\examplesize\normalsize
+\let\auxwidth\relax
+
+\newlength\examplewidth\newlength\verbatimwidth
+\newlength\exoutdent   \newlength\exverbgap
+\setlength\exverbgap{0em}
+\setlength\exoutdent{-0\textwidth}
+\newsavebox\verbatimbox
+\edef\examplefilename{xltxtra.example}
+
+\newcommand\typesetexample{\relax
+   \begin{lrbox}{\verbatimbox}\relax
+     \BVerbatimInput[fontsize=\small]{\examplefilename}\relax
+   \end{lrbox}
+   \begin{list}{}{\setlength\itemindent{0pt}
+                  \setlength\leftmargin\exoutdent
+                  \setlength\rightmargin{0pt}}\item
+   \ifx\auxwidth\relax
+     \setlength\verbatimwidth{\wd\verbatimbox}\relax
+   \else
+     \setlength\verbatimwidth{\auxwidth}\relax
+   \fi
+   \begin{minipage}[c]{\textwidth-\exoutdent-\verbatimwidth-\exverbgap}
+     \catcode`\%=14\centering\examplesize\input\examplefilename\relax
+   \end{minipage}\hfill
+   \begin{minipage}[c]{\verbatimwidth}
+     \usebox\verbatimbox
+   \end{minipage}
+   \end{list}
+   \global\let\examplesize\normalsize}
+
+\newcommand*\setexsize[1]{\let\examplesize#1}
+\newcommand*\setverbwidth[1]{\def\auxwidth{#1}}
+
+\newcommand*\name[1]{{#1}}
+\newcommand*\pkg[1]{\texttt{#1}}
+\newcommand*\pkgopt[1]{\texttt{[#1]} package option}
+
+\newcommand*\acro[1]{\textsc{\MakeLowercase{#1}}}
+
+\newcommand*\note[1]{\unskip\footnote{#1}}
+
+\let\latin\textit
+\def\eg{\latin{e.g.}}
+\def\Eg{\latin{E.g.}}
+\def\ie{\latin{i.e.}}
+\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
+
+\newcounter{argument}
+\g@addto@macro\endmacro{\setcounter{argument}{0}}
+\newcommand*\darg[1]{%
+  \stepcounter{argument}%
+  \noindent{\ttfamily\#\theargument}:~#1\par\nobreak}
+\newcommand*\doarg[1]{%
+  \stepcounter{argument}%
+  \noindent{\ttfamily\makebox[0pt][r]{[}\#\theargument]}:~#1\par\nobreak}
+
+\newcommand\unichar[2]{\textsc{\MakeLowercase{u+#1: #2}}}
+
+\makeatother
 
-\endpostamble
-\askforoverwritefalse
-\generate{\file{xltxtra.sty}{\from{xltxtra.dtx}{package}}}
-%</batchfile>
-%<batchfile>\endbatchfile
-%<*internal>
-\generate{\file{xltxtra.ins}{\from{xltxtra.dtx}{batchfile}}}
-\nopreamble\nopostamble
-\generate{\file{dtx-style.sty}{\from{xltxtra.dtx}{dtx-style}}}
-\def\tmpa{plain}
-\ifx\tmpa\fmtname\endgroup\expandafter\bye\fi
-\endgroup
-%</internal>
-%
-%<*driver>
-\documentclass{ltxdoc}
 \EnableCrossrefs
 \CodelineIndex
-\RecordChanges
-%\OnlyDescription
-\usepackage{dtx-style}
 \begin{document}
   \DocInput{xltxtra.dtx}
 \end{document}
 %</driver>
-%
 % \fi
 %
 % \errorcontextlines=999
@@ -71,7 +172,7 @@ This work consists of the file  xltxtra.dtx
 %
 % \section{Introduction}
 %
-% This document describes the \pkg{xltxtra} package. 
+% This document describes the \pkg{xltxtra} package.
 % It implements some odds-and-ends features when using the \XeLaTeX\ format.
 %
 % \subsection{Usage}
@@ -97,7 +198,7 @@ This work consists of the file  xltxtra.dtx
 %	  |\textsuperscript     | \textsuperscript{abcdefghijklmnopqrstuvwxyz1234567890}\par
 %	  |\textsubscript       | \textsubscript{abcdefghijklmnopqrstuvwxyz1234567890}
 % \end{quotation}
-% But will fall back on `faked' ones if they don't exist: 
+% But will fall back on `faked' ones if they don't exist:
 % (this is {\fontspec{Didot} Didot})
 % \begin{quotation}\color{niceblue}
 %	\fontspec{Didot}
@@ -110,19 +211,13 @@ This work consists of the file  xltxtra.dtx
 %	  |\textsuperscript*    | \textsuperscript*{abcdefghijklmnopqrstuvwxyz1234567890}\par
 %	  |\textsubscript*      | \textsubscript*{abcdefghijklmnopqrstuvwxyz1234567890}
 % \end{quotation}
-% But beware fonts lacking the full repertoire: (this is Adobe Jenson Pro)
-% \begin{quotation}\color{niceblue}
-%	\fontspec{Adobe Jenson Pro}
-%	  |\textsuperscript     | \makebox[0pt][l]{\textsuperscript{abcdefghijklmnopqrstuvwxyz1234567890}}\par
-%	  |\textsubscript       | \makebox[0pt][l]{\textsubscript{abcdefghijklmnopqrstuvwxyz1234567890}}
-% \end{quotation}
 %
 % The \pkgopt{no-sscript} will swap the definitions of the starred and non-starred versions of the commands described above if the new definitions are undesirable.
 %
 % The macros
-% \cmd\realsubscript, 
-% \cmd\realsuperscript, 
-% \cmd\fakesubscript, and 
+% \cmd\realsubscript,
+% \cmd\realsuperscript,
+% \cmd\fakesubscript, and
 % \cmd\fakesuperscript\
 % may be used to access the `new' and `old' functionalities regardless of the \pkgopt{no-sscript}.
 %
@@ -163,15 +258,13 @@ This work consists of the file  xltxtra.dtx
 % These logos, ideally, should be hand-tuned for each font that they're used in. Please refer to the |metalogo| documentation for more information.
 %
 % The \pkgopt{no-logos} will not redefine \cmd\TeX\ or \cmd\LaTeX\ but will still define \cmd\XeTeX\ and \cmd\XeLaTeX.
-% 
+%
 %
 % \subsection{Vulgar fractions}
 % The \cmd\vfrac\ command for setting `vulgar' fractions based on AAT or OpenType font features. Not really recommended for many purposes, depending on your text, but it's a good example of how to program such things using \pkg{fontspec}.
 % \begin{example}
-%   \fontspec{Skia}
-%   AAT: \vfrac{123}{456}\\
-%   \fontspec{Warnock Pro}
-%   ICU: \vfrac{123}{456}
+%   \fontspec{LibreCaslonText-Regular.otf}
+%   \vfrac{123}{456}
 % \end{example}
 % \noindent (This can also be achieved in regular \LaTeX\ with either the \pkg{nicefrac} or \pkg{xfrac} package.)
 %
@@ -180,13 +273,13 @@ This work consists of the file  xltxtra.dtx
 % \subsection{Named glyphs}
 % Along the way somewhere, \XeTeX\ added support for selecting glyphs from a TrueType-based OpenType font based on their internal glyph name. Jonathan Kew posted the following definition as a nice interface to it.
 % \begin{example}
-%   \fontspec{Charis SIL}
+%   \fontspec{charis}
 %   \namedglyph{yen}
 %   \namedglyph{smile}
 % \end{example}
 %
 % \subsection{The \cmd\showhyphens\ command}
-% The default definition doesn't work in \XeTeX. 
+% The default definition doesn't work in \XeTeX.
 % A new version, written by Enrico Gregorio, is included in this package that \emph{does} work; note that the syntax now matches plain \TeX's original rather than the comma-list approach taken by an earlier version of this package.
 % \showhyphens{discomedusoid discommodiousness}
 %
@@ -199,7 +292,7 @@ This work consists of the file  xltxtra.dtx
 %
 %    \begin{macrocode}
 \ProvidesPackage{xltxtra}
-  [2016/01/21 v0.6 Improvements for the "XeLaTeX" format]
+  [2018/12/31 v0.7 Improvements for the "XeLaTeX" format]
 %    \end{macrocode}
 %
 % \paragraph{Not for Lua\TeX}
@@ -272,26 +365,7 @@ This work consists of the file  xltxtra.dtx
   \let\LaTeXe\original@LaTeXe
 \fi
 %    \end{macrocode}
-% 
-% \begin{macro}{\TeX@logo@spacing}
-% This macro is now deprecated. It is recommended to use the commands
-% from |metalogo|.
 %
-%    \begin{macrocode}
-\newcommand*\TeX@logo@spacing[6]{%
-  \PackageWarning{xltxtra}{%
-    Use of \protect\TeX@logo@spacing\space is deprecated,\MessageBreak
-    recommend to use commands from package `metalogo' instead}
-  \setlogokern{Te}{#1}%
-  \setlogokern{eT}{#1}%
-  \setlogokern{eX}{#2}%
-  \setlogokern{Xe}{#2}%
-  \setlogodrop{#3}%
-  \setlogokern{La}{#4}%
-  \setlogokern{aT}{#5}%  
-  \setlogokern{eL}{#6}}
-%    \end{macrocode}
-% \end{macro}
 %
 %
 % \section{Subscript and superscript}
@@ -354,9 +428,9 @@ This work consists of the file  xltxtra.dtx
 %    \begin{macrocode}
 \newcommand\namedglyph[1]{%
   \@tempcnta=\XeTeXglyphindex "#1"\relax
-  \ifnum\@tempcnta>0 
-    \XeTeXglyph\@tempcnta 
-  \else 
+  \ifnum\@tempcnta>0
+    \XeTeXglyph\@tempcnta
+  \else
     \xxt@namedglyph@fallback{#1}%
   \fi}
 %    \end{macrocode}
@@ -400,14 +474,14 @@ This work consists of the file  xltxtra.dtx
    {% build a paragraph with the word with a very narrow line width
     \dim_set:Nn \hsize { 1sp }
     % disregard spurious messages
-    \hbadness = \c_ten_thousand
+    \hbadness = 10000\relax
     \dim_set:Nn \hfuzz { \c_max_dim }
     % clear possible values of \everypar and other parameters
     \everypar={}
     \skip_set:Nn \leftskip { 0pt }
     \skip_set_eq:NN \rightskip \leftskip
     % skip the first step
-    \pretolerance = \c_minus_one
+    \pretolerance = -1\relax
     % avoid the indentation and add a skip to allow hyphenation
     \noindent
     \skip_horizontal:n { 0pt }
@@ -450,139 +524,11 @@ This work consists of the file  xltxtra.dtx
 %    \end{macrocode}
 % \end{macro}
 %
-%
 %\iffalse
 %</package>
 %\fi
 %
 % \Finale
 %
-%\iffalse
-%<*dtx-style>
-%    \begin{macrocode}
-\ProvidesPackage{dtx-style}
-
-\def\@dotsep{1000}
-\setcounter{tocdepth}{2}
-
-\setcounter{IndexColumns}{2}
-\renewenvironment{theglossary}
-  {\small\list{}{}
-     \item\relax
-     \glossary@prologue\GlossaryParms 
-     \let\item\@idxitem \ignorespaces 
-     \def\pfill{\hspace*{\fill}}}
-  {\endlist}
-
-\usepackage{array,booktabs,calc,color,enumitem,fancyvrb,graphicx,ifthen,longtable,refstyle,varioref,xltxtra}
-\usepackage[rm]{titlesec}
-\setmainfont[Mapping=tex-text]{TeX Gyre Pagella}
-\setsansfont[Scale=MatchLowercase,Mapping=tex-text]{Verdana}
-\setmonofont[Scale=MatchLowercase]{Consolas}
-
-\linespread{1.05}      % A bit more space between lines
-\frenchspacing         % Remove ugly extra space after punctuation
-
-\setlogokern{Xe}{-0.061em}
-\setlogokern{eL}{-0.057em}
-\setlogokern{La}{-0.28em}
-\setlogokern{aT}{-0.10em}
-\setlogokern{Te}{-0.0575em}
-\setlogokern{eX}{-0.072em}
-\setlogokern{eT}{-0.056em}
-\setlogokern{X2}{0.1667em}
-\setlogodrop{0.153em}
-\setLaTeXa{\scshape a}
-\setLaTeXee{\mbox{\fontspec{Times}\itshape ε}}
-\def\eTeX{{\fontspec{Times}\textit{ε}{}}-\TeX} % The eTeX logo is not (yet) covered by metalogo
-
-\definecolor{niceblue}{rgb}{0.2,0.4,0.6}
-\def\theCodelineNo{\textcolor{niceblue}{\sffamily\tiny\arabic{CodelineNo}}}
-
-\newenvironment{example}
-  {\VerbatimEnvironment
-   \begin{trivlist}\item[]
-   \begin{minipage}{\linewidth}
-   \par\noindent\hrulefill\par
-   \begin{VerbatimOut}[gobble=4]{\examplefilename}}
-  {\end{VerbatimOut}\relax
-   \begingroup
-     \color{niceblue}
-     \typesetexample
-   \endgroup\par\noindent\hrulefill\par
-   \end{minipage}\end{trivlist}}
-
-\let\examplesize\normalsize
-\let\auxwidth\relax
-
-\newlength\examplewidth\newlength\verbatimwidth
-\newlength\exoutdent   \newlength\exverbgap
-\setlength\exverbgap{0em}
-\setlength\exoutdent{-0\textwidth}
-\newsavebox\verbatimbox
-\edef\examplefilename{xltxtra.example}
-
-\newcommand\typesetexample{\relax
-   \begin{lrbox}{\verbatimbox}\relax
-     \BVerbatimInput[fontsize=\small]{\examplefilename}\relax
-   \end{lrbox}
-   \begin{list}{}{\setlength\itemindent{0pt}
-                  \setlength\leftmargin\exoutdent
-                  \setlength\rightmargin{0pt}}\item
-   \ifx\auxwidth\relax
-     \setlength\verbatimwidth{\wd\verbatimbox}\relax
-   \else
-     \setlength\verbatimwidth{\auxwidth}\relax
-   \fi
-   \begin{minipage}[c]{\textwidth-\exoutdent-\verbatimwidth-\exverbgap}
-     \catcode`\%=14\centering\examplesize\input\examplefilename\relax
-   \end{minipage}\hfill
-   \begin{minipage}[c]{\verbatimwidth}
-     \usebox\verbatimbox
-   \end{minipage}
-   \end{list}
-   \global\let\examplesize\normalsize}
-
-\newcommand*\setexsize[1]{\let\examplesize#1}
-\newcommand*\setverbwidth[1]{\def\auxwidth{#1}}
-
-\newcommand*\name[1]{{#1}}
-\newcommand*\pkg[1]{\texttt{#1}}
-\newcommand*\pkgopt[1]{\texttt{[#1]} package option}
-
-\newcommand*\acro[1]{\textsc{\MakeLowercase{#1}}}
-
-\newcommand*\note[1]{\unskip\footnote{#1}}
-
-\let\latin\textit
-\def\eg{\latin{e.g.}}
-\def\Eg{\latin{E.g.}}
-\def\ie{\latin{i.e.}}
-\def\etc{\@ifnextchar.{\latin{etc}}{\latin{etc.}\@}}
-
-\newcounter{argument}
-\g@addto@macro\endmacro{\setcounter{argument}{0}}
-\newcommand*\darg[1]{%
-  \stepcounter{argument}%
-  \noindent{\ttfamily\#\theargument}:~#1\par\nobreak}
-\newcommand*\doarg[1]{%
-  \stepcounter{argument}%
-  \noindent{\ttfamily\makebox[0pt][r]{[}\#\theargument]}:~#1\par\nobreak}
-
-\newcommand\unichar[2]{\textsc{\MakeLowercase{u+#1: #2}}}
-
-%    \end{macrocode}
-%</dtx-style>
-%\fi
-%
-% \typeout{*************************************************************}
-% \typeout{*}
-% \typeout{* To finish the installation you have to move the following}
-% \typeout{* file into a directory searched by XeTeX:}
-% \typeout{*}
-% \typeout{* \space\space\space xltxtra.sty}
-% \typeout{*}
-% \typeout{*************************************************************}
-%
 \endinput
 
diff --git a/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.ins b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.ins
new file mode 100644
index 00000000000..f3cf3dc8a9c
--- /dev/null
+++ b/Master/texmf-dist/source/xelatex/xltxtra/xltxtra.ins
@@ -0,0 +1,34 @@
+
+\input docstrip.tex
+\keepsilent
+\preamble
+  ____________________________
+  The XLTXTRA package
+  (C) 2006-2017 Will Robertson
+  License information appended
+
+\endpreamble
+\postamble
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+THE XLTXTRA PACKAGE
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+Copyright (C) 2006-2018 by Will Robertson <wspr81@gmail.com>
+
+Distributable under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is "maintained" (as per LPPL maintenance status)
+by Will Robertson.
+
+This work consists of the files xltxtra.dtx and xltxtra.ins,
+          and the derived files xltxtra.sty and xltxtra.pdf.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\endpostamble
+\askforoverwritefalse
+\generate{\file{xltxtra.sty}{\from{xltxtra.dtx}{package}}}
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/xltxtra/xltxtra.sty b/Master/texmf-dist/tex/xelatex/xltxtra/xltxtra.sty
index 377ffbc6701..9ce1d107112 100644
--- a/Master/texmf-dist/tex/latex/xltxtra/xltxtra.sty
+++ b/Master/texmf-dist/tex/xelatex/xltxtra/xltxtra.sty
@@ -7,11 +7,28 @@
 %% xltxtra.dtx  (with options: `package')
 %%   ____________________________
 %%   The XLTXTRA package
-%%   (C) 2006-2016 Will Robertson
+%%   (C) 2006-2017 Will Robertson
 %%   License information appended
 %% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% THE XLTXTRA PACKAGE
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Copyright (C) 2006-2018 by Will Robertson <wspr81@gmail.com>
+%%
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Will Robertson.
+%%
+%% This work consists of the files xltxtra.dtx and xltxtra.ins,
+%%           and the derived files xltxtra.sty and xltxtra.pdf.
+%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ProvidesPackage{xltxtra}
-  [2016/01/21 v0.6 Improvements for the "XeLaTeX" format]
+  [2018/12/31 v0.7 Improvements for the "XeLaTeX" format]
 \RequirePackage{ifluatex}
 \ifluatex
   \PackageWarningNoLine {xltxtra} {^^J
@@ -37,18 +54,6 @@
   \let\LaTeX\original@LaTeX
   \let\LaTeXe\original@LaTeXe
 \fi
-\newcommand*\TeX@logo@spacing[6]{%
-  \PackageWarning{xltxtra}{%
-    Use of \protect\TeX@logo@spacing\space is deprecated,\MessageBreak
-    recommend to use commands from package `metalogo' instead}
-  \setlogokern{Te}{#1}%
-  \setlogokern{eT}{#1}%
-  \setlogokern{eX}{#2}%
-  \setlogokern{Xe}{#2}%
-  \setlogodrop{#3}%
-  \setlogokern{La}{#4}%
-  \setlogokern{aT}{#5}%
-  \setlogokern{eL}{#6}}
 \if@xxt@nosscript@
   \DeclareRobustCommand*\textsubscript{%
     \@ifstar{\realsubscript}{\fakesubscript}}
@@ -113,14 +118,14 @@
    {% build a paragraph with the word with a very narrow line width
     \dim_set:Nn \hsize { 1sp }
     % disregard spurious messages
-    \hbadness = \c_ten_thousand
+    \hbadness = 10000\relax
     \dim_set:Nn \hfuzz { \c_max_dim }
     % clear possible values of \everypar and other parameters
     \everypar={}
     \skip_set:Nn \leftskip { 0pt }
     \skip_set_eq:NN \rightskip \leftskip
     % skip the first step
-    \pretolerance = \c_minus_one
+    \pretolerance = -1\relax
     % avoid the indentation and add a skip to allow hyphenation
     \noindent
     \skip_horizontal:n { 0pt }
@@ -161,7 +166,9 @@
 \cs_set_eq:NN \showhyphens \xetex_show_hyphens:n
 \ExplSyntaxOff
 %% 
-%% Copyright (C) 2006-2016 by Will Robertson <wspr81@gmail.com>
+%% THE XLTXTRA PACKAGE
+%% 
+%% Copyright (C) 2006-2018 by Will Robertson <wspr81@gmail.com>
 %% 
 %% Distributable under the LaTeX Project Public License,
 %% version 1.3c or higher (your choice). The latest version of
@@ -170,10 +177,9 @@
 %% This work is "maintained" (as per LPPL maintenance status)
 %% by Will Robertson.
 %% 
-%% This work consists of the file  xltxtra.dtx
-%%           and the derived files xltxtra.sty,
-%%                                 xltxtra.ins, and
-%%                                 xltxtra.pdf.
+%% This work consists of the files xltxtra.dtx and xltxtra.ins,
+%%           and the derived files xltxtra.sty and xltxtra.pdf.
+%% 
 %% 
 %%
 %% End of file `xltxtra.sty'.