summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-07 20:52:53 +0000
committerKarl Berry <karl@freefriends.org>2020-10-07 20:52:53 +0000
commitd9b1ec3c205a61c913ac359ae066e75b37329f48 (patch)
tree70de3ef023d9b5a573b1cb788468710577f0a4f6 /Master/texmf-dist/tex/platex
parent1f1d5f72b672dfac7da6d3b26c1b84945a81eb50 (diff)
platex (6oct20)
git-svn-id: svn://tug.org/texlive/trunk@56582 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty49
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx47
-rw-r--r--Master/texmf-dist/tex/platex/base/plext.sty36
3 files changed, 74 insertions, 58 deletions
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 95f5ee2d122..b54874f3f00 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -6,6 +6,7 @@
%%
%% plvers.dtx (with options: `platexrelease')
%% platexrelease.dtx (with options: `platexrelease')
+%% plvers.dtx (with options: `plhookrelease')
%% plexpl3.dtx (with options: `platexrelease')
%% plfonts.dtx (with options: `platexrelease')
%% plcore.dtx (with options: `platexrelease')
@@ -143,6 +144,8 @@ of this package available from CTAN}
some critical bugs. We advise you to\MessageBreak
select another format date}
\plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}%
+ % * <2020-10-01>+1
+ % * <2020-10-01>
% * <2020-04-12>
% * <2020-02-02>+3
% * <2020-02-02>+2
@@ -203,6 +206,9 @@ of this package available from CTAN}
\plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}%
% * <2006/11/10>
\plEndIncludeInRelease
+%% File: plvers.dtx
+\chardef\pltx@newhook@avail=\z@
+\@ifl@t@r\fmtversion{2020/10/01}{\chardef\pltx@newhook@avail=\@ne}{}
%% File: plexpl3.dtx
\plIncludeInRelease{2020/10/01}%
{plexpl3}{Pre-load plexpl3}%
@@ -1234,7 +1240,7 @@ of this package available from CTAN}
\plEndIncludeInRelease
\plIncludeInRelease{2020/04/12}{\normalfont}
{Use \@defaultfamilyhook}%
-\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN
+\ifnum\pltx@newhook@avail=\z@ % --- for <= 2020-02-02 BEGIN
\ifx\@defaultfamilyhook\@undefined % old
\DeclareRobustCommand\normalfont{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -1261,14 +1267,14 @@ of this package available from CTAN}
\edef\k@shape{\kanjishapedefault}%
}
\fi % done
-\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN
\DeclareRobustCommand\normalfont{%
\fontencoding\encodingdefault
\edef\f@family{\familydefault}%
\edef\f@series{\seriesdefault}%
\edef\f@shape{\shapedefault}%
\UseHook{normalfont}%
- \@defaultfamilyhook % hookname from 2020/02 will vanish
+ \@defaultfamilyhook % hookname from 2020/02 will vanish
\selectfont}
\AddToHook{normalfont}{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -1276,7 +1282,7 @@ of this package available from CTAN}
\edef\k@series{\kanjiseriesdefault}%
\edef\k@shape{\kanjishapedefault}%
}
-\fi % --- for 2020-10-01 END
+\fi % --- for >= 2020-10-01 END
\adjustbaseline
\let\reset@font\normalfont
\plEndIncludeInRelease
@@ -1321,23 +1327,23 @@ of this package available from CTAN}
\edef\mdseries@mc{\mddefault}% m
\edef\mdseries@gt{\mddefault}% m
\fi
-\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\g@addto@macro\expand@font@defaults{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
\edef\kanjidef@ult{\kanjifamilydefault}%
}
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\AddToHook{expand@font@defaults}{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
%\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n
}
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
-\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
+\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\DeclareRobustCommand\bfseries{%
\not@math@alphabet\bfseries\mathbf
\expand@font@defaults
@@ -1370,7 +1376,7 @@ of this package available from CTAN}
\fi\fi
\selectfont
}
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\AddToHook{bfseries/defaults}{%
\let\bfseries@mc\bfdef@ult
\let\bfseries@gt\bfdef@ult
@@ -1393,8 +1399,8 @@ of this package available from CTAN}
\else \kanjiseries\mddefault
\fi\fi
}
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
\ifx\prepare@family@series@update\@undefined % old
\let\prepare@family@series@update@kanji\@undefined
\let\@meta@family@list@kanji\@undefined
@@ -1475,14 +1481,14 @@ of this package available from CTAN}
}
\fi
\expandafter\ifx\csname init@series@setup\endcsname\relax
-\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\g@addto@macro\init@series@setup{%
\ifx\kanjidef@ult\mcdef@ult \mcfamily
\else\ifx\kanjidef@ult\gtdef@ult \gtfamily
\fi\fi
}%
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\g@addto@macro\init@series@setup{%
% !! sync with 2020/04/13 v3.1n BEGIN
\ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
@@ -1491,15 +1497,14 @@ of this package available from CTAN}
\fi
% !! sync with 2020/04/13 v3.1n END
}%
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined
-\else % --- for LaTeX2e 2020-10-01 or later BEGIN
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail>\z@ % --- for >= 2020-10-01 BEGIN
\def\code@after@pldefs{%
\expandafter\def\expandafter\kanjiseriesdefault
\expandafter{\kanjiseriesdefault\@empty}
\let\kanjiseriesdefault@kernel\kanjiseriesdefault}
-\fi % --- for LaTeX2e 2020-10-01 or later END
+\fi % --- for >= 2020-10-01 END
\ifx\prepare@family@series@update@kanji\@undefined % old
\DeclareRobustCommand\mcfamily
{\not@math@alphabet\mcfamily\mathmc
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 97f42e307b2..b3189fc5399 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -35,7 +35,7 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2020-10-01}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
\edef\platexBANNER{\noexpand\platexNILa
\the\everyjob % LaTeX banner and delayed codes
\noexpand\platexNILb}
@@ -52,6 +52,8 @@
\global\everyjob\expandafter\expandafter\expandafter{\platexBANNER}%
\endgroup
\let\platexBANNER=\@undefined
+\chardef\pltx@newhook@avail=\z@
+\@ifl@t@r\fmtversion{2020/10/01}{\chardef\pltx@newhook@avail=\@ne}{}
\newif\if@plincludeinrelease
\@plincludeinreleasefalse
\def\plIncludeInRelease#1{%
@@ -987,7 +989,7 @@
\ifin@ \usekanji{#1}{#2}{#3}{#4}%
\else\useroman{#1}{#2}{#3}{#4}%
\fi}
-\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN
+\ifnum\pltx@newhook@avail=\z@ % --- for <= 2020-02-02 BEGIN
\ifx\@defaultfamilyhook\@undefined % old
\DeclareRobustCommand\normalfont{%
\kanjiencoding{\kanjiencodingdefault}%
@@ -1007,14 +1009,14 @@
\edef\k@shape{\kanjishapedefault}%
}
\fi % done
-\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN
+\else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN
\AddToHook{normalfont}{%
\kanjiencoding{\kanjiencodingdefault}%
\edef\k@family{\kanjifamilydefault}%
\edef\k@series{\kanjiseriesdefault}%
\edef\k@shape{\kanjishapedefault}%
}
-\fi % --- for 2020-10-01 END
+\fi % --- for >= 2020-10-01 END
\adjustbaseline
\let\reset@font\normalfont
\ifx\bfseries@rm\@undefined % old
@@ -1028,23 +1030,23 @@
\edef\mdseries@mc{\mddefault}% m
\edef\mdseries@gt{\mddefault}% m
\fi
-\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\g@addto@macro\expand@font@defaults{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
\edef\kanjidef@ult{\kanjifamilydefault}%
}
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\AddToHook{expand@font@defaults}{%
\edef\mcdef@ult{\mcdefault}%
\edef\gtdef@ult{\gtdefault}%
%\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n
}
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
-\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
+\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\DeclareRobustCommand\bfseries{%
\not@math@alphabet\bfseries\mathbf
\expand@font@defaults
@@ -1077,7 +1079,7 @@
\fi\fi
\selectfont
}
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\AddToHook{bfseries/defaults}{%
\let\bfseries@mc\bfdef@ult
\let\bfseries@gt\bfdef@ult
@@ -1100,8 +1102,8 @@
\else \kanjiseries\mddefault
\fi\fi
}
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
\ifx\prepare@family@series@update\@undefined % old
\let\prepare@family@series@update@kanji\@undefined
\let\@meta@family@list@kanji\@undefined
@@ -1182,14 +1184,14 @@
}
\fi
\expandafter\ifx\csname init@series@setup\endcsname\relax
-\else %<*2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN
+\else %<*2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail=\z@ % --- for == 2020-02-02 BEGIN
\g@addto@macro\init@series@setup{%
\ifx\kanjidef@ult\mcdef@ult \mcfamily
\else\ifx\kanjidef@ult\gtdef@ult \gtfamily
\fi\fi
}%
-\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN
+\else % --- for == 2020-02-02 END & for >= 2020-10-01 BEGIN
\g@addto@macro\init@series@setup{%
% !! sync with 2020/04/13 v3.1n BEGIN
\ifx\kanjiseriesdefault\kanjiseriesdefault@kernel
@@ -1198,15 +1200,14 @@
\fi
% !! sync with 2020/04/13 v3.1n END
}%
-\fi % --- for 2020-10-01 END
-\fi %</2020-02-02|2020-10-01>
-\ifx\AddToHook\@undefined
-\else % --- for LaTeX2e 2020-10-01 or later BEGIN
+\fi % --- for >= 2020-10-01 END
+\fi %</2020-02-02|2020-10-01|.>
+\ifnum\pltx@newhook@avail>\z@ % --- for >= 2020-10-01 BEGIN
\def\code@after@pldefs{%
\expandafter\def\expandafter\kanjiseriesdefault
\expandafter{\kanjiseriesdefault\@empty}
\let\kanjiseriesdefault@kernel\kanjiseriesdefault}
-\fi % --- for LaTeX2e 2020-10-01 or later END
+\fi % --- for >= 2020-10-01 END
\ifx\prepare@family@series@update@kanji\@undefined % old
\DeclareRobustCommand\mcfamily
{\not@math@alphabet\mcfamily\mathmc
@@ -2066,7 +2067,7 @@
\let\document@default@language\m@ne
\fi
%% File: plvers.dtx
-\ifx\AddToHook\@undefined
+\ifnum\pltx@newhook@avail=\z@
\expandafter\def\expandafter\process@table\expandafter{%
\expandafter\p@warn@latexrelease\process@table}
\begingroup
diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty
index 26c09cacc30..115fde7b68c 100644
--- a/Master/texmf-dist/tex/platex/base/plext.sty
+++ b/Master/texmf-dist/tex/platex/base/plext.sty
@@ -15,7 +15,7 @@
%% File: plext.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plext}
- [2019/09/29 v1.2l pLaTeX package file (community edition)]
+ [2020/10/07 v1.2m pLaTeX package file (community edition)]
\newif\if@rotsw
\def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
\let\@classiv\@arrayclassiv
@@ -465,30 +465,40 @@
\newdimen\save@ybaselineshift
\newdimen\save@tbaselineshift
\newdimen\@picwd
+\ifx\@defaultunitsset\@undefined % old
+ \def\X@picture@dimens#1#2#3#4{%
+ \@picwd=#1\unitlength \@picht=#2\unitlength
+ \@tempdima=#3\unitlength \@tempdimb=#4\unitlength
+ }
+\else % 2020-10-01
+ \def\X@picture@dimens#1#2#3#4{%
+ \@defaultunitsset\@picwd{#1}\unitlength
+ \@defaultunitsset\@picht{#2}\unitlength
+ \@defaultunitsset\@tempdima{#3}\unitlength
+ \@defaultunitsset\@tempdimb{#4}\unitlength
+ }
+\fi
\def\@@picture<#1>(#2,#3)(#4,#5){%
\save@ybaselineshift\ybaselineshift
\save@tbaselineshift\tbaselineshift
\iftdir
\if#1y\let\box@dir\yoko
- \@picwd=#3\unitlength \@picht=#2\unitlength
- \@tempdima=#5\unitlength \@tempdimb=#4\unitlength
+ \X@picture@dimens{#3}{#2}{#5}{#4}%
\else\let\box@dir\tate
- \@picwd=#2\unitlength \@picht=#3\unitlength
- \@tempdima=#4\unitlength \@tempdimb=#5\unitlength
+ \X@picture@dimens{#2}{#3}{#4}{#5}%
\fi
\else
\if#1t\let\box@dir\tate
- \@picwd=#3\unitlength \@picht=#2\unitlength
- \@tempdima=#5\unitlength \@tempdimb=#4\unitlength
+ \X@picture@dimens{#3}{#2}{#5}{#4}%
\else\let\box@dir\yoko
- \@picwd=#2\unitlength \@picht=#3\unitlength
- \@tempdima=#4\unitlength \@tempdimb=#5\unitlength
+ \X@picture@dimens{#2}{#3}{#4}{#5}%
\fi
\fi
- \setbox\@picbox\hbox to\@picwd\bgroup\box@dir
- \hskip-\@tempdima\lower\@tempdimb\hbox\bgroup
- \ybaselineshift\z@ \tbaselineshift\z@
- \ignorespaces}
+ \setbox\@picbox\hb@xt@\@picwd\bgroup\box@dir
+ \hskip-\@tempdima
+ \lower\@tempdimb\hbox\bgroup
+ \ybaselineshift\z@ \tbaselineshift\z@
+ \ignorespaces}
\def\endpicture{%
\egroup\hss\egroup
\ht\@picbox\@picht \wd\@picbox\@picwd \dp\@picbox\z@