summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex
diff options
context:
space:
mode:
authorHironobu Yamashita <h.y.acetaminophen@gmail.com>2020-02-29 08:57:21 +0000
committerHironobu Yamashita <h.y.acetaminophen@gmail.com>2020-02-29 08:57:21 +0000
commite683aafb436fe5079fb4878f058618155dc8939b (patch)
tree14428a791fc96b088a85395034e4b88950026d1c /Master/texmf-dist/source/platex
parentb87a2ed9e8d9e82e0f2504479300654c5c64fcde (diff)
emergency update: platex 2020-02-29 containing pLaTeX2e <2020-02-02>+3
Karl -- please refer to mail 'Refrain from major release of LaTeX2e around TL freeze' git-svn-id: svn://tug.org/texlive/trunk@53974 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex')
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx169
-rw-r--r--Master/texmf-dist/source/platex/base/plvers.dtx2
2 files changed, 131 insertions, 40 deletions
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index f9f4799ebe7..78ab72ff991 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -130,13 +130,28 @@
% \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B}
% \changes{v1.6x}{2020/02/05}{$B0l;~%3%^%s%I$NL>A0$rE}0l(B
% (sync with ltfssaxes.dtx 2020/02/05 v1.0b and ltfssini.dtx 2020/02/05 v3.1g)}
+% \changes{v1.6y}{2020/02/24}{Switch \cs{if@forced@series} added
+% (sync with ltfssaxes.dtx 2020/02/18 v1.0c)}
+% \changes{v1.6y}{2020/02/24}{Make the \cs{ifx} selection outside of
+% \cs{fontseries} argument so that it is not done several times
+% (sync with ltfssini.dtx 2020/02/18 v3.1i)}
+% \changes{v1.6y}{2020/02/24}{No series auto-update when forced
+% (sync with ltfssini.dtx 2020/02/18 v3.1i)}
+% \changes{v1.6y}{2020/02/24}{Recognize current family if it is not a
+% ``meta'' family and auto-update series using \cs{bfdefault}
+% (sync with ltfssini.dtx 2020/02/18 v3.1i)}
+% \changes{v1.6z}{2020/02/28}{\cs{series@maybe@drop@one@m}$B$NB8:_3NG'(B}
+% \changes{v1.6z}{2020/02/28}{Drop ``m'' only in a specific set of values
+% (sync with ltfssaxes.dtx 2020/02/27 v1.0d)}
+% \changes{v1.6z}{2020/02/28}{Drop surplus ``m'' from \cs{target@series@value}
+% (sync with ltfssini.dtx 2020/02/25 v3.1j)}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2020/02/03 v1.6w pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2020/02/28 v1.6z pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -1913,6 +1928,31 @@
% \end{macro}
%
%
+% \begin{macro}{\series@maybe@drop@one@m}
+% $BK\2H(B\LaTeXe~2020-02-02 patch level~5$B$GDI2C$5$l$?L?Na$G$9!#(B
+% \NFSS{}$B$,BgI}$K=$@5!&3HD%$5$l$?(B\LaTeXe~2020-02-02$B$N$&$A!"(B
+% patch level~2$B$K$O(B |latex3/latex2e#277| $B$N%P%0$,$"$j!"(B
+% ^^A $B"*BP:v$H$7$F(B \if@forced@series $B$,DI2C$5$l$?(B
+% patch level~4$B$K$O(B |latex3/latex2e#293| $B$N%P%0$,$"$C$?$?$a!"(B
+% ^^A $B"*BP:v$H$7$F(B \series@maybe@drop@one@m $B$,DI2C$5$l$?(B
+% $B0BDj$7$?(B\LaTeXe{}$B$N$_$r%5%]!<%H$7$^$9!#(B
+% \changes{v1.6z}{2020/02/28}{\cs{series@maybe@drop@one@m}$B$NB8:_3NG'(B}
+% \begin{macrocode}
+%<*plcore|platexrelease>
+\ifx\fontseriesforce\@undefined % old
+\else % 2020-02-02
+ \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.}
+%<plcore> \@@end
+ \fi
+\fi
+%</plcore|platexrelease>
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\romanseries}
% \begin{macro}{\kanjiseries}
% \begin{macro}{\fontseries}
@@ -1929,8 +1969,8 @@
\DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
\else % 2020-02-02
-\DeclareRobustCommand\romanseries[1]{\merge@font@series{#1}}
-\DeclareRobustCommand\kanjiseries[1]{\merge@kanji@series{#1}}
+\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
+\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
\fi
% \end{macrocode}
@@ -1944,13 +1984,15 @@
% $BL5>r7o$K%7%j!<%:$rJQ99$7$^$9!#(B
% \changes{v1.6v}{2020/02/01}{New commands \cs{fontseriesforce} etc.
% (sync with ltfssaxes.dtx 2019/12/16 v1.0a)}
+% \changes{v1.6y}{2020/02/24}{Switch \cs{if@forced@series} added
+% (sync with ltfssaxes.dtx 2020/02/18 v1.0c)}
% \begin{macrocode}
\ifx\fontseriesforce\@undefined % old
\let\romanseriesforce\@undefined
\let\kanjiseriesforce\@undefined
\else % 2020-02-02
-\DeclareRobustCommand\romanseriesforce[1]{\edef\f@series{#1}}
-\DeclareRobustCommand\kanjiseriesforce[1]{\edef\k@series{#1}}
+\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
+\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
\fi
% \end{macrocode}
@@ -1962,6 +2004,8 @@
% \begin{macro}{\merge@kanji@series@}
% \begin{macro}{\set@target@series@kanji}
% \cs{merge@font@series}$B$NOBJ8HG$G$9!#(B
+% \changes{v1.6z}{2020/02/28}{Drop ``m'' only in a specific set of values
+% (sync with ltfssaxes.dtx 2020/02/27 v1.0d)}
% \begin{macrocode}
\ifx\fontseriesforce\@undefined % old
\let\merge@kanji@series\@undefined
@@ -1998,7 +2042,7 @@
}
\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}%
+ \expandafter\series@maybe@drop@one@m\expandafter{\k@series}\k@series
}
\fi
% \end{macrocode}
@@ -2276,27 +2320,28 @@
% \begin{macro}{\bfseries}
% \begin{macro}{\mdseries}
% $B%U%!%_%j$4$H$N@_DjCM$r;2>H$7$^$9!#(B
+% \changes{v1.6y}{2020/02/24}{Make the \cs{ifx} selection outside of
+% \cs{fontseries} argument so that it is not done several times
+% (sync with ltfssini.dtx 2020/02/18 v3.1i)}
% \begin{macrocode}
\ifx\bfseries@rm\@undefined\else % 2020-02-02
\DeclareRobustCommand\bfseries{%
\not@math@alphabet\bfseries\mathbf
\expand@font@defaults
- \romanseries{% changed \fontseries -> \romanseries
- \ifx\f@family\rmdef@ult \bfseries@rm
- \else\ifx\f@family\sfdef@ult \bfseries@sf
- \else\ifx\f@family\ttdef@ult \bfseries@tt
- \else \bfdefault
+ % changed \fontseries -> \romanseries
+ \ifx\f@family\rmdef@ult \romanseries\bfseries@rm
+ \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf
+ \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt
+ \else \romanseries\bfdefault
\fi\fi\fi
- }%
% \end{macrocode}
% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B
% \begin{macrocode}
- \kanjiseries{%
- \ifx\k@family\mcdef@ult \bfseries@mc
- \else\ifx\k@family\gtdef@ult \bfseries@gt
- \else \bfdefault
+ % changed \fontseries -> \kanjiseries
+ \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc
+ \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt
+ \else \kanjiseries\bfdefault
\fi\fi
- }%
% \end{macrocode}
% $B$3$3$^$G!#(B
% \begin{macrocode}
@@ -2305,22 +2350,20 @@
\DeclareRobustCommand\mdseries{%
\not@math@alphabet\mdseries\relax
\expand@font@defaults
- \romanseries{% changed \fontseries -> \romanseries
- \ifx\f@family\rmdef@ult \mdseries@rm
- \else\ifx\f@family\sfdef@ult \mdseries@sf
- \else\ifx\f@family\ttdef@ult \mdseries@tt
- \else \mddefault
+ % changed \fontseries -> \romanseries
+ \ifx\f@family\rmdef@ult \romanseries\mdseries@rm
+ \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf
+ \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt
+ \else \romanseries\mddefault
\fi\fi\fi
- }%
% \end{macrocode}
% $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B
% \begin{macrocode}
- \kanjiseries{%
- \ifx\k@family\mcdef@ult \mdseries@mc
- \else\ifx\k@family\gtdef@ult \mdseries@gt
- \else \mddefault
+ % changed \fontseries -> \kanjiseries
+ \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc
+ \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt
+ \else \kanjiseries\mddefault
\fi\fi
- }%
% \end{macrocode}
% $B$3$3$^$G!#(B
% \begin{macrocode}
@@ -2335,57 +2378,105 @@
% \begin{macro}{\@meta@family@list@kanji}
% \begin{macro}{\update@series@target@value@kanji}
% |\prepare@family@series@update|$B$NOBJ8HG$G$9!#(B
+% \changes{v1.6y}{2020/02/24}{No series auto-update when forced
+% (sync with ltfssini.dtx 2020/02/18 v3.1i)}
+% \changes{v1.6y}{2020/02/24}{Recognize current family if it is not a
+% ``meta'' family and auto-update series using \cs{bfdefault}
+% (sync with ltfssini.dtx 2020/02/18 v3.1i)}
+% \changes{v1.6z}{2020/02/28}{Drop surplus ``m'' from \cs{target@series@value}
+% (sync with ltfssini.dtx 2020/02/25 v3.1j)}
% \begin{macrocode}
\ifx\prepare@family@series@update\@undefined % old
\let\prepare@family@series@update@kanji\@undefined
\let\@meta@family@list@kanji\@undefined
+\let\update@series@target@value@kanji\@undefined
\else % 2020-02-02
\def\prepare@family@series@update#1#2{%
+ \if@forced@series
+%<+debug> \series@change@debug{No series preparation (forced \f@series)\on@line}%
+ \romanfamily#2% % changed \fontfamily -> \romanfamily
+ \else
+%<+debug> \series@change@debug{Prepearing for switching to #1 (#2)\on@line}%
\expand@font@defaults
\let\target@series@value\@empty
\def\target@meta@family@value{#1}%
+ \expandafter\edef\csname ??def@ult\endcsname{\f@family}%
\let\@elt\update@series@target@value
\@meta@family@list
+ \@elt{??}%
\let\@elt\relax
\romanfamily#2% % changed \fontfamily -> \romanfamily
\ifx\target@series@value\@empty
+%<+debug> \series@change@debug{Target series still empty ...}%
\else
- \maybe@load@fontshape
- \let\f@series\target@series@value
+ \ifx \f@series\target@series@value
+%<+debug> \series@change@debug{Target series unchanged:
+%<+debug> \f@series \space = \target@series@value}%
+ \else
+ \maybe@load@fontshape
+%<+debug> \series@change@debug{Target series:
+%<+debug> \f@series \space -> \target@series@value}%
+ \let\f@series\target@series@value
+ \fi
\fi
+ \fi
}
\def\prepare@family@series@update@kanji#1#2{%
+ \if@forced@series
+%<+debug> \series@change@debug{No series preparation (forced \k@series)\on@line}%
+ \kanjifamily#2%
+ \else
+%<+debug> \series@change@debug{Prepearing for switching to #1 (#2)\on@line}%
\expand@font@defaults
\let\target@series@value\@empty
\def\target@meta@family@value{#1}%
+ \expandafter\edef\csname ??def@ult\endcsname{\k@family}%
\let\@elt\update@series@target@value@kanji
\@meta@family@list@kanji
+ \@elt{??}%
\let\@elt\relax
\kanjifamily#2%
\ifx\target@series@value\@empty
+%<+debug> \series@change@debug{Target series still empty ...}%
\else
- \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
- \maybe@load@fontshape\endgroup
- \let\k@series\target@series@value
+ \ifx \k@series\target@series@value
+%<+debug> \series@change@debug{Target series unchanged:
+%<+debug> \k@series \space = \target@series@value}%
+ \else
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
+%<+debug> \series@change@debug{Target series:
+%<+debug> \k@series \space -> \target@series@value}%
+ \let\k@series\target@series@value
+ \fi
\fi
+ \fi
}
\def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}}
\def\update@series@target@value@kanji#1{%
\def\reserved@a{#1}%
\ifx\target@meta@family@value\reserved@a % rm -> rm do nothing
\else
+%<+debug> \series@change@debug{Trying to match #1: \csname#1def@ult\endcsname
+%<+debug> \space = \k@family\space ?}%
\expandafter\ifx\csname#1def@ult\endcsname\k@family
\let\@elt\@gobble
- \expandafter\let\expandafter\@reservedb
+ \expandafter\let\expandafter\reserved@b
\csname mdseries@\target@meta@family@value\endcsname
- \expandafter\let\expandafter\@reservedc
+ \expandafter\let\expandafter\reserved@c
\csname bfseries@\target@meta@family@value\endcsname
+%<+debug>\series@change@debug{Targets for mdseries and bfseries:
+%<+debug> \reserved@b\space and \reserved@c}%
\expandafter\ifx\csname mdseries@#1\endcsname\k@series
- \let\target@series@value\@reservedb
+%<+debug> \series@change@debug{mdseries@#1 matched -> \reserved@b}%
+ \let\target@series@value\reserved@b
\else\expandafter\ifx\csname bfseries@#1\endcsname\k@series
- \let\target@series@value\@reservedc
- \else\ifx\k@series\mddef@ult \let\target@series@value\@reservedb
- \else\ifx\k@series\bfdef@ult \let\target@series@value\@reservedc
+%<+debug> \series@change@debug{bfseries@#1 matched -> \reserved@c}%
+ \let\target@series@value\reserved@c
+ \else\ifx\k@series\mddef@ult \let\target@series@value\reserved@b
+%<+debug> \series@change@debug{mddef@ult matched -> \reserved@b}%
+ \else\ifx\k@series\bfdef@ult \let\target@series@value\reserved@c
+%<+debug> \series@change@debug{bfdef@ult matched -> \reserved@c}%
\fi\fi\fi\fi
\fi
\fi
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index 81c78bebf18..ff2cc58b87a 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -195,7 +195,7 @@
{2020-02-02}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch@level{2}
+\def\ppatch@level{3}
%</plcore>
% \end{macrocode}
% \end{macro}