tracklang (11oct16)

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

3 files changed, 37 insertions, 33 deletions

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