tracklang (21feb18)

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

34 files changed, 128 insertions, 55 deletions

diff --git a/Master/texmf-dist/doc/generic/tracklang/CHANGES b/Master/texmf-dist/doc/generic/tracklang/CHANGES
index 9f3e3a47f09..67123736ed8 100644
--- a/Master/texmf-dist/doc/generic/tracklang/CHANGES
+++ b/Master/texmf-dist/doc/generic/tracklang/CHANGES
@@ -1,3 +1,7 @@
+v1.3.5 (2018-02-21):
+
+  * Added check for polyglossia's \xpg@loaded
+
 v1.3.4 (2017-03-25):
 
   * Fixed typo in \errhelp command name
diff --git a/Master/texmf-dist/doc/generic/tracklang/README b/Master/texmf-dist/doc/generic/tracklang/README
index 2f66e0eda7c..2709ffa4bc0 100644
--- a/Master/texmf-dist/doc/generic/tracklang/README
+++ b/Master/texmf-dist/doc/generic/tracklang/README
@@ -1,6 +1,6 @@
-Generic TeX Bundle : tracklang v1.3.4 
+Generic TeX Bundle : tracklang v1.3.5 
 
-Last Modified      : 2017-03-25
+Last Modified      : 2018-02-21
 
 Author             : Nicola Talbot
 
@@ -8,8 +8,7 @@ LaTeX usage: \usepackage{tracklang}
 
 TeX usage: \input tracklang
 
-LaTeX code is in tracklang.sty. Generic TeX code is in
-tracklang.tex (category code of @ must be 11 on input).
+LaTeX code is in tracklang.sty. Generic TeX code is in tracklang.tex.
 
 The tracklang package is provided for package developers who want a
 simple interface to find out which languages the user has requested
@@ -17,6 +16,10 @@ through packages such as babel and polyglossia.  *This package
 doesn't provide any translations.*  Its purpose is simply to track
 which languages have been requested by the user.
 
+Related article: "Localisation of TeX documents: tracklang."
+TUGBoat, Volume 37 (2016), No. 3.
+http://www.tug.org/TUGboat/tb37-3/tb117talbot.pdf
+
 This material is subject to the LaTeX Project Public License. 
 See http://www.ctan.org/license/lppl1.3 for the details of that license.
 
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf
index f905a1bfe6b..3d743e1f859 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
index 437d1a3b694..f2c3eb75310 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf
index 49b2c374f16..4f60a84c8e5 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf
index 423bd0c0d4b..ae6d2fa7526 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf
index d65cd1ef345..7e54312b70f 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf
index 0a5e4a039f0..8859c70dd10 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf
index 3ef4c9b40f7..4655f0e5f13 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf
index 3d1ebb1e9bc..8da274edd22 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf
index 87789060211..40c1b7776a9 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf
index 3aa70d31b4c..0416248fff3 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf
index abe55a43654..4e74e62930d 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf
index 4d7109718c8..9393614303b 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf
index 56412a07a68..b064ee06189 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf
index 7c64b3ddd44..f68d18921fb 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf
index 454f490b1e4..79a9a2b5cff 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf
index e8b4e4ecf89..171a7e9666e 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
index ab68a8f4c5f..95ab94539ae 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf
index 01ac77016d3..fd8fc01c204 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf
index 60c6ca42183..1983addbb99 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf
index 1f83aea3e31..777b4dc2ba8 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf
index a6584d9eb9b..adfc055014c 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf
index 49c8951b4e0..38b07403eac 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf
index 0a905e06098..4af233b0e3f 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf
index 9c83e64db31..f888f37a11b 100644
--- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf
diff --git a/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf b/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf
index 8539a278d1b..f8385688504 100644
--- a/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf
+++ b/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf
diff --git a/Master/texmf-dist/source/latex/tracklang/tracklang.dtx b/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
index 11945726532..b63bb9e3dec 100644
--- a/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
+++ b/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
@@ -1,5 +1,5 @@
 %\iffalse
-% tracklang.dtx generated using makedtx version 1.1 (c) Nicola Talbot
+% tracklang.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
 %   -section "chapter"
 %   -doc "tracklang-manual.tex"
@@ -10,7 +10,7 @@
 %   -src "tracklang-scripts.sty\Z=>tracklang-scripts.sty"
 %   -src "tracklang-scripts.tex\Z=>tracklang-scripts.tex"
 %   tracklang
-% Created on 2017/3/25 20:20
+% Created on 2018/2/21 13:08
 %\fi
 %\iffalse
 %<*package>
@@ -33,7 +33,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2017 Nicola Talbot, all rights reserved.
+% Copyright (C) 2018 Nicola Talbot, all rights reserved.
 % \fi
 % \iffalse
 %<*driver>
@@ -59,7 +59,7 @@
             pdfauthor={Nicola L.C. Talbot},
             pdftitle={tracklang: tracking language options}]{hyperref}
 
-\CheckSum{3897}
+\CheckSum{3914}
 
 \appto\MacroFont{\scriptsize}
 \renewcommand*{\usage}[1]{\textit{\hyperpage{#1}}}
@@ -278,11 +278,11 @@ and~\ref{tab:nonisoopts}}
 %
 %\MakeShortVerb{"}
 %
-%\title{tracklang v1.3.4:
+%\title{tracklang v1.3.5:
 %tracking language options}
 %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}}
 %
-%\date{2017-03-25}
+%\date{2018-02-21}
 %\maketitle
 %
 %\begin{abstract}
@@ -300,15 +300,19 @@ and~\ref{tab:nonisoopts}}
 %or \envvar{LANG} environment variable (see
 %\sectionref{sec:langsty}). Windows users, who don't have the locale
 %stored in environment variables, can use \app{texosquery}
-%in combination with \styfmt{tracklang}.
+%in combination with \styfmt{tracklang}. (Similarly if \envvar{LC\_ALL}
+%or \envvar{LANG} don't contain sufficient information.) In order to
+%use \app{texosquery} through the restricted shell escape, you must
+%have at least Java~8 and set up \texttt{texosquery.cfg}
+%appropriately. (See the \app{texosquery} manual for further details.)
 %\end{abstract}
 %
 %The fundamental aim of this generic package is to be able to
 %effectively say:
 %\begin{quote}
 %The user (that is, the \emph{document} author) wants to use
-%dialects \texttt{xx-XX}, \texttt{yy-YY-Scrp}, etc in this
-%document. Any packages used by this document that provide 
+%dialects \texttt{xx-XX}, \texttt{yy-YY-Scrp}, etc in their
+%document. Any packages used by their document that provide 
 %multilingual or region-dependent support should do whatever is
 %required to activate the settings for those languages and regions
 %(or warn the user that there's no support).
@@ -319,6 +323,10 @@ and~\ref{tab:nonisoopts}}
 %for packages to detect the required language and region. The aim of
 %\styfmt{tracklang} is to provide that method.
 %
+%Related article: \qt{Localisation of \TeX\ documents: 
+%\styfmt{tracklang}.} TUGBoat, Volume~37 (2016), No.~3
+%(\url{http://www.tug.org/TUGboat/tb37-3/tb117talbot.pdf}).
+%
 %\clearpage
 %\tableofcontents
 %\clearpage\phantomsection
@@ -366,9 +374,13 @@ and~\ref{tab:nonisoopts}}
 %\qt{british}, which can result in some redundancy.
 %
 %Unfortunately I can't work out how to pick up the language variant
-%or script
-%from \sty{polyglossia}, so only the root languages are detected,
+%or script from \sty{polyglossia}, so only the root languages are detected,
 %which is suboptimal but at least provides some information.
+%(\sty{polyglossia} now provides \cs{xpg@loaded}, which
+%\sty{tracklang} uses to track the root languages, but the language variant
+%command \cs{xpg@vloaded} only seems to be set when the language
+%changes, which doesn't occur until the start of the \env{document}
+%environment.)
 %
 %If the \sty{ngerman} package has been loaded, \styfmt{tracklang}
 %effectively does
@@ -1373,16 +1385,29 @@ and~\ref{tab:nonisoopts}}
 %\begin{definition}[\DescribeMacro\ForEachTrackedDialect]
 %\cs{ForEachTrackedDialect}\marg{cs}\marg{code}
 %\end{definition}
-%At the start of each iteration, this sets \meta{cs} to the 
-%tracked dialect and does \meta{code}.
+%At the start of each iteration, this sets the control sequence 
+%\meta{cs} to the tracked dialect and does \meta{code}.
 %
 %You can iterate through each tracked language using:
 %\begin{definition}[\DescribeMacro\ForEachTrackedLanguage]
 %\cs{ForEachTrackedLanguage}\marg{cs}\marg{code}
 %\end{definition}
-%At the start of each iteration, this sets \meta{cs} to the 
+%At the start of each iteration, this sets the control sequence \meta{cs} to the 
 %tracked language and does \meta{code}.
 %
+%The above for-loops use the same internal mechanism as \LaTeX's
+%\cs{@for} loop. The provided control sequence \meta{cs} is updated at the
+%start of each iteration to the current element. The loop is
+%terminated when this control sequence is set to \cs{@nil}. This
+%special control sequence should never been used as it's just a
+%marker and isn't actually defined. If you get an error message
+%stating that \cs{@nil} is undefined, then it's most likely due to a
+%loop control sequence being used outside the loop. This can occur if
+%the loop contains code that isn't expanded until later. For example,
+%if the loop code includes \cs{AtBeginDocument}, you need to ensure
+%that the loop control sequence is expanded before being added to the
+%hook.
+%
 %You can test if a root language has been detected using:
 %\begin{definition}[\DescribeMacro\IfTrackedLanguage]
 %\cs{IfTrackedLanguage}\marg{label}\marg{true part}\marg{false part}
@@ -3189,7 +3214,7 @@ and~\ref{tab:nonisoopts}}
 % packages such as \styfmt{etoolbox}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2017/03/25 v1.3.4 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2018/02/21 v1.3.5 (NLCT) Track Languages]
 %    \end{macrocode}
 %\begin{macro}{\@tracklang@declareoption}
 % Set up package options.
@@ -3276,12 +3301,36 @@ and~\ref{tab:nonisoopts}}
 % \styfmt{tracklang}.) Script names seem to be stored in 
 % \cs{xpg:scripttag@\meta{language}} but again this doesn't seem to be set
 % for the main language until the start of the document.
+% New versions of \sty{polyglossia} store the list of loaded
+% languages in \cs{xpg@loaded}, so check if this is defined.
 %\changes{1.3}{2016-10-07}{removed hard-coded polyglossia language list}
+%\changes{1.3.5}{2018-02-21}{check for \cs{xpg@loaded}}
+%    \begin{macrocode}
+             \@ifundefined{xpg@loaded}%
+             {%
+%    \end{macrocode}
+%\cs{xpg@loaded} isn't defined, so iterate over known options and
+%check if the language has been loaded.
 %    \begin{macrocode}
-             \@for\this@language:=\@tracklang@declaredoptions\do{%
-               \@ifundefined{\this@language @loaded}%
-               {}%
-               {\@nameuse{@tracklang@add@\this@language}}%
+               \PackageInfo{tracklang}{polyglossia loaded but
+               \string\xpg@loaded\space not defined. Will attempt
+               to track known languages.}%
+                \@for\this@language:=\@tracklang@declaredoptions\do{%
+                  \@ifundefined{\this@language @loaded}%
+                  {}%
+                  {\@nameuse{@tracklang@add@\this@language}}%
+                }%
+             }%
+             {%
+                \@for\this@language:=\xpg@loaded\do{%
+                  \@ifundefined{@tracklang@add@\this@language}%
+                  {%
+                     \PackageWarning{tracklang}%
+                       {Adding unknown polyglossia language `\this@language'}%
+                     \AddTrackedLangage{\this@language}%
+                  }%
+                  {\@nameuse{@tracklang@add@\this@language}}%
+                }%
              }%
            }%
            {%
@@ -3442,8 +3491,8 @@ and~\ref{tab:nonisoopts}}
 %    \end{macrocode}
 % Version info.
 %    \begin{macrocode}
-\expandafter\def\csname ver@tracklang.tex\endcsname{2017/03/25 v1.3.4
-(NLCT) Track Languages Generic Code}
+\expandafter\def\csname ver@tracklang.tex\endcsname{%
+ 2018/02/21 v1.3.5 (NLCT) Track Languages Generic Code}
 %    \end{macrocode}
 % Define a long command for determining the existence of a control
 % sequence by its name. (\cs{relax} is considered undefined.)
@@ -9906,8 +9955,8 @@ and~\ref{tab:nonisoopts}}
 %    \end{macrocode}
 % Version info.
 %    \begin{macrocode}
-\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/11/03 v1.3.3
-(NLCT) Track Languages Regions}%
+\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{%
+ 2018/02/21 v1.3.5 (NLCT) Track Languages Regions}%
 %    \end{macrocode}
 %
 %\begin{macro}{\TrackLangRegionMap}
@@ -10296,7 +10345,7 @@ and~\ref{tab:nonisoopts}}
 %\changes{1.3}{2016-10-07}{added tracklang-scripts.sty}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang-scripts}[2016/11/03 v1.3.3 (NLCT) Track
+\ProvidesPackage{tracklang-scripts}[2018/02/21 v1.3.5 (NLCT) Track
 Language Scripts (LaTeX)]
 \RequirePackage{tracklang}
 \input{tracklang-scripts}
@@ -10337,8 +10386,8 @@ Language Scripts (LaTeX)]
 %    \end{macrocode}
 % Version info.
 %    \begin{macrocode}
-\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/11/03 v1.3.3
-(NLCT) Track Languages Scripts (Generic)}%
+\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{%
+ 2018/02/21 v1.3.5 (NLCT) Track Languages Scripts (Generic)}%
 %    \end{macrocode}
 %
 %\begin{macro}{\TrackLangScriptsMap}
diff --git a/Master/texmf-dist/source/latex/tracklang/tracklang.ins b/Master/texmf-dist/source/latex/tracklang/tracklang.ins
index b69d7e269f9..e2937f28d02 100644
--- a/Master/texmf-dist/source/latex/tracklang/tracklang.ins
+++ b/Master/texmf-dist/source/latex/tracklang/tracklang.ins
@@ -1,14 +1,14 @@
-% tracklang.ins generated using makedtx version 1.1 2017/3/25 20:20
+% tracklang.ins generated using makedtx version 1.2 2018/2/21 13:08
 \input docstrip
 
 \preamble
 
  tracklang.dtx
- Copyright 2017 Nicola Talbot
+ Copyright 2018 Nicola Talbot
 
  This work may be distributed and/or modified under the
  conditions of the LaTeX Project Public License, either version 1.3
- of this license of (at your option) any later version.
+ 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.3 or later is part of all distributions of LaTeX
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
index ccc19438da0..e48f468e588 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
@@ -7,11 +7,11 @@
 %% tracklang.dtx  (with options: `tracklang-region-codes.tex,package')
 %% 
 %%  tracklang.dtx
-%%  Copyright 2017 Nicola Talbot
+%%  Copyright 2018 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  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.3 or later is part of all distributions of LaTeX
@@ -63,8 +63,8 @@
   \@tracklang@regions@restore@at
   \expandafter\endinput
 \fi
-\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/11/03 v1.3.3
-(NLCT) Track Languages Regions}%
+\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{%
+ 2018/02/21 v1.3.5 (NLCT) Track Languages Regions}%
 \def\TrackLangRegionMap#1#2#3{%
   \@tracklang@enamedef{@tracklang@region@numtoalphaii@#1}{#2}%
   \@tracklang@enamedef{@tracklang@region@numtoalphaiii@#1}{#3}%
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
index 0bd6ac34557..47e4aa43caa 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
@@ -7,11 +7,11 @@
 %% tracklang.dtx  (with options: `tracklang-scripts.tex,package')
 %% 
 %%  tracklang.dtx
-%%  Copyright 2017 Nicola Talbot
+%%  Copyright 2018 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  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.3 or later is part of all distributions of LaTeX
@@ -63,8 +63,8 @@
   \@tracklang@scripts@restore@at
   \expandafter\endinput
 \fi
-\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/11/03 v1.3.3
-(NLCT) Track Languages Scripts (Generic)}%
+\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{%
+ 2018/02/21 v1.3.5 (NLCT) Track Languages Scripts (Generic)}%
 \def\TrackLangScriptMap#1#2#3#4#5{%
   \@tracklang@enamedef{TrackLangScript#1}{#1}%
   \@tracklang@enamedef{@tracklang@script@numtoalpha@#2}{#1}%
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
index 415885b6f7c..58ec8f19946 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
@@ -7,11 +7,11 @@
 %% tracklang.dtx  (with options: `tracklang.tex,package')
 %% 
 %%  tracklang.dtx
-%%  Copyright 2017 Nicola Talbot
+%%  Copyright 2018 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  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.3 or later is part of all distributions of LaTeX
@@ -63,8 +63,8 @@
   \@tracklang@restore@at
   \expandafter\endinput
 \fi
-\expandafter\def\csname ver@tracklang.tex\endcsname{2017/03/25 v1.3.4
-(NLCT) Track Languages Generic Code}
+\expandafter\def\csname ver@tracklang.tex\endcsname{%
+ 2018/02/21 v1.3.5 (NLCT) Track Languages Generic Code}
 \long\def\@tracklang@ifundef#1#2#3{%
   \ifcsname#1\endcsname
     \expandafter\ifx\csname #1\endcsname\relax
diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
index 9c1df878c3e..7d192dddddb 100644
--- a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
+++ b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
@@ -7,11 +7,11 @@
 %% tracklang.dtx  (with options: `tracklang-scripts.sty,package')
 %% 
 %%  tracklang.dtx
-%%  Copyright 2017 Nicola Talbot
+%%  Copyright 2018 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  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.3 or later is part of all distributions of LaTeX
@@ -51,7 +51,7 @@
 %% do code now to initialise
 %% Pass all options to tracklang:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang-scripts}[2016/11/03 v1.3.3 (NLCT) Track
+\ProvidesPackage{tracklang-scripts}[2018/02/21 v1.3.5 (NLCT) Track
 Language Scripts (LaTeX)]
 \RequirePackage{tracklang}
 \input{tracklang-scripts}
diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
index 949543cc732..24949e85efd 100644
--- a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
+++ b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
@@ -7,11 +7,11 @@
 %% tracklang.dtx  (with options: `tracklang.sty,package')
 %% 
 %%  tracklang.dtx
-%%  Copyright 2017 Nicola Talbot
+%%  Copyright 2018 Nicola Talbot
 %% 
 %%  This work may be distributed and/or modified under the
 %%  conditions of the LaTeX Project Public License, either version 1.3
-%%  of this license of (at your option) any later version.
+%%  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.3 or later is part of all distributions of LaTeX
@@ -51,7 +51,7 @@
 %% do code now to initialise
 %% Pass all options to tracklang:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2017/03/25 v1.3.4 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2018/02/21 v1.3.5 (NLCT) Track Languages]
 \providecommand*{\@tracklang@declareoption}[1]{%
   \DeclareOption{#1}{\TrackPredefinedDialect{#1}}%
 }
@@ -76,10 +76,27 @@
          {%
            \@ifpackageloaded{polyglossia}
            {%
-             \@for\this@language:=\@tracklang@declaredoptions\do{%
-               \@ifundefined{\this@language @loaded}%
-               {}%
-               {\@nameuse{@tracklang@add@\this@language}}%
+             \@ifundefined{xpg@loaded}%
+             {%
+               \PackageInfo{tracklang}{polyglossia loaded but
+               \string\xpg@loaded\space not defined. Will attempt
+               to track known languages.}%
+                \@for\this@language:=\@tracklang@declaredoptions\do{%
+                  \@ifundefined{\this@language @loaded}%
+                  {}%
+                  {\@nameuse{@tracklang@add@\this@language}}%
+                }%
+             }%
+             {%
+                \@for\this@language:=\xpg@loaded\do{%
+                  \@ifundefined{@tracklang@add@\this@language}%
+                  {%
+                     \PackageWarning{tracklang}%
+                       {Adding unknown polyglossia language `\this@language'}%
+                     \AddTrackedLangage{\this@language}%
+                  }%
+                  {\@nameuse{@tracklang@add@\this@language}}%
+                }%
              }%
            }%
            {%