summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2020-02-29 14:51:29 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2020-02-29 14:51:29 +0000
commit55097199d5a72bdb3cbe219ff0509e8daac93a3c (patch)
tree0bc4013074ef7fb9c882ff23610c9df50d2cc20d
parente683aafb436fe5079fb4878f058618155dc8939b (diff)
emergency update again: r53974 fails 'fmtutil-sys --byfmt (u)platex-dev'
git-svn-id: svn://tug.org/texlive/trunk@53975 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/platex/base/README.md2
-rw-r--r--Master/texmf-dist/doc/platex/base/pldoc.pdfbin873833 -> 874153 bytes
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx22
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty22
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx22
5 files changed, 58 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 116555004e9..399aa67ca45 100644
--- a/Master/texmf-dist/doc/platex/base/README.md
+++ b/Master/texmf-dist/doc/platex/base/README.md
@@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-02-29
+2020-02-29+1
Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf
index 563c4b162e2..b005e622392 100644
--- a/Master/texmf-dist/doc/platex/base/pldoc.pdf
+++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 78ab72ff991..7163f9a5644 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -1941,13 +1941,22 @@
%<*plcore|platexrelease>
\ifx\fontseriesforce\@undefined % old
\else % 2020-02-02
- \ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+ \ifx\@forced@seriestrue\@undefined % patch level 0, 1, 2
\@latex@error
{Please update LaTeX2e!^^J\space\space
- At least LaTeX2e 2020-02-02 patch level 5 is required}
- {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+ At least LaTeX2e 2020-02-02 patch level 3 is required}
+ {LaTeX2e 2020-02-02 patch level 2 has a bug.}
%<plcore> \@@end
\fi
+ % actually we'd like to check the below too,
+ % but commented out for TL19 frozen since
+ % platex-dev format generation fails
+ %\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+ % \@latex@error
+ % {Please update LaTeX2e!^^J\space\space
+ % At least LaTeX2e 2020-02-02 patch level 5 is required}
+ % {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+ %\fi
\fi
%</plcore|platexrelease>
% \end{macrocode}
@@ -2040,11 +2049,18 @@
\fi
\fi
}
+\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+\def\set@target@series@kanji#1{%
+ \edef\k@series{#1}%
+ \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}%
+}
+\else % patch level 5
\def\set@target@series@kanji#1{%
\edef\k@series{#1}%
\expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series
}
\fi
+\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index fd368a6c291..8710e500eb0 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -489,12 +489,21 @@ of this package available from CTAN}
\plEndIncludeInRelease
\ifx\fontseriesforce\@undefined % old
\else % 2020-02-02
- \ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+ \ifx\@forced@seriestrue\@undefined % patch level 0, 1, 2
\@latex@error
{Please update LaTeX2e!^^J\space\space
- At least LaTeX2e 2020-02-02 patch level 5 is required}
- {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+ At least LaTeX2e 2020-02-02 patch level 3 is required}
+ {LaTeX2e 2020-02-02 patch level 2 has a bug.}
\fi
+ % actually we'd like to check the below too,
+ % but commented out for TL19 frozen since
+ % platex-dev format generation fails
+ %\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+ % \@latex@error
+ % {Please update LaTeX2e!^^J\space\space
+ % At least LaTeX2e 2020-02-02 patch level 5 is required}
+ % {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+ %\fi
\fi
\ifx\fontseriesforce\@undefined % old
\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
@@ -546,11 +555,18 @@ of this package available from CTAN}
\fi
\fi
}
+\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+\def\set@target@series@kanji#1{%
+ \edef\k@series{#1}%
+ \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}%
+}
+\else % patch level 5
\def\set@target@series@kanji#1{%
\edef\k@series{#1}%
\expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series
}
\fi
+\fi
\ifx\fontshapeforce\@undefined % old
\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}}
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 3c7172412f0..13dc9165aa4 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -678,13 +678,22 @@
\fi\fi}
\ifx\fontseriesforce\@undefined % old
\else % 2020-02-02
- \ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+ \ifx\@forced@seriestrue\@undefined % patch level 0, 1, 2
\@latex@error
{Please update LaTeX2e!^^J\space\space
- At least LaTeX2e 2020-02-02 patch level 5 is required}
- {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+ At least LaTeX2e 2020-02-02 patch level 3 is required}
+ {LaTeX2e 2020-02-02 patch level 2 has a bug.}
\@@end
\fi
+ % actually we'd like to check the below too,
+ % but commented out for TL19 frozen since
+ % platex-dev format generation fails
+ %\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+ % \@latex@error
+ % {Please update LaTeX2e!^^J\space\space
+ % At least LaTeX2e 2020-02-02 patch level 5 is required}
+ % {LaTeX2e 2020-02-02 patch level 2 and 4 has a bug.}
+ %\fi
\fi
\ifx\fontseriesforce\@undefined % old
\DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}}
@@ -736,11 +745,18 @@
\fi
\fi
}
+\ifx\series@maybe@drop@one@m\@undefined % patch level 0--4
+\def\set@target@series@kanji#1{%
+ \edef\k@series{#1}%
+ \edef\k@series{\expandafter\series@drop@one@m\k@series mm\series@drop@one@m}%
+}
+\else % patch level 5
\def\set@target@series@kanji#1{%
\edef\k@series{#1}%
\expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series
}
\fi
+\fi
\ifx\fontshapeforce\@undefined % old
\DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}}
\DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}}