summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/generic/gtl/gtl.dtx (renamed from Master/texmf-dist/source/latex/gtl/gtl.dtx)47
-rw-r--r--Master/texmf-dist/source/generic/gtl/gtl.ins (renamed from Master/texmf-dist/source/latex/gtl/gtl.ins)0
2 files changed, 39 insertions, 8 deletions
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