summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-23 21:32:58 +0000
committerKarl Berry <karl@freefriends.org>2023-02-23 21:32:58 +0000
commit7429eef7184a11b7c9479166591034c774bdb7d6 (patch)
treed1e7eecf5488857b098afaf0727c3d9ff6983d9d /Master/texmf-dist/tex
parent7e2eed42b674c097c9672d1b543f259476cebe9d (diff)
bxbase (23feb23) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66103 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxbase.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxbase.sty4
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def26
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def7
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty4
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxutf8.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/bxutf8x.def2
-rw-r--r--Master/texmf-dist/tex/latex/bxbase/zxbase.sty4
9 files changed, 32 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxbase.def b/Master/texmf-dist/tex/latex/bxbase/bxbase.def
index 9094d91a3f4..6f89880f18e 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxbase.def
+++ b/Master/texmf-dist/tex/latex/bxbase/bxbase.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bxbase.def}[2020/10/04 v1.2 BX base library]
+\ProvidesFile{bxbase.def}[2023/02/23 v1.2a BX base library]
\def\bx@pkgname{BXbase} % bundle name
%% check intergrity
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxbase.sty b/Master/texmf-dist/tex/latex/bxbase/bxbase.sty
index aba1056922c..312fcf4b903 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxbase.sty
+++ b/Master/texmf-dist/tex/latex/bxbase/bxbase.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'bxbase.sty'.
%%
-%% Copyright (c) 2008-2020 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{LaTeX2e}
-\ProvidesPackage{bxbase}[2020/10/04 v1.2 BX base library]
+\ProvidesPackage{bxbase}[2023/02/23 v1.2a BX base library]
%--------------------------------------- main
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def
index 42c38d8b068..9ef90b3dcb9 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def
+++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ext.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bxtoolbox-ext.def}[2020/10/04 v1.2]
+\ProvidesFile{bxtoolbox-ext.def}[2023/02/23 v1.2a]
%% check intergrity
\edef\bxtb@tmpa{\@currname.\@currext}\def\bxtb@tmpb{bxtoolbox-ext.def}
@@ -194,7 +194,7 @@
\ifbxinOmega \bxHasUcsChartrue \fi
\ifbxinXeTeX \bxHasUcsChartrue \fi
\ifbxinLuaTeX \bxHasUcsChartrue \fi
-\ifbxinupTeX \bxHasUcsChartrue \fi
+\ifbxinnativeupTeX \bxHasUcsChartrue \fi
\csletcs{ifbx@hx@bigchar}{ifbxHasUcsChar}
%%<+> \ifbxHasAlUcsChar
@@ -216,25 +216,31 @@
% Makes \bxRes expand to a single CJK character token with
% character code <num> (in internal CJK encoding).
\ifbxinpTeX
+\catcode`\/=14 \catcode`\!=14
+\ifdef\forcecjktoken{\catcode`\/=9}{%else
+ \ifdef\enablecjktoken{\catcode`\!=9}{}}
\newcommand*\bxToJaChar[1]{%
- \bgroup \bxtb@forcecjktoken
+ \begingroup
+/ \forcecjktoken % retain right kcatcode
+! \enablecjktoken \ifnum\kcatcode#1<16 \kcatcode#1=18 \fi
\kansujichar\@ne=#1\relax
\xdef\bx@tch@g@temp{\kansuji\@ne}%
- \egroup \let\bxRes\bx@tch@g@temp}
- \ifdef{\forcecjktoken}%
- {\let\bxtb@forcecjktoken\forcecjktoken}%
- {\let\bxtb@forcecjktoken\relax}%
+ \endgroup \let\bxRes\bx@tch@g@temp}
+\catcode`\/=12 \catcode`\!=12
\fi
%%<+> \bxToUcsChar{<num>}
% Makes \bxRes expand to a single character token with
% character code <num> (in Unicode); valid for Unicode-aware
% engines plus upTeX.
-\ifbxinupTeX
-\let\bxToUcsChar\bxToJaChar
+\ifbxinnativeupTeX
+ \let\bxToUcsChar\bxToJaChar
+\else\ifbxinupTeX
+ \newcommand*\bxToUcsChar[1]{%
+ \bxToJaChar{\ifnum\ucs#1<\z@ \jis"222E\else\ucs#1\fi}}
\else\ifbxHasAlUcsChar
\let\bxToUcsChar\bxToChar
-\fi\fi
+\fi\fi\fi
%%<+> \bxToUcsCharDual{<jis>}{<ucs>}
% Makes \bxRes expand to a single character token with the following
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def
index 0ebd9f9190f..7c945de9cf5 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def
+++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox-ja.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bxtoolbox-ja.def}[2020/10/04 v1.2]
+\ProvidesFile{bxtoolbox-ja.def}[2023/02/23 v1.2a]
%% check intergrity
\edef\bxtb@tmpa{\@currname.\@currext}\def\bxtb@tmpb{bxtoolbox-ja.def}
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def
index 4e9738d3aa3..114bca6b943 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def
+++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.def
@@ -4,7 +4,7 @@
%% file declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bxtoolbox.def}[2020/10/04 v1.2]
+\ProvidesFile{bxtoolbox.def}[2023/02/23 v1.2a]
\providecommand*\bxtb@pkgname{BXtoolbox}% bundle name
%% check intergrity
@@ -122,6 +122,11 @@
\bxtb@do{upTeX}{\enablecjktoken}
\bxtb@do{jTeX}{\jintercharskip}
+%%<+> \ifbxinnativeupTeX / bxIfinnativeupTeX
+% Checks if upTeX with kanji-internal=uptex is used.
+\bxtb@do{nativeupTeX}{\bxtb@uniq}
+\ifbxinupTeX \ifnum\ucs"3000="3000 \bxtb@do{nativeupTeX}{\ucs}\fi\fi
+
%%<+> \bxPreamble\CSX[*]\CSY
% Prefix used for preamble-only commands.
% \CSX can be \def, \newcommand, \DeclareRobustCommand, etc.
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty
index 552ad0ae8fc..fa5446a401c 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty
+++ b/Master/texmf-dist/tex/latex/bxbase/bxtoolbox.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'bxtoolbox.sty'.
%%
-%% Copyright (c) 2008-2020 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 @@
%% file declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxtoolbox}[2020/10/04 v1.2 BX developers' toolbox]
+\ProvidesPackage{bxtoolbox}[2023/02/23 v1.2a BX developers' toolbox]
\def\bxtb@pkgname{bxtoolbox}
%--------------------------------------- main
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxutf8.def b/Master/texmf-dist/tex/latex/bxbase/bxutf8.def
index f4bf787f171..37f7ad51c14 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxutf8.def
+++ b/Master/texmf-dist/tex/latex/bxbase/bxutf8.def
@@ -3,7 +3,7 @@
%%
%
%% file declaration
-\ProvidesFile{bxutf8.def}[2020/10/04 v1.2 BX UTF-8 input encoding]
+\ProvidesFile{bxutf8.def}[2023/02/23 v1.2a BX UTF-8 input encoding]
%
% Note: All definitions in this file should be local.
% This file should not spill any spaces or \par.
diff --git a/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def b/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def
index e0ffd5413f3..49149a4c647 100644
--- a/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def
+++ b/Master/texmf-dist/tex/latex/bxbase/bxutf8x.def
@@ -3,7 +3,7 @@
%%
%
%% file declaration
-\ProvidesFile{bxutf8x.def}[2020/10/04 v1.2 BX extended utf8x input]
+\ProvidesFile{bxutf8x.def}[2023/02/23 v1.2a BX extended utf8x input]
%
% Note: All definitions in this file should be local.
% This file should not spill any spaces or \par.
diff --git a/Master/texmf-dist/tex/latex/bxbase/zxbase.sty b/Master/texmf-dist/tex/latex/bxbase/zxbase.sty
index a600d2d396d..4162ca3f390 100644
--- a/Master/texmf-dist/tex/latex/bxbase/zxbase.sty
+++ b/Master/texmf-dist/tex/latex/bxbase/zxbase.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'zxbase.sty'.
%%
-%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2023 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zxbase}[2020/10/04 v1.2]
+\ProvidesPackage{zxbase}[2023/02/23 v1.2a]
\RequirePackage{ifxetex}
\RequireXeTeX