From a85d763fcf68de971de2ca193c7dac68faa16d04 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 11 Dec 2021 21:17:48 +0000 Subject: platex (11dec21) git-svn-id: svn://tug.org/texlive/trunk@61273 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/README.md | 33 ++++++++++-------- .../texmf-dist/doc/platex/base/platexrelease.pdf | Bin 107850 -> 107850 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 876791 -> 874744 bytes .../source/platex/base/platexrelease.dtx | 3 ++ Master/texmf-dist/source/platex/base/plcore.dtx | 37 ++++++++++++++++++--- Master/texmf-dist/source/platex/base/plvers.dtx | 10 +++--- .../texmf-dist/tex/platex/base/platexrelease.sty | 33 ++++++++++++++++-- Master/texmf-dist/tex/platex/base/plcore.ltx | 7 ++-- 8 files changed, 96 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 910b447fd89..63fed01732d 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -1,27 +1,34 @@ # platex -The bundle provides pLaTeX2e format and miscellaneous macros -for pTeX and e-pTeX. -This is a community edition maintained by +pLaTeX is a Japanese version of LaTeX, which runs on pTeX +(a TeX engine with extensions for Japanese typesetting). +This bundle provides the macros and settings needed to generate +the pLaTeX format (named "pLaTeX2e") and some classes. + +Note: This is a community edition maintained by [Japanese TeX Development Community](http://texjp.org), -which forked from the original ASCII edition (ptex-texmf-2.5). +which forked from the original ASCII edition; see below. ## Repository -The bundle is maintained on GitHub: +This bundle is maintained on GitHub: https://github.com/texjporg/platex -If you have issues, please let us know from the above page. +If you have issues, please let us know from the page above. -The original ASCII edition can be obtained from: +## Changes from the original ASCII edition -- https://asciidwango.github.io/ptex/base/sources.html#platex +The macros were originally developed by ASCII Corporation +(a publishing company in Japan). +We, Japanese TeX Development Community, have created a fork +to work with the latest version of TeX Live. -## Changes from the original ASCII edition +The original ASCII edition, pLaTeX2e 2006/11/10, +was based on pTeX-3.1.10 and LaTeX2e 2005/12/01. +It can be obtained from the link below: +- https://asciidwango.github.io/ptex/base/sources.html#platex -The original ASCII edition (pLaTeX2e 2006/11/10) was based on -pTeX-3.1.10 and LaTeX2e 2005/12/01. -The community edition (this package) has the following advantages: +The community edition (this bundle) has the following advantages: - Fix several bugs in pLaTeX2e format and packages. - Fix macros which are inconsistent with the latest pTeX @@ -64,6 +71,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2021-06-27 +2021-12-11 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf index bac4a2ede2d..dde573c150a 100644 Binary files a/Master/texmf-dist/doc/platex/base/platexrelease.pdf and b/Master/texmf-dist/doc/platex/base/platexrelease.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf index a5d49237bb0..7d43f333699 100644 Binary files a/Master/texmf-dist/doc/platex/base/pldoc.pdf and b/Master/texmf-dist/doc/platex/base/pldoc.pdf differ diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index 78bda1bf649..41452e036b5 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -351,6 +351,9 @@ 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}% + % * <2021-11-15> + % * <2021-06-01>+2 + % * <2021-06-01>+1 % * <2021-06-01> % * <2020-10-01>+2 % * <2020-10-01>+1 diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 118a6ad96f3..01f331cef51 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -135,13 +135,15 @@ % \changes{v1.3i}{2021/03/25}{\cs{@outputpage}, \cs{@vtryfc}での、非横組時における % \cs{@outputbox}の寸法補正のコードを別命令として切り出した} % \changes{v1.3j}{2021/06/03}{巻戻しコードのエラー修正} +% \changes{v1.3k}{2021/06/28}{内部Unicodeの時のみを検出} +% \changes{v1.3l}{2021/12/08}{\LaTeXe~2021-11-15に伴う修正} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2021/06/03 v1.3j pLaTeX core file] +\ProvidesFile{plcore.dtx}[2021/12/08 v1.3l pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -268,6 +270,7 @@ % が得られます(最初の\verb+\removejfmglue+は結果的に何もしていません)。 % \changes{v1.2x}{2018/03/01}{JFMグルーノードを削除するマクロ追加} % \changes{v1.3}{2018/09/02}{\cs{removejfmglue}の挙動を明文化} +% \changes{v1.3k}{2021/06/28}{内部Unicodeの時のみを検出} % \begin{macrocode} %\plIncludeInRelease{2018/03/09}% % {\removejfmglue}{Macro added}% @@ -278,7 +281,7 @@ \let\removejfmglue\@undefined \else \setbox0\hbox{% - \ifdefined\ucs %% upTeX check + \ifnum\jis"2121="3000 %% upTeX check \jfont\tenmin=upjisr-h at 9.62216pt \else \jfont\tenmin=min10 @@ -1894,9 +1897,11 @@ % \changes{v1.0a}{1995/04/07}{組方向の判定をボックスの外でするようにした} % \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01では\cs{par}が入る % (sync with ltfloat.dtx 2021/02/10 v1.2e)} +% \changes{v1.3l}{2021/12/08}{\LaTeXe~2021-11-15では\cs{@currentcounter}を +% 明示的に設定する(sync with ltfloat.dtx 2021/10/14 v1.2g)} % \begin{macrocode} -%\plIncludeInRelease{2021/06/01}{\@footnotetext} -% {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}% +%\plIncludeInRelease{2021/11/15}{\@footnotetext} +% {Adapt to ltfloat.dtx (2021-10-14 v1.2g)}% %<*plcore|platexrelease> % \end{macrocode} % \begin{macrocode} @@ -1908,6 +1913,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% @@ -1937,6 +1943,29 @@ % \begin{macrocode} % %\plEndIncludeInRelease +%\plIncludeInRelease{2021/06/01}{\@footnotetext} +% {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}% +%\long\def\@footnotetext#1{% +% \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi +% \insert\footins{\@tempa% +% \reset@font\footnotesize +% \interlinepenalty\interfootnotelinepenalty +% \splittopskip\footnotesep +% \splitmaxdepth \dp\strutbox \floatingpenalty \@MM +% \hsize\columnwidth \@parboxrestore +% \protected@edef\@currentlabel{% +% \csname p@footnote\endcsname\@thefnmark +% }% +% \color@begingroup +% \@makefntext{% +% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% +% \par +% \color@endgroup}\ifhmode\null\fi +% \ifnum\pltx@foot@penalty=\z@\else +% \penalty\pltx@foot@penalty +% \pltx@foot@penalty\z@ +% \fi} +%\plEndIncludeInRelease %\plIncludeInRelease{2016/09/08}{\@footnotetext} % {Allow break after \footnote (more fix)}% %\long\def\@footnotetext#1{% diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 6442add1a2c..8bbd0f6bb2a 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -100,12 +100,13 @@ % \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}版対応確認} % \changes{v1.1x}{2020/10/07}{フックシステムが利用可能かどうか判定} % \changes{v1.1y}{2021/06/27}{\LaTeX\ \texttt{!<2021-06-01!>}版ほぼ対応} +% \changes{v1.1z}{2021/12/08}{\LaTeX\ \texttt{!<2021-11-15!>}版ほぼ対応} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2021/06/27 v1.1y pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2021/12/08 v1.1z pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -147,6 +148,7 @@ % \changes{v1.1s}{2020/03/14}{\LaTeX\ \texttt{!<2020-02-02!> PL5}版対応確認} % \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}版対応確認} % \changes{v1.1y}{2021/06/27}{\LaTeX\ \texttt{!<2021-06-01!>}版ほぼ対応} +% \changes{v1.1z}{2021/12/08}{\LaTeX\ \texttt{!<2021-11-15!>}版ほぼ対応} % \begin{macrocode} %<*2ekernel> %\def\fmtname{LaTeX2e} @@ -155,7 +157,7 @@ %\edef\latexreleaseversion %\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2021-06-01} + {2021-11-15} % % \end{macrocode} % @@ -196,10 +198,10 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2021-06-01} + {2021-11-15} % %<*plcore> -\def\ppatch@level{2} +\def\ppatch@level{0} % % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 5c18d5eaf4f..bff7469dd3e 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -18,9 +18,9 @@ %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2021-06-01} + {2021-11-15} \edef\platexreleaseversion - {2021-06-01} + {2021-11-15} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -146,6 +146,9 @@ 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}% + % * <2021-11-15> + % * <2021-06-01>+2 + % * <2021-06-01>+1 % * <2021-06-01> % * <2020-10-01>+2 % * <2020-10-01>+1 @@ -2342,7 +2345,7 @@ of this package available from CTAN} \let\removejfmglue\@undefined \else \setbox0\hbox{% - \ifdefined\ucs %% upTeX check + \ifnum\jis"2121="3000 %% upTeX check \jfont\tenmin=upjisr-h at 9.62216pt \else \jfont\tenmin=min10 @@ -3161,6 +3164,30 @@ of this package available from CTAN} {\protected@xdef\@thefnmark{\thempfn}% \@footnotetext}} \plEndIncludeInRelease +\plIncludeInRelease{2021/11/15}{\@footnotetext} + {Adapt to ltfloat.dtx (2021-10-14 v1.2g)}% +\long\def\@footnotetext#1{% + \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi + \insert\footins{\@tempa% + \reset@font\footnotesize + \interlinepenalty\interfootnotelinepenalty + \splittopskip\footnotesep + \splitmaxdepth \dp\strutbox \floatingpenalty \@MM + \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par + \color@endgroup}\ifhmode\null\fi + \ifnum\pltx@foot@penalty=\z@\else + \penalty\pltx@foot@penalty + \pltx@foot@penalty\z@ + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2021/06/01}{\@footnotetext} {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}% \long\def\@footnotetext#1{% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 66dca03b294..321eb942db4 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -34,8 +34,8 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2021-06-01} -\def\ppatch@level{2} + {2021-11-15} +\def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -1784,7 +1784,7 @@ \let\removejfmglue\@undefined \else \setbox0\hbox{% - \ifdefined\ucs %% upTeX check + \ifnum\jis"2121="3000 %% upTeX check \jfont\tenmin=upjisr-h at 9.62216pt \else \jfont\tenmin=min10 @@ -2187,6 +2187,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% -- cgit v1.2.3