summaryrefslogtreecommitdiff
path: root/language/japanese/pxjahyper/pxjahyper.sty
diff options
context:
space:
mode:
Diffstat (limited to 'language/japanese/pxjahyper/pxjahyper.sty')
-rw-r--r--language/japanese/pxjahyper/pxjahyper.sty32
1 files changed, 21 insertions, 11 deletions
diff --git a/language/japanese/pxjahyper/pxjahyper.sty b/language/japanese/pxjahyper/pxjahyper.sty
index 0a4a928952..9cf9d4cacf 100644
--- a/language/japanese/pxjahyper/pxjahyper.sty
+++ b/language/japanese/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