diff options
Diffstat (limited to 'language/japanese/pxjahyper')
| -rw-r--r-- | language/japanese/pxjahyper/README-ja.md | 3 | ||||
| -rw-r--r-- | language/japanese/pxjahyper/README.md | 1 | ||||
| -rw-r--r-- | language/japanese/pxjahyper/pxjahyper-ajm.def | 2 | ||||
| -rw-r--r-- | language/japanese/pxjahyper/pxjahyper-enc.sty | 2 | ||||
| -rw-r--r-- | language/japanese/pxjahyper/pxjahyper-uni.def | 2 | ||||
| -rw-r--r-- | language/japanese/pxjahyper/pxjahyper.pdf | bin | 127370 -> 127111 bytes | |||
| -rw-r--r-- | language/japanese/pxjahyper/pxjahyper.sty | 209 | ||||
| -rw-r--r-- | language/japanese/pxjahyper/pxjahyper.tex | 23 |
8 files changed, 127 insertions, 115 deletions
diff --git a/language/japanese/pxjahyper/README-ja.md b/language/japanese/pxjahyper/README-ja.md index 73a6d0f554..e6d8f90159 100644 --- a/language/japanese/pxjahyper/README-ja.md +++ b/language/japanese/pxjahyper/README-ja.md @@ -70,6 +70,9 @@ pxjahyper-enc パッケージ ー 文字コード設定 更新履歴 -------- + * Version 0.9c 〈2021/06/06〉 + - pxjahyper-uni モジュールを実際に使用する。 + * Version 0.9b 〈2021/05/29〉 - PDF 文字列中で pxbabel の `\UTFJ` をサポート。 - モジュール pxjahyper-uni.def を追加。 diff --git a/language/japanese/pxjahyper/README.md b/language/japanese/pxjahyper/README.md index d10519799f..0ac2707534 100644 --- a/language/japanese/pxjahyper/README.md +++ b/language/japanese/pxjahyper/README.md @@ -52,6 +52,7 @@ the PDF strings in the output DVI file. Revision History ---------------- + * Version 0.9c 〈2021/06/06〉 * Version 0.9b 〈2021/05/29〉 * Version 0.9a 〈2021/05/11〉 * Version 0.9 〈2021/05/10〉 diff --git a/language/japanese/pxjahyper/pxjahyper-ajm.def b/language/japanese/pxjahyper/pxjahyper-ajm.def index 976439c0ff..cb8cbd28af 100644 --- a/language/japanese/pxjahyper/pxjahyper-ajm.def +++ b/language/japanese/pxjahyper/pxjahyper-ajm.def @@ -11,7 +11,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-ajm.def}[2021/05/29 v0.9b] +\ProvidesFile{pxjahyper-ajm.def}[2021/06/06 v0.9c] %% avoid multiple loading \csname pxjahyperajmLoaded\endcsname diff --git a/language/japanese/pxjahyper/pxjahyper-enc.sty b/language/japanese/pxjahyper/pxjahyper-enc.sty index fc33bc6fa3..f51dc75e78 100644 --- a/language/japanese/pxjahyper/pxjahyper-enc.sty +++ b/language/japanese/pxjahyper/pxjahyper-enc.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper-enc}[2021/05/29 v0.9b] +\ProvidesPackage{pxjahyper-enc}[2021/06/06 v0.9c] \def\pxhe@pkgname{pxjahyper-enc} \providecommand{\bxDebug}[1]{} diff --git a/language/japanese/pxjahyper/pxjahyper-uni.def b/language/japanese/pxjahyper/pxjahyper-uni.def index 54671ca190..c05b0369f7 100644 --- a/language/japanese/pxjahyper/pxjahyper-uni.def +++ b/language/japanese/pxjahyper/pxjahyper-uni.def @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-uni.def}[2021/05/29 v0.9b] +\ProvidesFile{pxjahyper-uni.def}[2021/06/06 v0.9c] \providecommand{\bxDebug}[1]{} %--------------------------------------- environment check diff --git a/language/japanese/pxjahyper/pxjahyper.pdf b/language/japanese/pxjahyper/pxjahyper.pdf Binary files differindex 02224f5d8b..25651f8654 100644 --- a/language/japanese/pxjahyper/pxjahyper.pdf +++ b/language/japanese/pxjahyper/pxjahyper.pdf diff --git a/language/japanese/pxjahyper/pxjahyper.sty b/language/japanese/pxjahyper/pxjahyper.sty index f23d94a223..486792b8d7 100644 --- a/language/japanese/pxjahyper/pxjahyper.sty +++ b/language/japanese/pxjahyper/pxjahyper.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper}[2021/05/29 v0.9b] +\ProvidesPackage{pxjahyper}[2021/06/06 v0.9c] \def\pxhy@pkgname{pxjahyper} \providecommand{\bxDebug}[1]{} @@ -384,6 +384,59 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \def\pxhy@if@opt@b#1#2]{#1{#2}} \fi +%--------------------------------------- Load bxjatoucs + +%% \pxhy@bxjatoucs@failure +% Holds the reason message if bxjatoucs is unavailable; +% otherwise equals to \relax. +\@onlypreamble\pxhy@bxjatoucs@failure +\let\pxhy@bxjatoucs@failure\relax + +%% \pxhy@try@load@bxjatoucs +% Tries to load bxjatoucs. If it failed, then it sets the reason +% message to \pxhy@bxjatoucs@failure. +\@onlypreamble\pxhy@try@load@bxjatoucs +\def\pxhy@try@load@bxjatoucs{% + \global\let\pxhy@try@load@bxjatoucs\relax + \ifpxhy@etoolbox + % load bxjatoucs in "check mode" + \IfFileExists{bxjatoucs.sty}{% + \let\bxjatoucsCheckAvail=t + \RequirePackage{bxjatoucs}[] + \undef\bxjatoucsCheckAvail + }{} + % and judge availability + \ifundef\bxjaCidToUcs{% + \def\pxhy@bxjatoucs@failure{% + package 'bxjatoucs' is unavailable% + }% + }{} + \else\ifpxhy@etex + \def\pxhy@bxjatoucs@failure{% + package 'etoolbox' is unavailable% + } + \else + \def\pxhy@bxjatoucs@failure{% + e-TeX extension is unavailable% + } + \fi\fi +} + +\@tempswafalse +\ifpxhy@uptex\else\ifpxhy@hy@unicode + \pxhy@try@load@bxjatoucs + \ifx\pxhy@bxjatoucs@failure\relax\else + \@tempswatrue + \fi +\fi\fi +\if@tempswa + \PackageError\pxhy@pkgname + {The hyperref 'unicode' mode is not supported\MessageBreak + because \pxhy@bxjatoucs@failure}% + {\pxhy@eh@fatal}% + \expandafter\endinput +\fi + %--------------------------------------- Output 'tounicode' special \ifpxhy@tounicode @@ -711,35 +764,11 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% %--------------------------------------- Support for 'otfcid' \ifpxhy@otfcid -%% \pxhy@otfcid@disabled -% Holds the message if otfcid/otfmacros is unavailable; -% otherwise equals to \relax. -\@onlypreamble\pxhy@otfcid@disabled -\let\pxhy@otfcid@disabled\relax -\ifpxhy@etoolbox - % check if bxjatoucs is available - \IfFileExists{bxjatoucs.sty}{% - \let\bxjatoucsCheckAvail=t - \RequirePackage{bxjatoucs}[] - \undef\bxjatoucsCheckAvail - }{} - \ifundef\bxjaCidToUcs{% - \def\pxhy@otfcid@disabled{% - package 'bxjatoucs' is unavailable% - }% - }{} -\else\ifpxhy@etex - \def\pxhy@otfcid@disabled{% - package 'etoolbox' is unavailable% - } -\else - \def\pxhy@otfcid@disabled{% - e-TeX extension is unavailable% - } -\fi\fi +%% packages +\pxhy@try@load@bxjatoucs %% annihilate the ajmacros's own pdfstring process -\ifpxhy@otfmacros\ifx\pxhy@otfcid@disabled\relax +\ifpxhy@otfmacros\ifx\pxhy@bxjatoucs@failure\relax \let\ajRedefine@ajCommands\relax \fi\fi @@ -773,14 +802,14 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \@onlypreamble\pxhy@dispatch@otfcid \def\pxhy@dispatch@otfcid{% \global\let\pxhy@dispatch@otfcid\relax - \ifx\pxhy@otfcid@disabled\relax % available! + \ifx\pxhy@bxjatoucs@failure\relax % available! \pdfstringdefDisableCommands{% \let\CID\pxhy@CID }% \else \PackageWarningNoLine\pxhy@pkgname {Option 'otfcid'/'otfmacros' is disabled, because\MessageBreak - \pxhy@otfcid@disabled}% + \pxhy@bxjatoucs@failure}% \pxhy@otfcidfalse \fi } @@ -789,7 +818,7 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \@onlypreamble\pxhy@dispatch@otfmacros \def\pxhy@dispatch@otfmacros{% \global\let\pxhy@dispatch@otfmacros\relax - \ifx\pxhy@otfcid@disabled\relax % available! + \ifx\pxhy@bxjatoucs@failure\relax % available! \let\ajRedefine@ajCommands\relax \chardef\pxhy@tmp@orgcc=\catcode`\@ \makeatletter @@ -989,7 +1018,7 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \pxDeclarePdfTextCommand{\textcent}{2171}{00A2} \pxDeclarePdfTextCommand{\textsterling}{2172}{00A3} \pxDeclarePdfTextCommand{\textcurrency}{}{00A4} -\pxDeclarePdfTextCommand{\textyen}{}{00A5} +\pxDeclarePdfTextCommand{\textyen}{216F}{00A5} \pxDeclarePdfTextCommand{\textbrokenbar}{}{00A6} \pxDeclarePdfTextCommand{\textsection}{2178}{00A7} \pxDeclarePdfTextCommand{\textasciidieresis}{212F}{00A8} @@ -1089,27 +1118,19 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% %% %%[B] Aliases to [A]. -%\pxDeclarePdfTextCommand{\copyright}{}{00A9} \pxDeclarePdfTextCommand{\textflqq}{}{00AB} -\pxDeclarePdfTextCommand{\flqq}{}{00AB} \pxDeclarePdfTextCommand{\textneg}{224C}{00AC} \pxDeclarePdfTextCommand{\textpm}{215E}{00B1} \pxDeclarePdfTextCommand{\textcdot}{}{00B7} \pxDeclarePdfTextCommand{\textfrqq}{}{00BB} -\pxDeclarePdfTextCommand{\frqq}{}{00BB} \pxDeclarePdfTextCommand{\texttimes}{215F}{00D7} \pxDeclarePdfTextCommand{\textdiv}{2160}{00F7} \pxDeclarePdfTextCommand{\textgrq}{2146}{2018} \pxDeclarePdfTextCommand{\textglq}{}{201A} -\pxDeclarePdfTextCommand{\textquotesinglbase}{}{201A} \pxDeclarePdfTextCommand{\textgrqq}{2148}{201C} -\pxDeclarePdfTextCommand{\crqq}{2148}{201C} \pxDeclarePdfTextCommand{\textglqq}{}{201E} -\pxDeclarePdfTextCommand{\clqq}{}{201E} -\pxDeclarePdfTextCommand{\textquotedblbase}{}{201E} \pxDeclarePdfTextCommand{\textflq}{}{2039} \pxDeclarePdfTextCommand{\textfrq}{}{203A} -\pxDeclarePdfTextCommand{\textEuro}{}{20AC} \pxDeclarePdfTextCommand{\guillemetleft}{}{00AB} \pxDeclarePdfTextCommand{\guillemetright}{}{00BB} %% @@ -1328,77 +1349,53 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \fi %</unicode> %%%%%%%%%%%%%%%%%%%% done +\ifpxhy@textcmd %<*textcmd> + + %% \pxhy@disable@tc@commands + \def\pxhy@disable@tc@commands{% + \let\yen\textyen + \let\copyright\textcopyright + \let\flqq\textflqq + \let\frqq\textfrqq + \let\textquotesinglbase\quotesinglbase + \let\crqq\textglqq + \let\clqq\textgrqq + \let\textquotedblbase\quotedblbase + \let\textEuro\texteuro + } + %% register to 'disable' list + \ltx@GlobalPrependToMacro\pdfstringdefPreHook{\pxhy@disable@tc@commands} + + \ifpxhy@hy@unicode %<*unicode> + + %% supplementary definitions + \def\pxhy@next#1#2{% + \expandafter\ifx\csname PU\string#1\endcsname\relax + \DeclareTextCommand{#1}{PU}{#2}\fi} + \pxhy@next{\guillemetleft}{\80\253}%00AB + \pxhy@next{\guillemetright}{\80\273}%00BB + \pxhy@next{\textborn}{\9046\005}%2605 + \pxhy@next{\textfinalsigma}{\83\302}%03C2 + \pxhy@next{\textxgeq}{\9042\145}%2265 + \pxhy@next{\textxleq}{\9042\144}%2264 + + \fi %</unicode> +\fi %</textcmd> + %--------------------------------------- Enable hyperref unicode \ifpxhy@hy@unicode -%% check the current meaning -\def\pxhy@tmpa#1{\@backslashchar 000#1} -\ifx\HyPsd@Char\pxhy@tmpa -\PackageInfo\pxhy@pkgname - {The setup for hyperref 'unicode' is applied.\@gobbletwo} - -%% The following code is taken from hyperref.sty. -%%%%BEGIN - \def\HyPsd@Char#1{% - \ifnum`#1<128 % - \@backslashchar 000#1% - \else - \ifnum`#1<65536 % - \expandafter\HyPsd@CharTwoByte\number`#1!% - \else - \expandafter\expandafter\expandafter\HyPsd@CharSurrogate - \intcalcSub{`#1}{65536}!% - \fi - \fi - }% - \def\HyPsd@CharTwoByte#1!{% - \expandafter\expandafter\expandafter\HyPsd@CharOctByte - \IntCalcDiv#1!256!!% - \expandafter\expandafter\expandafter\HyPsd@CharOctByte - \IntCalcMod#1!256!!% - }% - \def\HyPsd@CharOctByte#1!{% - \@backslashchar - \IntCalcDiv#1!64!% - \intcalcDiv{\IntCalcMod#1!64!}{8}% - \IntCalcMod#1!8!% - }% - \def\HyPsd@CharSurrogate#1!{% - \@backslashchar 33% - \IntCalcDiv#1!262144!% - \expandafter\expandafter\expandafter\HyPsd@CharOctByte - \intcalcDiv{\IntCalcMod#1!262144!}{1024}!% - \@backslashchar 33% - \expandafter\expandafter\expandafter\IntCalcAdd - \intcalcDiv{\IntCalcMod#1!1024!}{256}!4!% - \expandafter\expandafter\expandafter\HyPsd@CharOctByte - \IntCalcMod#1!256!!% - }% -%%%%END +%% load the submodule +\input{pxjahyper-uni.def} +\ifx t\pxHyperrefUnicodePatched + \PackageInfo\pxhy@pkgname + {The setup for hyperref 'unicode' is applied.\@gobbletwo} +\else + \PackageInfo\pxhy@pkgname + {The setup for hyperref 'unicode' is NOT applied!\MessageBreak + The package might not work properly.\@gobbletwo} \fi -\ifpxhy@uptex\else %<*pTeX> - \RequirePackage{bxjatoucs}[] - \def\HyPsd@Char#1{% - \ifnum`#1<128 % - \@backslashchar 000#1% - \else\ifnum`#1<256 % - \expandafter\HyPsd@CharTwoByte\number`#1!% - \else - \expandafter\HyPsd@CharTwoByte\number\pxhy@to@ucs{`#1}!% - \fi\fi - }% - \def\pxhy@to@ucs#1{"FFFD} - \ifnum\jis"2121="8140 % sjis - \let\pxhy@to@ucs\bxjaSjisToUcs - \else\ifnum\jis"2121="A1A1 % euc - \let\pxhy@to@ucs\bxjaEucToUcs - \fi\fi -\fi %</pTeX> - -%% disable the verification of bxjscls -\let\jsCheckHyperrefUnicode\@empty - \fi %--------------------------------------- 'jacommentline' \ifpxhy@jacommentline diff --git a/language/japanese/pxjahyper/pxjahyper.tex b/language/japanese/pxjahyper/pxjahyper.tex index aaf7e2cb65..2af226192e 100644 --- a/language/japanese/pxjahyper/pxjahyper.tex +++ b/language/japanese/pxjahyper/pxjahyper.tex @@ -1,13 +1,23 @@ % 文字コードは UTF-8 % uplatex で組版する -\documentclass[uplatex,a4paper]{jsarticle} +\documentclass[uplatex,dvipdfmx,a4paper]{jsarticle} \renewcommand{\headfont}{\gtfamily\romanseries{sbc}\sffamily} -\usepackage{shortvrb} -\MakeShortVerb{\|} +\usepackage[T1]{fontenc} +\usepackage{lmodern,textcomp} +\usepackage{color} +\definecolor{myblue}{rgb}{0,0,0.75} +\definecolor{mygreen}{rgb}{0,0.45,0} +\usepackage[colorlinks,hyperfootnotes=false]{hyperref} +\usepackage{pxjahyper} +\hypersetup{linkcolor=myblue,urlcolor=mygreen, + pdftitle={pxjahyperパッケージ}, + pdfauthor={八登崇之}} \usepackage{bxtexlogo} \bxtexlogoimport{*} -\newcommand{\PkgVersion}{0.9b} -\newcommand{\PkgDate}{2021/05/29} +\usepackage{shortvrb} +\MakeShortVerb{\|} +\newcommand{\PkgVersion}{0.9c} +\newcommand{\PkgDate}{2021/06/06} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} @@ -19,6 +29,7 @@ \author{八登崇之\ （Takayuki YATO; aka.~``ZR''）} \date{v\PkgVersion\quad[\PkgDate]} \maketitle +\tableofcontents %=========================================================== \section{概要} @@ -131,7 +142,7 @@ Unicode符号値入力用の命令が使っているものである。 |\Ux| でUnicode符号値入力が可能になる。 ただし、Unicode符号値入力用の命令としては 「\Pkg{japanese-otf}パッケージの |\UTF| 命令」 -の方が有名であり、\Pkg{pxjahyper}は |\UTF| も正しく扱えるので、 +の方が有名であり、\Pkg{pxjahyper}は |\UTF| もサポートするので、 こちらを使う方が無難かもしれない。} \begin{itemize} |