From 494ded8bbbfa7facb86370d8a836f7434bb6a9b3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Jan 2018 22:08:25 +0000 Subject: platex (27jan18) git-svn-id: svn://tug.org/texlive/trunk@46463 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/platex/base/platexrelease.dtx | 54 +++++++++++++++------- Master/texmf-dist/source/platex/base/plcore.dtx | 54 +++++++++++++++------- Master/texmf-dist/source/platex/base/plvers.dtx | 2 +- 3 files changed, 76 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index caccf3c2b3d..792685fe724 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment %% File: platexrelease.dtx % -% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2018 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -22,6 +22,7 @@ % \changes{v1.0g}{2016/09/08}{p\LaTeX\ \texttt{!<2016/09/03!>}版に警告} % \changes{v1.0h}{2017/09/26}{p\LaTeX\ \texttt{!<2017/07/29!>}版に警告} % \changes{v1.0i}{2017/12/06}{タイポ修正} +% \changes{v1.0j}{2018/01/27}{p\LaTeX\ \texttt{!<2017/09/26!>}版に警告} % \fi % % \iffalse @@ -30,7 +31,7 @@ \ProvidesFile{platexrelease.dtx} % %\ProvidesPackage{platexrelease} - [2017/12/06 v1.0i latexrelease support for pLaTeX Kernel] + [2018/01/27 v1.0j latexrelease support for pLaTeX Kernel] %<*driver> \documentclass{jltxdoc} \GetFileInfo{platexrelease.dtx} @@ -300,35 +301,56 @@ of this package available from CTAN} % \changes{v1.0g}{2016/09/08}{p\LaTeX\ \texttt{!<2016/09/03!>}版に警告} % \changes{v1.0h}{2017/09/26}{p\LaTeX\ \texttt{!<2017/07/29!>}版に警告} % \changes{v1.0i}{2017/12/06}{タイポ修正} +% \changes{v1.0j}{2018/01/27}{p\LaTeX\ \texttt{!<2017/09/26!>}版に警告} % \begin{macrocode} -\plIncludeInRelease{2017/09/26}{\PackageWarning}{pLaTeX Info}% -\plEndIncludeInRelease -\plIncludeInRelease{2017/07/29}{\PackageWarning}{pLaTeX Info}% - \PackageWarningNoLine{platexrelease}{% +\def\pliirpkg@ver@warn{% You selected pLaTeX2e <\pfmtversion>, but\MessageBreak this version of pLaTeX2e is known to have\MessageBreak some critical bugs. We advise you to\MessageBreak select another format date} +\plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2017/10/28>+4 +\plEndIncludeInRelease +\plIncludeInRelease{2017/07/29}{\PackageWarning}{pLaTeX Info}% + % * <2017/10/28>+3 + % * <2017/10/28>+2 + % * <2017/10/28>+1 + % * <2017/10/28> + % * <2017/09/26> + % * <2017/07/29>+1 + % - Enabling \linebreak before prebreakpenalty caused + % ineffective \nolinebreak (fixed in <2017/10/28>+4) + % * <2017/07/29> + % - Inhibit JFM glue in tabular cells resulted in + % misplaced right alignment (fixed in <2017/09/26>) + \PackageWarningNoLine{platexrelease}{\pliirpkg@ver@warn} \plEndIncludeInRelease \plIncludeInRelease{2016/09/08}{\PackageWarning}{pLaTeX Info}% + % * <2017/05/05> + % * <2017/04/08> + % * <2016/11/29> + % * <2016/09/08> \plEndIncludeInRelease \plIncludeInRelease{2016/09/03}{\PackageWarning}{pLaTeX Info}% - \PackageWarningNoLine{platexrelease}{% - You selected pLaTeX2e <\pfmtversion>, but\MessageBreak - this version of pLaTeX2e is known to have\MessageBreak - some critical bugs. We advise you to\MessageBreak - select another format date} + % * <2016/09/03> + % - \footnotetext in vertical mode resulted in extra + % vertical space (fixed in <2016/09/08>) + \PackageWarningNoLine{platexrelease}{\pliirpkg@ver@warn} \plEndIncludeInRelease \plIncludeInRelease{2016/07/01}{\PackageWarning}{pLaTeX Info}% + % * <2016/07/01> \plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\PackageWarning}{pLaTeX Info}% - \PackageWarningNoLine{platexrelease}{% - You selected pLaTeX2e <\pfmtversion>, but\MessageBreak - this version of pLaTeX2e is known to have\MessageBreak - some critical bugs. We advise you to\MessageBreak - select another format date} + % * <2016/06/10>+1 + % * <2016/06/10> + % * <2016/05/07> + % * <2016/04/17> + % - Fix for non-zero baselineshift in accent composition + % was problematic (fixed in <2016/07/01>) + \PackageWarningNoLine{platexrelease}{\pliirpkg@ver@warn} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}% + % * <2006/11/10> \plEndIncludeInRelease % \end{macrocode} % diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 24505c96e96..156d9319100 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2017 Japanese TeX Development Community +% Copyright (c) 2016-2018 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -78,13 +78,15 @@ % \changes{v1.2t}{2017/10/31}{v1.2sの変更に伴い、\cs{ref}が数式モードで % エラーになっていたのを修正} % \changes{v1.2u}{2017/11/04}{emathの\cs{marusuuref}対策} +% \changes{v1.2v}{2018/01/27}{v1.2oとv1.2qの修正で\cs{nolinebreak}が +% 効かない場合があったので、元に戻した} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2017/11/04 v1.2u pLaTeX core file] +\ProvidesFile{plcore.dtx}[2018/01/27 v1.2v pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -286,24 +288,42 @@ % 同士の合算は行われないことを利用しています。 % \changes{v1.2q}{2017/08/25}{\cs{nolinebreak}の場合に\cs{(x)kanjiskip}が % 入らなくなっていたのを修正} +% +% ところが、その変更によってそもそも|\nolinebreak|が効かない場合が +% 生じたので、変更全体をいったんキャンセルして元に戻します。 +% \changes{v1.2v}{2018/01/27}{v1.2oとv1.2qの修正で\cs{nolinebreak}が +% 効かない場合があったので、元に戻した} % \begin{macrocode} +%\plIncludeInRelease{2017/10/28}{\@no@lnbk} +% {Break before prebreakpenalty}% +%\def\@no@lnbk #1[#2]{% +% \ifvmode +% \@nolnerr +% \else +% \@tempskipa\lastskip +% \unskip +% \penalty #1\@getpen{#2}% +% \ifdim\@tempskipa>\z@ +% \hskip\@tempskipa +% \ignorespaces +% \fi +% \fi} +%\plEndIncludeInRelease %\plIncludeInRelease{2017/07/29}{\@no@lnbk} % {Break before prebreakpenalty}% -%<*plcore|platexrelease> -\def\@no@lnbk #1[#2]{% - \ifvmode - \@nolnerr - \else - \@tempskipa\lastskip - \unskip - \penalty #1\@getpen{#2}% - \penalty\z@\relax %% added (2017/08/25) - \ifdim\@tempskipa>\z@ - \hskip\@tempskipa - \ignorespaces - \fi - \fi} -% +%\def\@no@lnbk #1[#2]{% +% \ifvmode +% \@nolnerr +% \else +% \@tempskipa\lastskip +% \unskip +% \penalty #1\@getpen{#2}% +% \penalty\z@\relax %% added (2017/08/25) +% \ifdim\@tempskipa>\z@ +% \hskip\@tempskipa +% \ignorespaces +% \fi +% \fi} %\plEndIncludeInRelease %\plIncludeInRelease{2017/05/05}{\@no@lnbk} % {Break before prebreakpenalty}% diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 0623fb07de2..c222a47b19b 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -136,7 +136,7 @@ {2017/10/28} % %<*plcore> -\def\ppatch@level{3} +\def\ppatch@level{4} % % \end{macrocode} % \end{macro} -- cgit v1.2.3