diff options
author | Karl Berry <karl@freefriends.org> | 2020-09-30 21:25:54 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-09-30 21:25:54 +0000 |
commit | d585ac5e31d316918ef296d56105b164c2e0b65b (patch) | |
tree | 94baa401a54acc711682d9040c31e1339fc0d5b2 /Master/texmf-dist/source/platex/base/plfonts.dtx | |
parent | f1cafc796a57bdc893fd92c70ee77509b6469269 (diff) |
platex (30sep20)
git-svn-id: svn://tug.org/texlive/trunk@56486 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex/base/plfonts.dtx')
-rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 258 |
1 files changed, 187 insertions, 71 deletions
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 12efc700e84..e68de15a597 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -160,13 +160,19 @@ % \changes{v1.7f}{2020/04/07}{Support legacy use of \cs{bfdefault} % and \cs{mddefault}, use \cs{@setYYseriesdefaultshook} % (sync with ltfssini.dtx 2020/03/19 v3.1k and 2020/04/06 v3.1m)} +% \changes{v1.7g}{2020/04/14}{Small update for speed. +% (sync with ltfssdcl.dtx 2020/04/13 v3.0v)} +% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes +% (sync with ltfssini.dtx 2020/04/13 v3.1n)} +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2020/04/07 v1.7f pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2020/09/28 v1.7h pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -2966,10 +2972,15 @@ % $B$J$j$^$7$?!#(Bltfssini.dtx 1995/10/16 v3.0f$B$NJQ99$b;29M!#!K(B % \changes{v1.7a}{2020/03/06}{\cs{@defaultfamilyhook}$B$r3hMQ(B % (sync with ltfssini.dtx 2020/02/10 v3.1h)} +% +% \LaTeXe~2020-10-01$B$G$O(B|\AddToHook|$B$,;H$($^$9!#(B +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2020/04/12}{\normalfont} %<platexrelease> {Use \@defaultfamilyhook}% %<*plcore|platexrelease> +\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN \ifx\@defaultfamilyhook\@undefined % old \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% @@ -2995,7 +3006,23 @@ \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } -\fi +\fi % done +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +%<platexrelease>\DeclareRobustCommand\normalfont{% +%<platexrelease> \fontencoding\encodingdefault +%<platexrelease> \edef\f@family{\familydefault}% +%<platexrelease> \edef\f@series{\seriesdefault}% +%<platexrelease> \edef\f@shape{\shapedefault}% +%<platexrelease> \UseHook{normalfont}% +%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish +%<platexrelease> \selectfont} +\AddToHook{normalfont}{% + \kanjiencoding{\kanjiencodingdefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% +} +\fi % --- for 2020-10-01 END \adjustbaseline \let\reset@font\normalfont %</plcore|platexrelease> @@ -3071,7 +3098,7 @@ % % \begin{macro}{\expand@font@defaults} % $B%U%!%_%j$N%G%U%)%k%H$r40A4E83+$7$^$9!#(B -% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/04/06 v3.1m$B0J9_!K$r(B +% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/08/21 v3.2b$B0J9_!K$r(B % $B:\$;$F$*$-$^$9!#(B % \begin{macrocode} %\def\expand@font@defaults{% @@ -3080,71 +3107,93 @@ % \edef\ttdef@ult{\ttdefault}% % \series@maybe@drop@one@m\bfdefault\bfdef@ult % !! changed 2020/02/25 v3.1j % \series@maybe@drop@one@m\mddefault\mddef@ult % !! changed 2020/02/25 v3.1j -% \edef\famdef@ult{\familydefault}% -% \@expandfontdefaultshook % !! added 2020/04/06 v3.1m +% %\edef\famdef@ult{\familydefault}% !! deleted 2020/04/13 v3.1n +% %\@expandfontdefaultshook % !! only in 2020/04/06 v3.1m +% \UseHook{expand@font@defaults}% !! new in 2020/08/21 v3.2b %} % \end{macrocode} % p\LaTeX{}$B$G$O!"0J2<$N%3!<%I$rKvHx$KDI2C$7$^$9!#(B -% ^^A ltfssini.dtx 2020/04/06 v3.1m $B$K4p$E$1$P(B |\@expandfontdefaultshook| $B$r(B -% ^^A $B;H$&$3$H$b$G$-$k$,!"$H$j$"$($:(B |\g@addto@macro| $B$GKvHxDI2C$GLdBj$J$$!#(B -% \begin{macrocode} -\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +% \file{ltfssini.dtx} 2020/04/13 v3.1n$B$G(B|latex3/latex2e#315|$BBP:v$,(B +% $BF~$j$^$7$?$N$G!"$=$NA08e$G(B|\expand@font@defaults|$B$*$h$S(B +% |\init@series@setup|$B$X$NDI2CFbMF$,JQ$o$j$^$9!#(B +% ^^A $B=>Mh$O(B |\init@series@setup| $B$+$i8F$S=P$5$l$k(B +% ^^A |\expand@font@defaults| $B$,(B |\famdef@ult| $B$r@_Dj$7$F$$$?!#(B +% ^^A $B?7HG$O(B |\init@series@setup| $B$+$i$b$O$d(B +% ^^A |\expand@font@defaults| $B$O8F$S=P$5$:!"Be$o$j$K(B +% ^^A |\init@series@setup| $B$G0lEY(B |\reset@font| $B$r<B9T$7!"(B +% ^^A $B$=$l$K4p$E$$$F(B |\seriesdefault| $B$r@_Dj$9$k!#(B +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} +% \begin{macrocode} +\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\expand@font@defaults{% \edef\mcdef@ult{\mcdefault}% \edef\gtdef@ult{\gtdefault}% \edef\kanjidef@ult{\kanjifamilydefault}% } -\fi +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{expand@font@defaults}{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + %\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n +} +\fi % --- for 2020-10-01 END +\fi %</2020-02-02|2020-10-01> % \end{macrocode} -% % \end{macro} % % \begin{macro}{\bfseries} % \begin{macro}{\mdseries} % $B%U%!%_%j$4$H$N@_DjCM$r;2>H$7$^$9!#(B -% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/04/06 v3.1m$B0J9_!K$r(B +% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/09/30 v3.2d$B0J9_!K$r(B % $B:\$;$F$*$-$^$9!#(B % \begin{macrocode} %\DeclareRobustCommand\bfseries{% % \not@math@alphabet\bfseries\mathbf % \expand@font@defaults -% \ifx\bfdefault\bfdefault@previous\else +% \ifx\bfdefault\bfdefault@previous\else % new in 2020/03/19 v3.1k % \expandafter\def\expandafter\bfdefault % \expandafter{\bfdefault\@empty}% -% \let\bfseries@previous\bfdefault +% \let\bfdefault@previous\bfdefault % bugfix in 2020/09/30 v3.2d % \let\bfseries@rm\bfdef@ult % \let\bfseries@sf\bfdef@ult % \let\bfseries@tt\bfdef@ult -% \@setbfseriesdefaultshook % !! added 2020/04/06 v3.1m +% %\@setbfseriesdefaultshook % !! only in 2020/04/06 v3.1m +% \UseHook{bfseries/defaults}% !! new in 2020/08/21 v3.2b % \fi % \ifx\f@family\rmdef@ult \fontseries\bfseries@rm % \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf % \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt % \else \fontseries\bfdefault % \fi\fi\fi +% \UseHook{bfseries}% !! new in 2020/08/21 v3.2b % \selectfont %} %\DeclareRobustCommand\mdseries{% % \not@math@alphabet\mdseries\relax % \expand@font@defaults -% \ifx\mddefault\mddefault@previous\else +% \ifx\mddefault\mddefault@previous\else % new in 2020/03/19 v3.1k % \expandafter\def\expandafter\mddefault % \expandafter{\mddefault\@empty}% -% \let\mdseries@previous\mddefault +% \let\mddefault@previous\mddefault % bugfix in 2020/09/30 v3.2d % \let\mdseries@rm\mddef@ult % \let\mdseries@sf\mddef@ult % \let\mdseries@tt\mddef@ult -% \@setmdseriesdefaultshook % !! added 2020/04/06 v3.1m +% %\@setmdseriesdefaultshook % !! only in 2020/04/06 v3.1m +% \UseHook{mdseries/defaults}% !! new in 2020/08/21 v3.2b % \fi % \ifx\f@family\rmdef@ult \fontseries\mdseries@rm % \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf % \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt % \else \fontseries\mddefault % \fi\fi\fi +% \UseHook{mdseries}% !! new in 2020/08/21 v3.2b % \selectfont %} % \end{macrocode} % $B0J2<$G(Bp\LaTeX{}$BMQ$K:FDj5A$7$^$9!#(B +% $B$^$:(B\LaTeXe~2020-02-02$B%Y!<%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)} @@ -3152,61 +3201,82 @@ % and \cs{mddefault}, use \cs{@setYYseriesdefaultshook} % (sync with ltfssini.dtx 2020/03/19 v3.1k and 2020/04/06 v3.1m)} % \begin{macrocode} -\ifx\bfseries@rm\@undefined % old -\let\pltx@fontseries@saved\@undefined -\let\pltx@patch@bfseries\@undefined -\let\pltx@patch@mdseries\@undefined -\else % 2020-02-02 -\let\pltx@fontseries@saved\fontseries -\def\pltx@patch@bfseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname bfseries \endcsname{% - \not@math@alphabet#1#2% should be \bfseries\mathbf - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setbfseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + % 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} % 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} \selectfont - }% -} -\ifx\@setbfseriesdefaultshook\@undefined\else -\g@addto@macro\@setbfseriesdefaultshook{% - \let\bfseries@mc\bfdef@ult - \let\bfseries@gt\bfdef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@bfseries\csname bfseries \endcsname -\def\pltx@patch@mdseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname mdseries \endcsname{% - \not@math@alphabet#1#2% should be \mdseries\relax - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setmdseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + % 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} % 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} \selectfont - }% } -\ifx\@setmdseriesdefaultshook\@undefined\else -\g@addto@macro\@setmdseriesdefaultshook{% +% \end{macrocode} +% $B<!$K(B\LaTeXe~2020-10-01$B%Y!<%9!#(B|\AddToHook|$B$G==J,$G$9!#(B +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} +% \begin{macrocode} +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{bfseries/defaults}{% + \let\bfseries@mc\bfdef@ult + \let\bfseries@gt\bfdef@ult +} +\AddToHook{bfseries}{% + % 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 +} +\AddToHook{mdseries/defaults}{% \let\mdseries@mc\mddef@ult \let\mdseries@gt\mddef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@mdseries\csname mdseries \endcsname -\fi +\AddToHook{mdseries}{% + % 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 +} +\fi % --- for 2020-10-01 END +\fi %</2020-02-02|2020-10-01> % \end{macrocode} % \end{macro} % \end{macro} @@ -3333,23 +3403,32 @@ % % \begin{macro}{\init@series@setup} % |\begin{document}|$B$G<B9T$5$l$k=i4|2=$G$9!#(B -% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A$r:\$;$F$*$-$^$9!#(B +% $B$^$:!"%*%j%8%J%k$N(B\LaTeX{}$B$NDj5A!J(Bltfssini.dtx 2020/04/13 v3.1n$B0J9_!K$r(B +% $B:\$;$F$*$-$^$9!#(B % \begin{macrocode} %\def\init@series@setup{% % \ifx\bfseries@rm@kernel\bfseries@rm -% \expandafter\in@\expandafter{\rmdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \expandafter\in@\expandafter{\rmdefault}% +% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% % \ifin@ \else \def\bfseries@rm{b}\fi\fi % \ifx\bfseries@sf@kernel\bfseries@sf -% \expandafter\in@\expandafter{\sfdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \expandafter\in@\expandafter{\sfdefault}% +% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% % \ifin@ \else \def\bfseries@sf{b}\fi\fi % \ifx\bfseries@tt@kernel\bfseries@tt -% \expandafter\in@\expandafter{\ttdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \expandafter\in@\expandafter{\ttdefault}% +% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% % \ifin@ \else \def\bfseries@tt{b}\fi\fi -% \expand@font@defaults -% \ifx\famdef@ult\rmdef@ult \rmfamily -% \else\ifx\famdef@ult\sfdef@ult \sffamily -% \else\ifx\famdef@ult\ttdef@ult \ttfamily -% \fi\fi\fi +% %\expand@font@defaults % !! deleted in 2020/04/13 v3.1n BEGIN +% %\ifx\famdef@ult\rmdef@ult \rmfamily % !! CONT +% %\else\ifx\famdef@ult\sfdef@ult \sffamily % !! CONT +% %\else\ifx\famdef@ult\ttdef@ult \ttfamily % !! CONT +% %\fi\fi\fi % !! deleted in 2020/04/13 v3.1n END +% \reset@font % !! added in 2020/04/13 v3.1n BEGIN +% \ifx\seriesdefault\seriesdefault@kernel % !! CONT +% \mdseries % !! CONT +% \let\seriesdefault\f@series % !! CONT +% \fi % !! added in 2020/04/13 v3.1n END %}% % \end{macrocode} % $B$3$3$+$i$,(Bp\LaTeX{}$B$K$h$kDI2C%3!<%I$G$9!#(B @@ -3360,16 +3439,51 @@ % \end{itemize} % $B$K$J$k$3$H$KCm0U$7$^$9!#(B % \changes{v1.6w}{2020/02/03}{$B4,$-La$7$N%P%0=$@5(B} +% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes +% (sync with ltfssini.dtx 2020/04/13 v3.1n)} % \begin{macrocode} -\expandafter\ifx\csname init@series@setup\endcsname\relax\else % 2020-02-02 +\expandafter\ifx\csname init@series@setup\endcsname\relax +\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\init@series@setup{% \ifx\kanjidef@ult\mcdef@ult \mcfamily \else\ifx\kanjidef@ult\gtdef@ult \gtfamily \fi\fi }% -\fi +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\g@addto@macro\init@series@setup{% + % !! sync with 2020/04/13 v3.1n BEGIN + \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel + \mdseries + \let\kanjiseriesdefault\k@series + \fi + % !! sync with 2020/04/13 v3.1n END +}% +\fi % --- for 2020-10-01 END +\fi %</2020-02-02|2020-10-01> +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\kanjiseriesdefault} +% \begin{macro}{\kanjiseriesdefault@kernel} +% |\kanjiseriesdefault|$B$,(B\file{pldefs.ltx}$B$^$?$O(B\file{pldefs.cfg}$B$G(B +% $BDj5A$5$l$?8e$K!"$=$NKvHx$K(B|\@empty|$B$rDI2C$7$^$9!#(B +% $B$3$l$OE83+;~$K>CLG$7$^$9$,!"J8=q$N%W%j%"%s%V%k$GJL$NCM$K(B +% $BJQ99$5$l$?$+$I$&$+8!CN$G$-$k$h$&$K$J$j$^$9!#(B +% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes +% (sync with ltfssini.dtx 2020/04/13 v3.1n)} +% \begin{macrocode} +\ifx\AddToHook\@undefined +\else % --- for LaTeX2e 2020-10-01 or later BEGIN +\def\code@after@pldefs{% +\expandafter\def\expandafter\kanjiseriesdefault + \expandafter{\kanjiseriesdefault\@empty} +\let\kanjiseriesdefault@kernel\kanjiseriesdefault} +\fi % --- for LaTeX2e 2020-10-01 or later END % \end{macrocode} % \end{macro} +% \end{macro} % % % \begin{macro}{\mcfamily} @@ -3593,14 +3707,16 @@ % $BJ8=q$N@hF,$G!"OBJ8%G%U%)%k%H%U%)%s%H$NJQ99$,H?1G$5$l$J$$$N$r=$@5$7$^$9!#(B % \changes{v1.3g}{1999/04/05}{plpatch.ltx$B$NFbMF$rH?1G!#(B % $B$"$j$,$H$&!";3K\$5$s!#(B} +% \changes{v1.7g}{2020/04/14}{Small update for speed. +% (sync with ltfssdcl.dtx 2020/04/13 v3.0v)} % \begin{macrocode} %<*plcore> \let\romanprocess@table\process@table \def\kanjiprocess@table{% - \kanjiencoding{\kanjiencodingdefault}% - \kanjifamily{\kanjifamilydefault}% - \kanjiseries{\kanjiseriesdefault}% - \kanjishape{\kanjishapedefault}% + \kanjiencoding\kanjiencodingdefault + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% } \def\process@table{% \romanprocess@table |