Skip to content

Commit 2344128

Browse files
committed
Remove variants available since 2023-11-27
Th e-type change was 2023-10-10, so this is 'close enough' that it makes sense. I will add all other variants to expl3 at this stage, so there can be another round in a couple of years.
1 parent 273a291 commit 2344128

File tree

6 files changed

+13
-31
lines changed

6 files changed

+13
-31
lines changed

base/changes.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ to completeness or accuracy and it contains some references to files that are
66
not part of the distribution.
77
================================================================================
88

9+
2026-03-13 Joseph Wright <Joseph.Wright@latex-project.org>
10+
* doc.dtx, ltcmd.dtx, ltcmdhooks.dtx, lthooks.dtx, ltkeys.dtx:
11+
Remove variants now available in expl3 core
12+
913
2026-03-12 Joseph Wright <Joseph.Wright@latex-project.org>
1014
* doc.dtx, latexrelease.dtx, ltcmd.dtx, ltcmdhooks.dtx, ltfilehook.dtx,
1115
ltfinal.dtx, ltfssdcl.dtx, lthooks.dtx, ltkeys.dtx, ltmarks.dtx,

base/doc.dtx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
%<+package>
4646
%<+package>\ProvidesPackage{doc}
4747
%<+shortvrb>\ProvidesPackage{shortvrb}
48-
%<+package|shortvrb> [2026-03-12 v3.0r
48+
%<+package|shortvrb> [2026-03-13 v3.0r
4949
%<+package|shortvrb> Standard LaTeX documentation package V3 (FMi)]
5050
%\catcode`\<=12
5151
%
@@ -3563,15 +3563,7 @@
35633563
% \end{macrocode}
35643564
% \end{macro}
35653565
%
3566-
% \begin{macro}{\tl_to_str:o}
3567-
% Another helper: take some token list variable, expand it and turn
3568-
% it into a string.
3569-
% \begin{macrocode}
3570-
\cs_generate_variant:Nn \tl_to_str:n {o}
3571-
% \end{macrocode}
3572-
% \end{macro}
3573-
%
3574-
%
3566+
% \changes{v3.0r}{2026-03-13}{Tidy up variants}
35753567
%
35763568
% ^^A --------------------------------------------------
35773569
%

base/ltcmd.dtx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
%
3636
% \begin{macrocode}
3737
\def\ltcmdversion{v1.3k}
38-
\def\ltcmddate{2026-03-12}
38+
\def\ltcmddate{2026-03-13}
3939
% \end{macrocode}
4040
%
4141
%<*driver>
@@ -1791,6 +1791,7 @@
17911791
%
17921792
% \changes{v1.1e}{2023/05/26}
17931793
% {Use simpler variant \cs{cs_generate_from_arg_count:NNno}}
1794+
% \changes{v1.3k}{2026-03-13}{Tidy up variants}
17941795
% To construct \cs{@@_tmp:w}, first go through the arguments
17951796
% found and the corresponding defaults, building a token list with
17961797
% |{#|\meta{arg number}|}| for arguments found in the input (whose
@@ -1807,7 +1808,6 @@
18071808
\cs_generate_from_arg_count:NNno \@@_tmp:w \cs_set:Npn
18081809
\l_@@_current_arg_int \l_@@_tmpa_tl
18091810
}
1810-
\cs_generate_variant:Nn \cs_generate_from_arg_count:NNnn { NNno }
18111811
\cs_new_protected:Npn \@@_defaults_def:nn
18121812
{
18131813
\int_incr:N \l_@@_current_arg_int
@@ -3721,7 +3721,6 @@
37213721
\cs_replacement_spec:N #1
37223722
}
37233723
}
3724-
\cs_generate_variant:Nn \tl_count:n { e }
37253724
% \end{macrocode}
37263725
%
37273726
% We can reuse most of the above to show an environment, except that

base/ltcmdhooks.dtx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -579,15 +579,6 @@
579579
% \end{macrocode}
580580
% \end{macro}
581581
%
582-
% \subsection{Variants}
583-
%
584-
% \begin{macro}[int]{\tl_rescan:nV}
585-
% \pkg{expl3} function variants used throughout the code.
586-
% \begin{macrocode}
587-
\cs_generate_variant:Nn \tl_rescan:nn { nV }
588-
% \end{macrocode}
589-
% \end{macro}
590-
%
591582
% \subsection{Patching or delaying}
592583
%
593584
% Before |\begin{document}| all patching is delayed.

base/lthooks.dtx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
%<*driver>
3333
% \fi
3434
\ProvidesFile{lthooks.dtx}
35-
[2026-03-12 v1.1o LaTeX Kernel (hooks)]
35+
[2026-03-13 v1.1o LaTeX Kernel (hooks)]
3636
% \iffalse
3737
%
3838
\documentclass{l3in2edoc}
@@ -2475,17 +2475,12 @@
24752475
% \end{macro}
24762476
%
24772477
% \begin{macro}[int]{
2478-
% \tl_set:Ne,
2479-
% \cs_replacement_spec:c,
2480-
% \prop_put:Nne,
24812478
% \str_count:e
24822479
% }
2480+
% \changes{v1.1o}{2026-03-13}{Tidy up variants}
24832481
% Some variants of \pkg{expl3} functions.
24842482
% \fmiinline{should probably be moved to expl3}
24852483
% \begin{macrocode}
2486-
\cs_generate_variant:Nn \tl_set:Nn { Ne }
2487-
\cs_generate_variant:Nn \cs_replacement_spec:N { c }
2488-
\cs_generate_variant:Nn \prop_put:Nnn { Nne }
24892484
\cs_generate_variant:Nn \str_count:n { e }
24902485
% \end{macrocode}
24912486
% \end{macro}

base/ltkeys.dtx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
%<*driver>
3434
% \fi
3535
\ProvidesFile{ltkeys.dtx}
36-
[2026-03-12 v1.0r LaTeX Kernel (Keyval options)]
36+
[2026-03-13 v1.0r LaTeX Kernel (Keyval options)]
3737
% \iffalse
3838
\documentclass{l3in2edoc}
3939
\GetFileInfo{ltkeys.dtx}
@@ -242,10 +242,11 @@
242242
%
243243
% \subsection{Main mechanism}
244244
%
245+
% \changes{v1.0r}{2026-03-13}{Tidy up variants}
246+
%
245247
% \begin{macrocode}
246248
\cs_generate_variant:Nn \clist_if_in:NnT { Ne }
247249
\cs_generate_variant:Nn \clist_if_in:NnTF { Ne }
248-
\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
249250
% \end{macrocode}
250251
%
251252
% \begin{macro}{\l_@@_class_only_clist}

0 commit comments

Comments
 (0)