summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-16 21:26:52 +0000
committerKarl Berry <karl@freefriends.org>2021-11-16 21:26:52 +0000
commitc88c1ecb068070a6e69006788a141eea3fba4b0e (patch)
treecb42252875f8c09354da3cd06e274238a8b85c45 /Master/texmf-dist/tex/latex-dev
parent0cc16768f4401ff12fa4ec4c983125ab6ba9e70a (diff)
latex-dev (16nov21)
git-svn-id: svn://tug.org/texlive/trunk@61076 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev')
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latex.ltx6
-rw-r--r--Master/texmf-dist/tex/latex-dev/base/latexrelease.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx44
-rw-r--r--Master/texmf-dist/tex/latex-dev/tools/multicol.sty23
4 files changed, 18 insertions, 59 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index 54ca1a8d465..56869faecb1 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
@@ -691,8 +691,8 @@
%%% From File: ltvers.dtx
\def\fmtname{LaTeX2e}
\edef\fmtversion
- {2021-11-15}
-\def\patch@level{-3}
+ {2022-06-01}
+\def\patch@level{0}
\edef\development@branch@name{develop \the\year-\the\month-\the\day}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
@@ -6291,7 +6291,7 @@ Type H <return> for immediate help.}%
%% File: ltpara.dtx (C) Copyright 2020-2021
%%% From File: ltpara.dtx
\def\ltparaversion{v1.0k}
-\def\ltparadate{2021/10/19}
+\def\ltparadate{2021/11/11}
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
index 96c73e3caa2..b1a14ecb3c3 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex-dev/base/latexrelease.sty
@@ -288,7 +288,7 @@
}
%%% From File: ltvers.dtx
\edef\latexreleaseversion
- {2021-11-15}
+ {2022-06-01}
\newif\if@includeinrelease
\@includeinreleasefalse
\def\IncludeInRelease#1{%
@@ -6470,7 +6470,7 @@ of this package available from CTAN}
%% File: ltpara.dtx (C) Copyright 2020-2021
%%% From File: ltpara.dtx
\def\ltparaversion{v1.0k}
-\def\ltparadate{2021/10/19}
+\def\ltparadate{2021/11/11}
\ExplSyntaxOn
diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx
index f4799c0581e..cf96c582e7e 100644
--- a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx
+++ b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx
@@ -34,8 +34,8 @@
%%
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
-\def\LaTeXFirstAidDate{2021/06/28}
-\def\LaTeXFirstAidVersion{v1.0o}
+\def\LaTeXFirstAidDate{2021/11/11}
+\def\LaTeXFirstAidVersion{v1.0q}
\ProvidesFile{latex2e-first-aid-for-external-files.ltx}
[\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space
LaTeX kernel fixes to external files and packages]
@@ -85,21 +85,6 @@
}
}
\ExplSyntaxOff
-\DeclareCommandCopy\CJK@selectfont\selectfont
-\AddToHook{file/CJK.sty/after}[firstaid]{%
- \FirstAidNeededT{CJK}{sty}%
- {2015/04/18 4.8.4}%
- {%
- \DeclareCommandCopy\selectfont\CJK@selectfont
- \AddToHook{selectfont}[CJK]{%
- \expandafter\ifx\csname CJK@\curr@fontshape\endcsname \relax
- \else
- \CJK@bold@false
- \csname CJK@\curr@fontshape\endcsname
- \fi
- }%
- }%
-}
\AddToHook{file/bigfoot.sty/after}{%
\ifnum\count10<\insc@unt
\global\count10=\insc@unt
@@ -191,31 +176,6 @@
\group_end:
}
\ExplSyntaxOff
-\ExplSyntaxOn
-\cs_set_protected:Npn \para_end: {
- \scan_stop:
- \mode_if_horizontal:TF {
- \mode_if_inner:F {
- \tex_unskip:D
- \hook_use:n{para/end}
- \@kernel@after@para@end
- \mode_if_horizontal:TF {
- \if_int_compare:w 0 < \tex_lastnodetype:D
- \tex_kern:D \c_zero_dim
- \fi:
- \tex_par:D
- \hook_use:n{para/after}
- \@kernel@after@para@after
- }
- { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} }
- }
- }
- \tex_par:D
-}
-\cs_set_eq:NN \par \para_end:
-\cs_set_eq:NN \@@par \para_end:
-\cs_set_eq:NN \endgraf \para_end:
-\ExplSyntaxOff
\endinput
%%
%% End of file `latex2e-first-aid-for-external-files.ltx'.
diff --git a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
index 1cf82bbdee8..4f11a7584fc 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
@@ -107,7 +107,7 @@
\DeclareCurrentRelease{}{2018-04-01}
\ProvidesPackage{multicol}
- [2021/10/08 v1.9a multicolumn formatting (FMi)]
+ [2021/10/28 v1.9b multicolumn formatting (FMi)]
%%
\DeclareOption{twocolumn}
{\PackageWarning{multicol}{May not work
@@ -454,7 +454,7 @@
\shr@nkingtrue
\fi
\fi
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\setbox\count@
\vsplit\@cclv to\dimen@
\set@keptmarks
@@ -698,7 +698,7 @@
\copy\mult@box
\too@badfalse
\forcedbreak@leftoverfalse
- {\process@cols\mult@firstbox{%
+ {\process@cols\mult@gfirstbox{%
\global\setbox\count@
\vsplit\mult@grightbox to\dimen@
\global\setbox\count@
@@ -723,7 +723,7 @@
\global\setbox\mult@grightbox
\vbox{\unvbox\mult@grightbox}%
\setbox\mult@nat@firstbox
- \vbox{\unvcopy\mult@firstbox}%
+ \vbox{\unvcopy\mult@gfirstbox}%
\ifnum\c@tracingmulticols>\@ne
\message{^^JFirst column
= \the\dimen@\space
@@ -837,14 +837,14 @@
\maxbalancingoverflow=12pt
\ifnum\numexpr
- \count20-\count14-1<41
- % this is = 2 * 20 + 1
+ \count20-\count14-1<40
+ % this is = 2 * 20
\count14=\@cclv
\fi
\newbox\mult@rightbox
\newbox\mult@grightbox
-\newbox\mult@gfirstbox
\newbox\mult@firstbox
+\newbox\mult@gfirstbox
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
@@ -863,7 +863,6 @@
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
\newbox\@tempa\newbox\@tempa
-\newbox\@tempa
\let\@tempa\relax
\@ifundefined{emergencystretch}
{\newdimen\emergencystretch}{}
@@ -1002,7 +1001,7 @@
\newcommand\columnbreak[1][4]{%
\ifnum\col@number<\tw@
\PackageError{multicol}%
- {\noexpand\newcolumn outside multicols}%
+ {\noexpand\columnbreak outside multicols}%
{This command can only be used within
a multicols or multicols* environment.}%
\else
@@ -1033,7 +1032,7 @@
\fi}
\newbox\colbreak@box
\def\LR@column@boxes{%
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
\mc@col@status@write
@@ -1047,13 +1046,13 @@
}
\def\RL@column@boxes{%
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\hskip\hsize
\hss{\columnseprulecolor\vrule
\@width\columnseprule}\hss
}%
\hskip\hsize
- \process@cols\mult@gfirstbox{%
+ \process@cols\mult@firstbox{%
\ifdim\dp\count@>\dimen\tw@
\global\dimen\tw@\dp\count@ \fi
\hskip-\hsize