summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-09 22:04:24 +0000
committerKarl Berry <karl@freefriends.org>2020-02-09 22:04:24 +0000
commit9cbfe27fd2b911631b45571e735e469718879e39 (patch)
tree79fb9fd929a87956df13ba1a3c43ae7c339d0d4f /Master/texmf-dist/source/platex
parent2f6b7af3e1e6de0cd3cad739cbb9b250966725f3 (diff)
platex (9feb20)
git-svn-id: svn://tug.org/texlive/trunk@53732 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex')
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx26
-rw-r--r--Master/texmf-dist/source/platex/base/plvers.dtx2
2 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index b91a130c2b8..f9f4799ebe7 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -128,6 +128,8 @@
% \changes{v1.6v}{2020/02/01}{Set \cs{kanjishapedefault} explicitly to ``n''
% (sync with fontdef.dtx 2019/12/17 v3.0e)}
% \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)}
% \fi
%
% \iffalse
@@ -1974,14 +1976,14 @@
\@nil
}
\def\merge@kanji@series@#1#2#3\@nil{%
- \def\@reserveda{#3}%
- \ifx\@reserveda\@empty
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
\set@target@series@kanji{#2}%
\else
\begingroup\let\f@encoding\k@encoding\let\f@family\k@family
\maybe@load@fontshape\endgroup
- \edef\@reserveda{\k@encoding /\k@family /#1/\k@shape}%
- \ifcsname \@reserveda \endcsname
+ \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}%
+ \ifcsname \reserved@a \endcsname
\set@target@series@kanji{#1}%
\else
\ifcsname \k@encoding /\k@family /#2/\k@shape \endcsname
@@ -2065,14 +2067,14 @@
\@nil
}
\def\merge@kanji@shape@#1#2#3\@nil{%
- \def\@reserveda{#3}%
- \ifx\@reserveda\@empty
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
\edef\k@shape{#2}%
\else
\begingroup\let\f@encoding\k@encoding\let\f@family\k@family
\maybe@load@fontshape\endgroup
- \edef\@reserveda{\k@encoding /\k@family /\k@series/#1}%
- \ifcsname \@reserveda\endcsname
+ \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}%
+ \ifcsname \reserved@a\endcsname
\edef\k@shape{#1}%
\else
\ifcsname \k@encoding /\k@family /\k@series/#2\endcsname
@@ -2369,8 +2371,8 @@
}
\def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}}
\def\update@series@target@value@kanji#1{%
- \def\@reserveda{#1}%
- \ifx\target@meta@family@value\@reserveda % rm -> rm do nothing
+ \def\reserved@a{#1}%
+ \ifx\target@meta@family@value\reserved@a % rm -> rm do nothing
\else
\expandafter\ifx\csname#1def@ult\endcsname\k@family
\let\@elt\@gobble
@@ -2441,14 +2443,14 @@
% $B$3$l$i$O!"(B|\rmfamily|$B$J$I$KBP1~$7$^$9!#(B
% |\mathmc|$B$H(B|\mathgt|$B$O?t<0Fb$GMQ$$$k$H$-$N%3%^%s%IL>$G$9!#(B
% \begin{macrocode}
-\ifx\prepare@family@series@update@kanji\@undefined % 2020-02-02
+\ifx\prepare@family@series@update@kanji\@undefined % old
\DeclareRobustCommand\mcfamily
{\not@math@alphabet\mcfamily\mathmc
\kanjifamily\mcdefault\selectfont}
\DeclareRobustCommand\gtfamily
{\not@math@alphabet\gtfamily\mathgt
\kanjifamily\gtdefault\selectfont}
-\else
+\else % 2020-02-02
\DeclareRobustCommand\mcfamily
{\not@math@alphabet\mcfamily\mathmc
\prepare@family@series@update@kanji{mc}\mcdefault\selectfont}
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index b354d4f4a62..81c78bebf18 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{1}
+\def\ppatch@level{2}
%</plcore>
% \end{macrocode}
% \end{macro}