5 files changed, 68 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/gtl/README.md b/Master/texmf-dist/doc/generic/gtl/README.md
index 6beaf3e95f3..0a9f56a1c0d 100644
--- a/Master/texmf-dist/doc/latex/gtl/README.md
+++ b/Master/texmf-dist/doc/generic/gtl/README.md
@@ -4,7 +4,7 @@ Manipulate unbalanced lists of tokens
 * Released under the LaTeX Project Public License v1.3c or later
   See http://www.latex-project.org/lppl.txt
 
-The `gtl` LaTeX package provides tools to manipulate lists of
+The `gtl` TeX/LaTeX package provides tools to manipulate lists of
 tokens which may be unbalanced.
 
 This package requires up-to-date versions of the `l3kernel`,
diff --git a/Master/texmf-dist/doc/latex/gtl/gtl.pdf b/Master/texmf-dist/doc/generic/gtl/gtl.pdf
index c433e7a2e27..1d8fc7ddb0a 100644
--- a/Master/texmf-dist/doc/latex/gtl/gtl.pdf
+++ b/Master/texmf-dist/doc/generic/gtl/gtl.pdf
diff --git a/Master/texmf-dist/source/latex/gtl/gtl.dtx b/Master/texmf-dist/source/generic/gtl/gtl.dtx
index b4f622066bf..f197c8ad13c 100644
--- a/Master/texmf-dist/source/latex/gtl/gtl.dtx
+++ b/Master/texmf-dist/source/generic/gtl/gtl.dtx
@@ -23,9 +23,9 @@
 %
 % \title{The \textsf{gtl} package: \\
 %   manipulate unbalanced lists of tokens\thanks{This
-%     file has version number 0.1, last revised 2015/09/21.}}
+%     file has version number 0.2, last revised 2015/09/29.}}
 % \author{Bruno Le Floch}
-% \date{2015/09/21}
+% \date{2015/09/29}
 %
 % \maketitle
 % \tableofcontents
@@ -305,7 +305,8 @@
 %     ../../testfiles/gtl003.lvt ,
 %     ../../testfiles/gtl004.lvt ,
 %     ../../testfiles/gtl005.lvt ,
-%     ../../testfiles/gtl006.lvt
+%     ../../testfiles/gtl006.lvt ,
+%     ../../testfiles/gtl007.lvt
 %   }
 % \group_begin:
 %   \seq_set_eq:NN \l__gtldoc_internal_seq \l__gtldoc_fn_seq
@@ -744,13 +745,39 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\RequirePackage{expl3}[2015/09/11]
-\ProvidesExplPackage
-  {gtl} {2015/09/21} {0.1} {Manipulate unbalanced lists of tokens}
+%<@@=gtl>
 %    \end{macrocode}
 %
+% Load \pkg{expl3}, either through \cs{RequirePackage} or through
+% inputting the generic loader, depending on the format in use.
 %    \begin{macrocode}
-%<@@=gtl>
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input expl3-generic.tex
+\else
+  \RequirePackage{expl3}[2015/09/11]
+\fi
+\ExplSyntaxOn
+\cs_if_exist:NTF \ProvidesExplPackage
+  {
+    \cs_new_eq:NN \@@_end_package_hook: \prg_do_nothing:
+    \ExplSyntaxOff
+    \ProvidesExplPackage
+  }
+  {
+    \cs_new_eq:NN \@@_end_package_hook: \ExplSyntaxOff
+    \group_begin:
+    \ExplSyntaxOff
+    \cs_set_protected:Npn \@@_tmp:w #1#2#3#4
+      {
+        \group_end:
+        \tl_gset:cx { ver @ #1 . sty } { #2 ~ v#3 ~ #4 }
+        \cs_if_exist_use:NF \wlog { \iow_log:x }
+          { Package: ~ #1 ~ #2 ~ v#3 ~ #4 }
+      }
+    \@@_tmp:w
+  }
+      {gtl} {2015/09/29} {0.2} {Manipulate unbalanced lists of tokens}
 %    \end{macrocode}
 %
 % \subsection{Helpers}
@@ -830,7 +857,7 @@
 % note that a balanced sub-list of a gtl must be entirely contained in
 % one of the chunk.
 %
-% \begin{variable}{\s_@@}
+% \begin{variable}[aux]{\s_@@}
 %   This marker appears at the start of extended token lists.
 %    \begin{macrocode}
 \cs_new_eq:NN \s_@@ \scan_stop:
@@ -1831,6 +1858,10 @@
 % \end{macro}
 %
 %    \begin{macrocode}
+\@@_end_package_hook:
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 %</package>
 %    \end{macrocode}
 %
diff --git a/Master/texmf-dist/source/latex/gtl/gtl.ins b/Master/texmf-dist/source/generic/gtl/gtl.ins
index 0f77d88503a..0f77d88503a 100644
--- a/Master/texmf-dist/source/latex/gtl/gtl.ins
+++ b/Master/texmf-dist/source/generic/gtl/gtl.ins
diff --git a/Master/texmf-dist/tex/latex/gtl/gtl.sty b/Master/texmf-dist/tex/generic/gtl/gtl.sty
index 113686781c5..45525f44c1b 100644
--- a/Master/texmf-dist/tex/latex/gtl/gtl.sty
+++ b/Master/texmf-dist/tex/generic/gtl/gtl.sty
@@ -21,9 +21,33 @@
 %%    http://www.latex-project.org/lppl.txt
 %%
 %% -----------------------------------------------------------------------
-\RequirePackage{expl3}[2015/09/11]
-\ProvidesExplPackage
-  {gtl} {2015/09/21} {0.1} {Manipulate unbalanced lists of tokens}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax
+  \input expl3-generic.tex
+\else
+  \RequirePackage{expl3}[2015/09/11]
+\fi
+\ExplSyntaxOn
+\cs_if_exist:NTF \ProvidesExplPackage
+  {
+    \cs_new_eq:NN \__gtl_end_package_hook: \prg_do_nothing:
+    \ExplSyntaxOff
+    \ProvidesExplPackage
+  }
+  {
+    \cs_new_eq:NN \__gtl_end_package_hook: \ExplSyntaxOff
+    \group_begin:
+    \ExplSyntaxOff
+    \cs_set_protected:Npn \__gtl_tmp:w #1#2#3#4
+      {
+        \group_end:
+        \tl_gset:cx { ver @ #1 . sty } { #2 ~ v#3 ~ #4 }
+        \cs_if_exist_use:NF \wlog { \iow_log:x }
+          { Package: ~ #1 ~ #2 ~ v#3 ~ #4 }
+      }
+    \__gtl_tmp:w
+  }
+      {gtl} {2015/09/29} {0.2} {Manipulate unbalanced lists of tokens}
 \cs_generate_variant:Nn \use:nn { no }
 \cs_new:Npn \__gtl_exp_not_n:N #1 { \exp_not:n {#1} }
 \cs_new:Npn \__gtl_brace:nn #1#2 { { #1 #2 } }
@@ -622,6 +646,7 @@
           }
       }
   }
+\__gtl_end_package_hook:
 %% 
 %%
 %% End of file `gtl.sty'.