tracklang (11oct16)

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

34 files changed, 110 insertions, 81 deletions

diff --git a/Master/texmf-dist/doc/generic/tracklang/CHANGES b/Master/texmf-dist/doc/generic/tracklang/CHANGES
index 83d6319d5cf..be87ecef2a8 100644
--- a/Master/texmf-dist/doc/generic/tracklang/CHANGES
+++ b/Master/texmf-dist/doc/generic/tracklang/CHANGES
@@ -1,3 +1,8 @@
+v1.3.2 (2016-10-11):
+
+  * Added check if \shellescape has been set to \relax
+    by something loaded before tracklang.
+
 v1.3.1 (2016-10-08):
 
   * Added missing files from tracklang.tds.zip
diff --git a/Master/texmf-dist/doc/generic/tracklang/README b/Master/texmf-dist/doc/generic/tracklang/README
index 976629f1fe6..32dbd9bbb2c 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.1 
+Generic TeX Bundle : tracklang v1.3.2 
 
-Last Modified      : 2016-10-08
+Last Modified      : 2016-10-11
 
 Author             : Nicola Talbot
 
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 552af54218c..ab1f40cb7bd 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 ce04fe77c32..13890b47a2b 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 b9c3652bd1e..38fae5f12f6 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 325d787c76c..631803d8302 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 7304d9cf606..c5361023ba9 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 aeea3968eec..52262ceedaf 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 186ee2ed1b7..f9d7457ab6b 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 36e7da904de..c67b81826e4 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 9e71298774b..21aedbb4567 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 dd88d1544af..e83fe678491 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 de60e31ba65..918b2db0276 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 b77f11c9acc..f7f918dddce 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 4487046f64d..b755bf44e36 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 09df98bfbd3..bff2b5a744f 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 610f7cc1fc2..5bcda55e924 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 6852f0604b2..91185da1099 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 3314660bd96..78357816451 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 98eee51469c..431e32fd155 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 6de8d39baf6..5115d8af5f5 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 6a6db004ec5..ef04f560c9a 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 3a0112bf2ea..37675bf7773 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 14de7fa936f..fadb57779b9 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 3cb3d467574..6cae9237d30 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 1791b46eca2..8363e6c0f98 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 a86a5271d37..577036ae75e 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 af62e33d90d..98a2e09362a 100644
--- a/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
+++ b/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
@@ -1,16 +1,16 @@
 %\iffalse
 % tracklang.dtx generated using makedtx version 1.1 (c) Nicola Talbot
 % Command line args:
-%   -section "chapter"
 %   -author "Nicola Talbot"
+%   -section "chapter"
+%   -doc "tracklang-manual.tex"
 %   -src "tracklang.sty\Z=>tracklang.sty"
 %   -src "tracklang.tex\Z=>tracklang.tex"
 %   -src "tracklang-region-codes.tex\Z=>tracklang-region-codes.tex"
 %   -src "tracklang-scripts.sty\Z=>tracklang-scripts.sty"
 %   -src "tracklang-scripts.tex\Z=>tracklang-scripts.tex"
-%   -doc "tracklang-manual.tex"
 %   tracklang
-% Created on 2016/10/8 12:58
+% Created on 2016/10/11 9:50
 %\fi
 %\iffalse
 %<*package>
@@ -59,7 +59,7 @@
             pdfauthor={Nicola L.C. Talbot},
             pdftitle={tracklang: tracking language options}]{hyperref}
 
-\CheckSum{3861}
+\CheckSum{3870}
 
 \appto\MacroFont{\scriptsize}
 \renewcommand*{\usage}[1]{\textit{\hyperpage{#1}}}
@@ -278,11 +278,11 @@ and~\ref{tab:nonisoopts}}
 %
 %\MakeShortVerb{"}
 %
-%\title{tracklang v1.3.1:
+%\title{tracklang v1.3.2:
 %tracking language options}
 %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}}
 %
-%\date{2016-10-08}
+%\date{2016-10-11}
 %\maketitle
 %
 %\begin{abstract}
@@ -3191,7 +3191,7 @@ and~\ref{tab:nonisoopts}}
 % packages such as \styfmt{etoolbox}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2016/10/08 v1.3.1 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2016/10/11 v1.3.2 (NLCT) Track Languages]
 %    \end{macrocode}
 %\begin{macro}{\@tracklang@declareoption}
 % Set up package options.
@@ -3444,7 +3444,7 @@ and~\ref{tab:nonisoopts}}
 %    \end{macrocode}
 % Version info.
 %    \begin{macrocode}
-\expandafter\def\csname ver@tracklang.tex\endcsname{2016/10/08 v1.3.1
+\expandafter\def\csname ver@tracklang.tex\endcsname{2016/10/11 v1.3.2
 (NLCT) Track Languages Generic Code}
 %    \end{macrocode}
 % Define a long command for determining the existence of a control
@@ -3766,9 +3766,27 @@ and~\ref{tab:nonisoopts}}
 %    \end{macrocode}
 %We can't use Lua, so we'll have to use the shell escape if it's
 %enabled. First determine if the shell escape is available.
+%\begin{macro}{\@tracklang@tryshellescape}
+%No shell escape.
 %    \begin{macrocode}
-   \ifx\shellescape\undefined
-     \ifx\pdfshellescape\undefined
+  \def\@tracklang@tryshellescape#1{%
+   \def\TrackLangQueryEnv{%
+     \@tracklang@warn{\string\TrackLangQueryEnv\space
+     non-operational as shell escape has been disabled}%
+     \def\TrackLangEnv{}%
+   }%
+   \def\TrackLangQueryOtherEnv##1{%
+     \@tracklang@warn{\string\TrackLangQueryOtherEnv{##1}\space
+     non-operational as shell escape has been disabled}%
+     \def\TrackLangEnv{}%
+   }%
+  }%
+%    \end{macrocode}
+%\changes{1.3.2}{2016-10-11}{added check if \cs{shellescape} has
+%been set to \cs{relax}}
+%    \begin{macrocode}
+   \ifx\pdfshellescape\undefined
+     \ifx\shellescape\undefined
 %    \end{macrocode}
 % Can't determine if the shell escape has been enabled.
 %    \begin{macrocode}
@@ -3790,47 +3808,49 @@ and~\ref{tab:nonisoopts}}
         }%
      \else
 %    \end{macrocode}
-%\cs{pdfshellescape} is defined
+%\cs{shellescape} is defined. Check no one's been messing around
+%with it and set it to \cs{relax}.
 %    \begin{macrocode}
-       \ifnum\pdfshellescape=0\relax
-         \def\@tracklang@tryshellescape#1{%
-          \def\TrackLangQueryEnv{%
-            \@tracklang@warn{\string\TrackLangQueryEnv\space
-            non-operational as shell escape has been disabled}%
-            \def\TrackLangEnv{}%
-          }%
-          \def\TrackLangQueryOtherEnv##1{%
-            \@tracklang@warn{\string\TrackLangQueryOtherEnv{##1}\space
-            non-operational as shell escape has been disabled}%
-            \def\TrackLangEnv{}%
-          }%
-         }%
+       \ifx\shellescape\relax
        \else
-         \def\@tracklang@tryshellescape#1{#1}%
+         \ifnum\shellescape=0\relax
+         \else
+           \def\@tracklang@tryshellescape#1{#1}%
+         \fi
        \fi
      \fi
    \else
 %    \end{macrocode}
-% \cs{shellescape} is defined
+%\cs{pdfshellescape} is defined. Check no one's been messing around
+%with it and set it to \cs{relax}. (Default no-op already set.)
 %    \begin{macrocode}
-     \ifnum\shellescape=0\relax
-       \def\@tracklang@tryshellescape#1{%
-        \def\TrackLangQueryEnv{%
-          \@tracklang@warn{\string\TrackLangQueryEnv\space
-          non-operational as shell escape has been disabled}%
-          \def\TrackLangEnv{}%
-        }%
-        \def\TrackLangQueryOtherEnv##1{%
-          \@tracklang@warn{\string\TrackLangQueryOtherEnv{##1}\space
-          non-operational as shell escape has been disabled}%
-          \def\TrackLangEnv{}%
-        }%
-       }%
+     \ifx\pdfshellescape\relax
+%    \end{macrocode}
+%\cs{pdfshellescape} has been set to \cs{relax}. Is it possible that
+%\cs{shellescape} is available?
+%    \begin{macrocode}
+       \ifx\shellescape\undefined
+       \else
+         \ifx\shellescape\relax
+         \else
+%    \end{macrocode}
+%\cs{shellescape} is available.
+%    \begin{macrocode}
+           \ifnum\shellescape=0\relax
+           \else
+             \def\@tracklang@tryshellescape#1{#1}%
+           \fi
+         \fi
+       \fi
      \else
-       \def\@tracklang@tryshellescape#1{#1}%
+       \ifnum\pdfshellescape=0\relax
+       \else
+         \def\@tracklang@tryshellescape#1{#1}%
+       \fi
      \fi
    \fi
 %    \end{macrocode}
+%\end{macro}
 % Try the shell escape:
 %    \begin{macrocode}
    \@tracklang@tryshellescape
@@ -9806,7 +9826,7 @@ and~\ref{tab:nonisoopts}}
 %    \end{macrocode}
 % Version info.
 %    \begin{macrocode}
-\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/10/08 v1.3.1
+\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/10/11 v1.3.2
 (NLCT) Track Languages Regions}%
 %    \end{macrocode}
 %
@@ -10196,7 +10216,7 @@ and~\ref{tab:nonisoopts}}
 %\changes{1.3}{2016-10-07}{added tracklang-scripts.sty}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang-scripts}[2016/10/08 v1.3.1 (NLCT) Track
+\ProvidesPackage{tracklang-scripts}[2016/10/11 v1.3.2 (NLCT) Track
 Language Scripts (LaTeX)]
 \RequirePackage{tracklang}
 \input{tracklang-scripts}
@@ -10237,7 +10257,7 @@ Language Scripts (LaTeX)]
 %    \end{macrocode}
 % Version info.
 %    \begin{macrocode}
-\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/10/08 v1.3.1
+\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/10/11 v1.3.2
 (NLCT) Track Languages Scripts (Generic)}%
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/tracklang/tracklang.ins b/Master/texmf-dist/source/latex/tracklang/tracklang.ins
index 4f65a244e0f..95d515ac560 100644
--- a/Master/texmf-dist/source/latex/tracklang/tracklang.ins
+++ b/Master/texmf-dist/source/latex/tracklang/tracklang.ins
@@ -1,4 +1,4 @@
-% tracklang.ins generated using makedtx version 1.1 2016/10/8 12:58
+% tracklang.ins generated using makedtx version 1.1 2016/10/11 9:50
 \input docstrip
 
 \preamble
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 9e14e121722..b7691bbe4a7 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
@@ -63,7 +63,7 @@
   \@tracklang@regions@restore@at
   \expandafter\endinput
 \fi
-\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/10/08 v1.3.1
+\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/10/11 v1.3.2
 (NLCT) Track Languages Regions}%
 \def\TrackLangRegionMap#1#2#3{%
   \@tracklang@enamedef{@tracklang@region@numtoalphaii@#1}{#2}%
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
index 5dd8ce6d36d..fd1c500fd96 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
@@ -63,7 +63,7 @@
   \@tracklang@scripts@restore@at
   \expandafter\endinput
 \fi
-\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/10/08 v1.3.1
+\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/10/11 v1.3.2
 (NLCT) Track Languages Scripts (Generic)}%
 \def\TrackLangScriptMap#1#2#3#4#5{%
   \@tracklang@enamedef{TrackLangScript#1}{#1}%
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
index f303b55c09b..8b61a93462e 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
@@ -63,7 +63,7 @@
   \@tracklang@restore@at
   \expandafter\endinput
 \fi
-\expandafter\def\csname ver@tracklang.tex\endcsname{2016/10/08 v1.3.1
+\expandafter\def\csname ver@tracklang.tex\endcsname{2016/10/11 v1.3.2
 (NLCT) Track Languages Generic Code}
 \long\def\@tracklang@ifundef#1#2#3{%
   \ifcsname#1\endcsname
@@ -239,8 +239,20 @@
 \def\@tracklang@locale@posix{POSIX}
 \def\@tracklang@locale@c{C}
 \ifx\directlua\undefined
-   \ifx\shellescape\undefined
-     \ifx\pdfshellescape\undefined
+  \def\@tracklang@tryshellescape#1{%
+   \def\TrackLangQueryEnv{%
+     \@tracklang@warn{\string\TrackLangQueryEnv\space
+     non-operational as shell escape has been disabled}%
+     \def\TrackLangEnv{}%
+   }%
+   \def\TrackLangQueryOtherEnv##1{%
+     \@tracklang@warn{\string\TrackLangQueryOtherEnv{##1}\space
+     non-operational as shell escape has been disabled}%
+     \def\TrackLangEnv{}%
+   }%
+  }%
+   \ifx\pdfshellescape\undefined
+     \ifx\shellescape\undefined
         \def\@tracklang@tryshellescape#1{%
           \def\TrackLangQueryEnv{%
             \@tracklang@warn{\string\TrackLangQueryEnv\space
@@ -258,39 +270,31 @@
           }%
         }%
      \else
-       \ifnum\pdfshellescape=0\relax
-         \def\@tracklang@tryshellescape#1{%
-          \def\TrackLangQueryEnv{%
-            \@tracklang@warn{\string\TrackLangQueryEnv\space
-            non-operational as shell escape has been disabled}%
-            \def\TrackLangEnv{}%
-          }%
-          \def\TrackLangQueryOtherEnv##1{%
-            \@tracklang@warn{\string\TrackLangQueryOtherEnv{##1}\space
-            non-operational as shell escape has been disabled}%
-            \def\TrackLangEnv{}%
-          }%
-         }%
+       \ifx\shellescape\relax
        \else
-         \def\@tracklang@tryshellescape#1{#1}%
+         \ifnum\shellescape=0\relax
+         \else
+           \def\@tracklang@tryshellescape#1{#1}%
+         \fi
        \fi
      \fi
    \else
-     \ifnum\shellescape=0\relax
-       \def\@tracklang@tryshellescape#1{%
-        \def\TrackLangQueryEnv{%
-          \@tracklang@warn{\string\TrackLangQueryEnv\space
-          non-operational as shell escape has been disabled}%
-          \def\TrackLangEnv{}%
-        }%
-        \def\TrackLangQueryOtherEnv##1{%
-          \@tracklang@warn{\string\TrackLangQueryOtherEnv{##1}\space
-          non-operational as shell escape has been disabled}%
-          \def\TrackLangEnv{}%
-        }%
-       }%
+     \ifx\pdfshellescape\relax
+       \ifx\shellescape\undefined
+       \else
+         \ifx\shellescape\relax
+         \else
+           \ifnum\shellescape=0\relax
+           \else
+             \def\@tracklang@tryshellescape#1{#1}%
+           \fi
+         \fi
+       \fi
      \else
-       \def\@tracklang@tryshellescape#1{#1}%
+       \ifnum\pdfshellescape=0\relax
+       \else
+         \def\@tracklang@tryshellescape#1{#1}%
+       \fi
      \fi
    \fi
    \@tracklang@tryshellescape
diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
index 4146f4d7f9e..7bfb31cc4a1 100644
--- a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
+++ b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
@@ -51,7 +51,7 @@
 %% do code now to initialise
 %% Pass all options to tracklang:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang-scripts}[2016/10/08 v1.3.1 (NLCT) Track
+\ProvidesPackage{tracklang-scripts}[2016/10/11 v1.3.2 (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 67a4a9d264c..69a0dfc99ce 100644
--- a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
+++ b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
@@ -51,7 +51,7 @@
 %% do code now to initialise
 %% Pass all options to tracklang:
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2016/10/08 v1.3.1 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2016/10/11 v1.3.2 (NLCT) Track Languages]
 \providecommand*{\@tracklang@declareoption}[1]{%
   \DeclareOption{#1}{\TrackPredefinedDialect{#1}}%
 }