summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-04-16 20:23:32 +0000
committerKarl Berry <karl@freefriends.org>2022-04-16 20:23:32 +0000
commitb653741264ac478080bc512cc9a37863a9930817 (patch)
treefb6cc1b0e74278702db8fa086b595c18c38c8e42 /Master/texmf-dist/tex/platex
parent679415ca8ea07f6d0840b5f88d7437649048732e (diff)
pxjahyper (16apr22)
git-svn-id: svn://tug.org/texlive/trunk@63040 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def4
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty2
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def2
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty32
4 files changed, 25 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
index 54fee59714b..e5173ef493b 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
@@ -11,7 +11,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-ajm.def}[2022/04/01 v1.0]
+\ProvidesFile{pxjahyper-ajm.def}[2022/04/15 v1.0a]
%% avoid multiple loading
\csname pxjahyperajmLoaded\endcsname
@@ -119,7 +119,7 @@
%--------------------------------------- helpers
%% prepare
-\pxhy@forcecjktoken
+\pxhy@forcecjktoken{0}
%% shorthands
\catcode`\`=\active \let`\noexpand
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
index 57a74a6f9bd..9fc18f26ab0 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper-enc}[2022/04/01 v1.0]
+\ProvidesPackage{pxjahyper-enc}[2022/04/15 v1.0a]
\def\pxhe@pkgname{pxjahyper-enc}
\providecommand{\bxDebug}[1]{}
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
index 81c62ecf889..69f21405ff2 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-uni.def}[2022/04/01 v1.0]
+\ProvidesFile{pxjahyper-uni.def}[2022/04/15 v1.0a]
\providecommand{\bxDebug}[1]{}
%--------------------------------------- environment check
diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
index 0a4a928952b..9cf9d4cacf2 100644
--- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
+++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2022/04/01 v1.0]
+\ProvidesPackage{pxjahyper}[2022/04/15 v1.0a]
\def\pxhy@pkgname{pxjahyper}
\providecommand{\bxDebug}[1]{}
@@ -201,8 +201,19 @@
\pxhy@etextrue
\IfFileExists{etoolbox.sty}{\pxhy@etoolboxtrue}{}%
}
-\pxhy@check\kanjiskip{\pxhy@ptextrue}
-\pxhy@check\forcecjktoken{\pxhy@uptextrue}
+\pxhy@check\kanjiskip{%
+ \pxhy@ptextrue
+ \pxhy@check\ucs{%
+ \pxhy@check\ptexversion{\pxhy@uptextrue}
+ \pxhy@check\kchardef{\pxhy@uptextrue}
+ \ifpxhy@uptex\else % upTeX v<0.10
+ \pxhy@error{This upTeX engine is too old}
+ {\pxhy@eh@fatal}
+ \endinput
+ \fi % only upTeX in Unicode is seen as upTeX
+ \ifnum\ucs"3000="3000 \else \pxhy@uptexfalse \fi
+ }
+}
\ifpxhy@ptex\else
\pxhy@error{Unknown engine used}%
{\pxhy@eh@fatal}
@@ -228,10 +239,6 @@
}{}}
%% adjustment
-% upTeX not in unicode is not seen as upTeX.
-\ifnum\jis"2121="3000 \else
- \pxhy@uptexfalse
-\fi
% bigcode cannot be used without upTeX.
\ifpxhy@bigcode \ifpxhy@uptex\else
\pxhy@bigcodefalse
@@ -330,7 +337,7 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J%
% of the char code <num>.
\def\pxhy@get@jchar#1{%
\begingroup
- \pxhy@forcecjktoken
+ \pxhy@forcecjktoken{#1}%
\kansujichar\@ne=#1\relax
\xdef\pxhy@jchar{\kansuji\@ne}%
\endgroup
@@ -342,11 +349,14 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J%
\let#1\pxhy@jchar
}
-%% \pxhy@forcecjktoken
+%% \pxhy@forcecjktoken{<code>}
\ifpxhy@uptex
- \let\pxhy@forcecjktoken\forcecjktoken
+ \ifx\forcecjktoken\@undefined
+ \def\pxhy@forcecjktoken#1{\kcatcode#1=18 }
+ \else \def\pxhy@forcecjktoken#1{\forcecjktoken}
+ \fi
\else
- \let\pxhy@forcecjktoken\relax
+ \def\pxhy@forcecjktoken#1{\relax}
\fi
%% \pxhy@geta : GETA MARK