[latex3-commits] [git/LaTeX3-latex3-latex2e] gh444: Merge branch 'develop' into gh444 (999b86e6)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Dec 7 16:56:29 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : gh444
Link : https://github.com/latex3/latex2e/commit/999b86e640b16bc6a4d2362f43f1b6a4374a3b08
>---------------------------------------------------------------
commit 999b86e640b16bc6a4d2362f43f1b6a4374a3b08
Merge: 4795ed0b 66cd9fd7
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Dec 7 16:56:29 2020 +0100
Merge branch 'develop' into gh444
# Conflicts:
# base/ltfilehook.dtx
# base/ltfinal.dtx
# base/ltfssaxes.dtx
# base/ltfssini.dtx
# base/ltfsstrc.dtx
>---------------------------------------------------------------
999b86e640b16bc6a4d2362f43f1b6a4374a3b08
base/latexrelease.dtx | 6 +-
base/ltbibl.dtx | 8 +--
base/ltboxes.dtx | 6 +-
base/ltdirchk.dtx | 18 +++---
base/ltexpl.dtx | 4 +-
base/ltfilehook.dtx | 20 +++---
base/ltfiles.dtx | 20 +++---
base/ltfinal.dtx | 10 +--
base/ltfloat.dtx | 14 ++---
base/ltfntcmd.dtx | 8 +--
base/ltfssaxes.dtx | 14 ++---
base/ltfssbas.dtx | 26 ++++----
base/ltfsscmp.dtx | 4 +-
base/ltfssdcl.dtx | 4 +-
base/ltfssini.dtx | 38 ++++++------
base/ltfsstrc.dtx | 6 +-
base/lthooks.dtx | 14 ++---
base/ltlength.dtx | 4 +-
base/ltlists.dtx | 12 ++--
base/ltluatex.dtx | 20 +++---
base/ltmath.dtx | 6 +-
base/ltmiscen.dtx | 8 +--
base/ltoutenc.dtx | 12 ++--
base/ltoutput.dtx | 18 +++---
base/ltpage.dtx | 4 +-
base/ltpageno.dtx | 4 +-
base/ltpictur.dtx | 4 +-
base/ltsect.dtx | 4 +-
base/ltshipout.dtx | 6 +-
base/lttextcomp.dtx | 24 ++++----
base/ltvers.dtx | 4 +-
base/ltxdoc.dtx | 4 +-
base/ltxref.dtx | 8 +--
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 20 +++---
.../tlb-latexrelease-rollback-003-often.tlg | 20 +++---
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 20 +++---
base/testfiles/tlb-rollback-004-often.luatex.tlg | 10 +--
base/testfiles/tlb-rollback-004-often.tlg | 10 +--
base/testfiles/tlb-rollback-004-often.xetex.tlg | 10 +--
required/graphics/changes.txt | 5 ++
required/graphics/graphicx.dtx | 5 +-
texmf/tex/latex/l3kernel/expl3-code.tex | 71 ++++++++++++----------
texmf/tex/latex/l3kernel/expl3-generic.tex | 2 +-
texmf/tex/latex/l3kernel/expl3.ltx | 2 +-
texmf/tex/latex/l3kernel/expl3.sty | 2 +-
45 files changed, 275 insertions(+), 264 deletions(-)
diff --cc base/ltfilehook.dtx
index d849b7a8,973d9b7e..b8f68205
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@@ -31,8 -31,8 +31,8 @@@
%%% From File: ltfilehook.dtx
%
% \begin{macrocode}
-\providecommand\ltfilehookversion{v1.0c}
+\providecommand\ltfilehookversion{v1.0d}
- \providecommand\ltfilehookdate{2020/12/04}
+ \providecommand\ltfilehookdate{2020/12/05}
% \end{macrocode}
%
%<*driver>
diff --cc base/ltfinal.dtx
index 1ba47d54,c50ee69b..b9090075
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@@ -33,7 -33,7 +33,7 @@@
%<*driver>
% \fi
\ProvidesFile{ltfinal.dtx}
- [2020/12/04 v2.2k LaTeX Kernel (Final Settings)]
- [2020-12-05 v2.2j LaTeX Kernel (Final Settings)]
++ [2020/12/05 v2.2k LaTeX Kernel (Final Settings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfinal.dtx}
diff --cc base/ltfssaxes.dtx
index 9a5dc8d2,e8d6e9c4..7eade29e
--- a/base/ltfssaxes.dtx
+++ b/base/ltfssaxes.dtx
@@@ -35,7 -35,7 +35,7 @@@
%
%
\ProvidesFile{ltfssaxes.dtx}
- [2020/12/04 v1.0h LaTeX Kernel (NFSS Axes handing)]
- [2020/12/06 v1.0g LaTeX Kernel (NFSS Axes handing)]
++ [2020/12/06 v1.0h LaTeX Kernel (NFSS Axes handing)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
diff --cc base/ltfssini.dtx
index ce457c5c,1f78218b..f44e5a9a
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@@ -36,7 -36,7 +36,7 @@@
%
%
\ProvidesFile{ltfssini.dtx}
- [2020/12/04 v3.2f LaTeX Kernel (NFSS Initialisation)]
- [2020/12/06 v3.2e LaTeX Kernel (NFSS Initialisation)]
++ [2020/12/06 v3.2f LaTeX Kernel (NFSS Initialisation)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
diff --cc base/ltfsstrc.dtx
index 1542db5f,b989de03..7db57d75
--- a/base/ltfsstrc.dtx
+++ b/base/ltfsstrc.dtx
@@@ -32,12 -32,12 +32,12 @@@
%% Copyright (C) 1989-97 by Frank Mittelbach and Rainer Sch\"opf.
%% Copyright (C) 1994-97 by LaTeX3 project. All rights reserved.
%
-%<package>\NeedsTeXFormat{LaTeX2e}[1995/05/16]
+%<package>\NeedsTeXFormat{LaTeX2e}[2021/05/01]
%<package>\ProvidesPackage{tracefnt}
-%<package> [2019/10/11 v3.0l Standard LaTeX package (font tracing)]
+%<package> [2020/12/03 v3.0m Standard LaTeX package (font tracing)]
% \fi
% \ProvidesFile{ltfsstrc.dtx}
- % [2020/12/03 v3.0m LaTeX Kernel (NFSS tracing)]
-% [2020/12/05 v3.0l LaTeX Kernel (NFSS tracing)]
++% [2020/12/05 v3.0m LaTeX Kernel (NFSS tracing)]
%
% \iffalse
%<+checkmem>\CHECKMEM
More information about the latex3-commits
mailing list.