summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-26 21:06:24 +0000
committerKarl Berry <karl@freefriends.org>2023-02-26 21:06:24 +0000
commit3daa3176162257ecf62b61045229a426fcc80d56 (patch)
tree24d1834ed986766ec9ce7c0c3d9899283965156c /Master/texmf-dist/tex/platex
parent46e1638b28ce37028fc72a00dcd683bc1d092bfa (diff)
pxbase (26feb23)
git-svn-id: svn://tug.org/texlive/trunk@66187 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/pxbase/pxbabel.sty151
-rw-r--r--Master/texmf-dist/tex/platex/pxbase/pxbase.sty4
-rw-r--r--Master/texmf-dist/tex/platex/pxbase/pxbasenc.def21
-rw-r--r--Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def2
-rw-r--r--Master/texmf-dist/tex/platex/pxbase/upkcat.sty6
5 files changed, 116 insertions, 68 deletions
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty b/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty
index 1ef550c54ab..4f336c57209 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty
+++ b/Master/texmf-dist/tex/platex/pxbase/pxbabel.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxbabel.sty'.
%%
-%% Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2008-2023 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxbabel}[2021/05/31 v1.3 PX Babel interface for CJK]
+\ProvidesPackage{pxbabel}[2023/02/25 v1.4 PX Babel interface for CJK]
\def\pxbb@pkgname{pxbabel}
%--------------------------------------- general
@@ -45,6 +45,10 @@
(You must load 'otf' package before this package.)\MessageBreak
\fi
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!}}
+\bxPreamble\def\pxbb@err@ivval#1#2{%
+ \PackageError\pxbb@pkgname
+ {Invalid value for '#1': #2}%
+ {\@eha}}
%--------------------------------------- Processing package options
@@ -97,12 +101,24 @@
\bxIfExpToEqualX{\mcdefault}{mc}{}{\pxbb@stdjaencodingtrue}% default
\DeclareOption{stdjaencoding}{\pxbb@stdjaencodingtrue}
\DeclareOption{nostdjaencoding}{\pxbb@stdjaencodingfalse}
-\newbool{pxbb@patchutfcmds}\pxbb@patchutfcmdstrue
+\newbool{pxbb@patchutfcmds}
\DeclareOption{patchutfcmds}{\pxbb@patchutfcmdstrue}
\DeclareOption{nopatchutfcmds}{\pxbb@patchutfcmdsfalse}
-\newbool{pxbb@forcedeluxemulti}
-\DeclareOption{forcedeluxemulti}{\pxbb@forcedeluxemultitrue}
-\DeclareOption{noforcedeluxemulti}{\pxbb@forcedeluxemultifalse}
+\chardef\pxbb@deluxemulti@@false=0
+\chardef\pxbb@deluxemulti@@old=1
+\chardef\pxbb@deluxemulti@@new=2
+\chardef\pxbb@deluxemulti@@true=2
+\chardef\pxbb@deluxemulti\pxbb@deluxemulti@@false
+\define@key{pxbabel}{deluxemulti}[true]{%
+ \bxIfcsdef{pxbb@deluxemulti@@#1}{%
+ \letcs\pxbb@deluxemulti{pxbb@deluxemulti@@#1}%
+ }{\pxbb@err@ivval{deluxemulti}{#1}}}
+\DeclareOption{nodeluxemulti}{%
+ \chardef\pxbb@deluxemulti\pxbb@deluxemulti@@false}
+\DeclareOption{forcedeluxemulti}{%
+ \chardef\pxbb@deluxemulti\pxbb@deluxemulti@@old}
+\DeclareOption{noforcedeluxemulti}{%
+ \chardef\pxbb@deluxemulti\pxbb@deluxemulti@@false}
% (<lang_id>, +<lang_id>)
\bxPreamble\let\pxbb@last@lang\relax
\bxForEachIn\pxbb@cjk@langid@list\do{%
@@ -132,13 +148,10 @@
%% \ifpxbb@otf
%% \ifpxbb@otfmulti
-%% \ifpxbb@pxotf
\newbool{pxbb@otf}
\newbool{pxbb@otfmulti}
-\newbool{pxbb@pxotf}
\@ifpackageloaded{otf}{\pxbb@otftrue}{}
\@ifpackageloaded{mlutf}{\pxbb@otfmultitrue}{}
-\@ifpackageloaded{pxotf}{\pxbb@otfmultitrue\pxbb@pxotftrue}{}
%% \ifpxbb@otfdeluxe
\newbool{pxbb@otfdeluxe}
@@ -152,33 +165,28 @@
% The feature 'switchfont' requires multi-CJK support.
\ifpxbb@switchfont
\ifpxbb@otfmulti\else
- \ifupTeX\else
+ \ifnativeupTeX\else
\pxbb@warn@nocjk
\pxbb@switchfontfalse
\fi\fi\fi
% Check if 'patchutfcmds' is available.
-\if \ifpxbb@switchfont
- \ifupTeX
- \ifpxbb@otf
- \ifx\patchcmd\@undefined F\else T\fi
- \else F\fi
- \else F\fi
- \else F\fi F%
- \pxbb@patchutfcmdsfalse
+\ifpxbb@patchutfcmds
+ \PackageWarningNoLine\pxbb@pkgname
+ {Option 'patchutfcmds' is abolished}
\fi
-% Check if 'forcedeluxemulti' is available.
-\ifpxbb@forcedeluxemulti
- \ifupTeX\else
+% Check if 'deluxemulti' is available.
+\ifnum\pxbb@deluxemulti=\pxbb@deluxemulti@@false\else
+ \ifnativeupTeX\else
\PackageWarningNoLine\pxbb@pkgname
{Option 'forcedeluxemulti' is invalid, since\MessageBreak
- the engine is not upTeX}
- \pxbb@forcedeluxemultifalse
+ the engine is not upLaTeX}
+ \let\pxbb@deluxemulti\pxbb@deluxemulti@@false
\fi
\ifpxbb@otfmulti\else
\PackageWarningNoLine\pxbb@pkgname
{Option 'forcedeluxemulti' is invalid, since\MessageBreak
package 'otf' is not loaded with 'multi'}
- \pxbb@forcedeluxemultifalse
+ \let\pxbb@deluxemulti\pxbb@deluxemulti@@false
\fi
\fi
@@ -362,14 +370,14 @@
\fi %----</otfmulti>
-\ifupTeX %----<*upTeX>
+\ifnativeupTeX %----<*upTeX>
%% preparations
\bxRequireDefinition{pxbasenc}
\pxBDHookEncSwitchOTF
+\pxEncSwitchOTF
%% declarations for upTeX standatd CJK fonts
-\ifpxbb@pxotf\else
\pxDeclareBasicCJKEncoding{J20}{J30}% UniJIS
\pxDeclareBasicCJKFamily{J20}{!upjpnrm-h}{!upjpngt-h}{*gt}{*gt}
\pxDeclareBasicCJKFamily{J30}{!upjpnrm-v}{!upjpngt-v}{*gt}{*gt}
@@ -390,7 +398,6 @@
\pxDeclareExtraCJKFamily{#1}{\mcdefault}{*mc}{*mc}%
\pxDeclareExtraCJKFamily{#1}{\gtdefault}{*gt}{*gt}}
\endgroup
-\fi
%% declarations for upTeX + otf deluxe CJK fonts
\ifpxbb@otfdeluxe
@@ -433,7 +440,7 @@
\pxDeclareKanjiFamily{J34}{mg}
\pxDeclareBasicCJKShape{J34}{mg}{m}{!upnmlmgothrn-v}
-\ifpxbb@forcedeluxemulti
+\ifnum\pxbb@deluxemulti=\pxbb@deluxemulti@@old
% UniKS
\pxDeclareBasicCJKShape{J21}{hmc}{l}{!utfkml--h}
@@ -492,7 +499,66 @@
\pxDeclareKanjiFamily{J33}{mg}
\pxDeclareBasicCJKShape{J33}{mg}{m}{!utftmgr--v}
-\fi % pxbb@forcedeluxemulti
+\else\ifnum\pxbb@deluxemulti=\pxbb@deluxemulti@@new
+
+% UniKS
+\pxDeclareBasicCJKShape{J21}{hmc}{l}{!upnmkorminl-h}
+\pxDeclareBasicCJKShape{J21}{hmc}{m}{!upnmkorminr-h}
+\pxDeclareBasicCJKShape{J21}{hmc}{bx}{!upnmkorminb-h}
+\pxDeclareBasicCJKShape{J21}{hgt}{m}{!upnmkorgothr-h}
+\pxDeclareBasicCJKShape{J21}{hgt}{bx}{!upnmkorgothb-h}
+\pxDeclareBasicCJKShape{J21}{hgt}{eb}{!upnmkorgotheb-h}
+\pxDeclareKanjiFamily{J21}{mg}
+\pxDeclareBasicCJKShape{J21}{mg}{m}{!upnmkormgothr-h}
+
+\pxDeclareBasicCJKShape{J31}{hmc}{l}{!upnmkorminl-v}
+\pxDeclareBasicCJKShape{J31}{hmc}{m}{!upnmkorminr-v}
+\pxDeclareBasicCJKShape{J31}{hmc}{bx}{!upnmkorminb-v}
+\pxDeclareBasicCJKShape{J31}{hgt}{m}{!upnmkorgothr-v}
+\pxDeclareBasicCJKShape{J31}{hgt}{bx}{!upnmkorgothb-v}
+\pxDeclareBasicCJKShape{J31}{hgt}{eb}{!upnmkorgotheb-v}
+\pxDeclareKanjiFamily{J31}{mg}
+\pxDeclareBasicCJKShape{J31}{mg}{m}{!upnmkormgothr-v}
+
+% UniGB
+\pxDeclareBasicCJKShape{J22}{hmc}{l}{!upnmschminl-h}
+\pxDeclareBasicCJKShape{J22}{hmc}{m}{!upnmschminr-h}
+\pxDeclareBasicCJKShape{J22}{hmc}{bx}{!upnmschminb-h}
+\pxDeclareBasicCJKShape{J22}{hgt}{m}{!upnmschgothr-h}
+\pxDeclareBasicCJKShape{J22}{hgt}{bx}{!upnmschgothb-h}
+\pxDeclareBasicCJKShape{J22}{hgt}{eb}{!upnmschgotheb-h}
+\pxDeclareKanjiFamily{J22}{mg}
+\pxDeclareBasicCJKShape{J22}{mg}{m}{!upnmschmgothr-h}
+
+\pxDeclareBasicCJKShape{J32}{hmc}{l}{!upnmschminl-v}
+\pxDeclareBasicCJKShape{J32}{hmc}{m}{!upnmschminr-v}
+\pxDeclareBasicCJKShape{J32}{hmc}{bx}{!upnmschminb-v}
+\pxDeclareBasicCJKShape{J32}{hgt}{m}{!upnmschgothr-v}
+\pxDeclareBasicCJKShape{J32}{hgt}{bx}{!upnmschgothb-v}
+\pxDeclareBasicCJKShape{J32}{hgt}{eb}{!upnmschgotheb-v}
+\pxDeclareKanjiFamily{J32}{mg}
+\pxDeclareBasicCJKShape{J32}{mg}{m}{!upnmschmgothr-v}
+
+% UniCNS
+\pxDeclareBasicCJKShape{J23}{hmc}{l}{!upnmtchminl-h}
+\pxDeclareBasicCJKShape{J23}{hmc}{m}{!upnmtchminr-h}
+\pxDeclareBasicCJKShape{J23}{hmc}{bx}{!upnmtchminb-h}
+\pxDeclareBasicCJKShape{J23}{hgt}{m}{!upnmtchgothr-h}
+\pxDeclareBasicCJKShape{J23}{hgt}{bx}{!upnmtchgothb-h}
+\pxDeclareBasicCJKShape{J23}{hgt}{eb}{!upnmtchgotheb-h}
+\pxDeclareKanjiFamily{J23}{mg}
+\pxDeclareBasicCJKShape{J23}{mg}{m}{!upnmtchmgothr-h}
+
+\pxDeclareBasicCJKShape{J33}{hmc}{l}{!upnmtchminl-v}
+\pxDeclareBasicCJKShape{J33}{hmc}{m}{!upnmtchminr-v}
+\pxDeclareBasicCJKShape{J33}{hmc}{bx}{!upnmtchminb-v}
+\pxDeclareBasicCJKShape{J33}{hgt}{m}{!upnmtchgothr-v}
+\pxDeclareBasicCJKShape{J33}{hgt}{bx}{!upnmtchgothb-v}
+\pxDeclareBasicCJKShape{J33}{hgt}{eb}{!upnmtchgotheb-v}
+\pxDeclareKanjiFamily{J33}{mg}
+\pxDeclareBasicCJKShape{J33}{mg}{m}{!upnmtchmgothr-v}
+
+\fi\fi % pxbb@deluxemulti
\fi % pxbb@otfdeluxe
@@ -537,33 +603,6 @@
\fi %----</upTeX>
-%--------------------------------------- Patch to '\UTF' etc.
-\ifpxbb@patchutfcmds
-
-%% \pxbb@set@encoding
-\edef\pxbb@set@encoding{%
- \noexpand\iftdir \noexpand\kanjiencoding{\cy@encoding}%
- \noexpand\else \noexpand\kanjiencoding{\ct@encoding}%
- \noexpand\fi
-}
-
-%% apply the patch
-\@for\pxbb@tmpa:={%
- UTF,UTFK,UTFC,UTFT,UTFM,CID,CIDK,CIDC,CIDT%
-}\do{%
- \ifcsdef{\pxbb@tmpa\space}{%then
- \expandafter\patchcmd\csname \pxbb@tmpa\space\endcsname{%from
- \begingroup\edef\reserved@a
- }{%to
- \begingroup\pxbb@set@encoding\edef\reserved@a
- }{}{%failure
- \PackageWarningNoLine\pxbb@pkgname
- {Cannot patch to '\@backslashchar\pxbb@tmpa_'}%
- }%
- }{}%
-}
-
-\fi
%--------------------------------------- Other user commands
%%<*> \cjklanguagename{<lang_id>}
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxbase.sty b/Master/texmf-dist/tex/platex/pxbase/pxbase.sty
index 0078547e4fe..081c78ad29e 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxbase.sty
+++ b/Master/texmf-dist/tex/platex/pxbase/pxbase.sty
@@ -1,14 +1,14 @@
%%
%% This is file 'pxbase.sty'.
%%
-%% Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2008-2023 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
%% This package is distributed under the MIT License.
%%
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxbase}[2021/05/31 v1.3 PX base library]
+\ProvidesPackage{pxbase}[2023/02/25 v1.4 PX base library]
% The pxbase package now does the same thing as the bxbase package.
\RequirePackageWithOptions{bxbase}[2017/05/29]
\endinput
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def b/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def
index df54e082bf3..0877b55be4d 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def
+++ b/Master/texmf-dist/tex/platex/pxbase/pxbasenc.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxbasenc.def}[2021/05/31 v1.3 PX encoding library]
+\ProvidesFile{pxbasenc.def}[2023/02/25 v1.4 PX encoding library]
\def\pxec@pkgname{PXbase} % bundle name
%% code guards
@@ -495,20 +495,29 @@
% \UTF & \CID require the current encoding to be the standard one, thus
% they won't work well along with packages that change Japanese encoding
% (pxfontenc, pxbabel, etc.). This patch resolves this problem.
-\providecommand*\pxBDHookEncSwitchOTF{\pxec@bdhook@encswotf@do}
-\@onlypreamble\pxec@bdhook@encswotf@do
-\def\pxec@bdhook@encswotf@do{%
- \AtBeginDocument{%
+\@onlypreamble\pxBDHookEncSwitchOTF
+\providecommand*\pxBDHookEncSwitchOTF{%
+ \global\let\pxBDHookEncSwitchOTF\@empty % nullify
+ \AtBeginDocument{\pxec@encswotf@do}}
+\@onlypreamble\pxEncSwitchOTF
+\providecommand*\pxEncSwitchOTF{%
+ \pxec@encswotf@do}
+\@onlypreamble\pxec@encswotf@do
+\def\pxec@encswotf@do{%
+ \let\pxec@JYn\@undefined
\@ifpackageloaded{otf}{\let\pxec@JYn\otf@JYn}{}%
\@ifpackageloaded{utf}{\let\pxec@JYn\utf@JYn}{}%
\ifx\pxec@JYn\@undefined\else
+ \let\pxec@encswotf@do\relax
% hook at the \set@character invocation, so that encoding will
% be forced to be the standard one
\long\def\set@character{% \long, as the original is
\afterassignment\pxec@put@character\@tempcnta}%
\def\pxec@put@character{\kanjiencoding{\pxec@JYn}\put@character}%
+ \long\def\set@character@{%
+ \afterassignment\pxec@put@character@\@tempcnta}%
+ \def\pxec@put@character@{\kanjiencoding{\pxec@JYn}\put@character@}%
\fi}%
- \let\pxBDHookEncSwitchOTF\@empty}% nullify
%--------------------------------------- all done
\pxec@restore@codes
diff --git a/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def b/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def
index 52210eabec8..09b2cbc8989 100644
--- a/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def
+++ b/Master/texmf-dist/tex/platex/pxbase/pxjsfenc.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjsfenc.def}[2021/05/31 v1.3 PX JSF encoding]
+\ProvidesFile{pxjsfenc.def}[2023/02/25 v1.4 PX JSF encoding]
%% code guards
\edef\pxec@jsf@restore@codes{%
diff --git a/Master/texmf-dist/tex/platex/pxbase/upkcat.sty b/Master/texmf-dist/tex/platex/pxbase/upkcat.sty
index 721bddd2e24..d9cc8310d4a 100644
--- a/Master/texmf-dist/tex/platex/pxbase/upkcat.sty
+++ b/Master/texmf-dist/tex/platex/pxbase/upkcat.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'upkcat.sty'.
%%
-%% Copyright (c) 2008-2021 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2008-2023 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -30,12 +30,12 @@
\long\def\x#1\ProvidesPackage#2[#3]{\immediate\write-1{Package: #2 #3}}
\expandafter\x
\else %<*LaTeX>
- \RequirePackage{ifuptex}[2008/03/14]\RequireupTeX
+ \RequirePackage{ifuptex}[2008/03/14]\RequireNativeupTeX
\fi %</LaTeX>
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{upkcat}[2021/05/31 v1.3 safe kcatcode access]
+\ProvidesPackage{upkcat}[2023/02/25 v1.4 safe kcatcode access]
%--------------------------------------- main