texlive[59508] Master/texmf-dist: pxjahyper (7jun21)

commits+karl at tug.org commits+karl at tug.org
Mon Jun 7 22:05:04 CEST 2021 

Revision: 59508
          http://tug.org/svn/texlive?view=revision&revision=59508
Author:   karl
Date:     2021-06-07 22:05:04 +0200 (Mon, 07 Jun 2021)
Log Message:
-----------
pxjahyper (7jun21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
    trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md
    trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
    trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
    trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
    trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
    trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
    trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty

Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md	2021-06-07 20:04:34 UTC (rev 59507)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md	2021-06-07 20:05:04 UTC (rev 59508)
@@ -70,6 +70,9 @@
 更新履歴
 --------
 
+  * Version 0.9c 〈2021/06/06〉
+      - pxjahyper-uni モジュールを実際に使用する。
+
   * Version 0.9b 〈2021/05/29〉
       - PDF 文字列中で pxbabel の `\UTFJ` をサポート。
       - モジュール pxjahyper-uni.def を追加。

Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md	2021-06-07 20:04:34 UTC (rev 59507)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md	2021-06-07 20:05:04 UTC (rev 59508)
@@ -52,6 +52,7 @@
 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〉

Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex	2021-06-07 20:04:34 UTC (rev 59507)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex	2021-06-07 20:05:04 UTC (rev 59508)
@@ -1,13 +1,23 @@
 % 文字コードは UTF-8
 % uplatex で組版する
-\documentclass[uplatex,a4paper]{jsarticle}
+\documentclass[uplatex,dvipdfmx,a4paper]{jsarticle}
 \renewcommand{\headfont}{\gtfamily\romanseries{sbc}\sffamily}
+\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{*}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\usepackage{bxtexlogo}
-\bxtexlogoimport{*}
-\newcommand{\PkgVersion}{0.9b}
-\newcommand{\PkgDate}{2021/05/29}
+\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 @@
 |\Ux| でUnicode符号値入力が可能になる。
 ただし、Unicode符号値入力用の命令としては
 「\Pkg{japanese-otf}パッケージの |\UTF| 命令」
-の方が有名であり、\Pkg{pxjahyper}は |\UTF| も正しく扱えるので、
+の方が有名であり、\Pkg{pxjahyper}は |\UTF| もサポートするので、
 こちらを使う方が無難かもしれない。}
 
 \begin{itemize}

Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def	2021-06-07 20:04:34 UTC (rev 59507)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def	2021-06-07 20:05:04 UTC (rev 59508)
@@ -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

Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty	2021-06-07 20:04:34 UTC (rev 59507)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty	2021-06-07 20:05:04 UTC (rev 59508)
@@ -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 at pkgname{pxjahyper-enc}
 \providecommand{\bxDebug}[1]{}
 

Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def	2021-06-07 20:04:34 UTC (rev 59507)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def	2021-06-07 20:05:04 UTC (rev 59508)
@@ -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

Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty	2021-06-07 20:04:34 UTC (rev 59507)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty	2021-06-07 20:05:04 UTC (rev 59508)
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2021/05/29 v0.9b]
+\ProvidesPackage{pxjahyper}[2021/06/06 v0.9c]
 \def\pxhy at pkgname{pxjahyper}
 \providecommand{\bxDebug}[1]{}
 
@@ -384,6 +384,59 @@
 \def\pxhy at if@opt at b#1#2]{#1{#2}}
 
 \fi
+%--------------------------------------- Load bxjatoucs
+
+%% \pxhy at bxjatoucs@failure
+% Holds the reason message if bxjatoucs is unavailable;
+% otherwise equals to \relax.
+\@onlypreamble\pxhy at bxjatoucs@failure
+\let\pxhy at bxjatoucs@failure\relax
+
+%% \pxhy at try@load at bxjatoucs
+% Tries to load bxjatoucs. If it failed, then it sets the reason
+% message to \pxhy at bxjatoucs@failure.
+\@onlypreamble\pxhy at try@load at bxjatoucs
+\def\pxhy at try@load at bxjatoucs{%
+  \global\let\pxhy at try@load at bxjatoucs\relax
+  \ifpxhy at etoolbox
+    % load bxjatoucs in "check mode"
+    \IfFileExists{bxjatoucs.sty}{%
+      \let\bxjatoucsCheckAvail=t
+      \RequirePackage{bxjatoucs}[]
+      \undef\bxjatoucsCheckAvail
+    }{}
+    % and judge availability
+    \ifundef\bxjaCidToUcs{%
+      \def\pxhy at bxjatoucs@failure{%
+        package 'bxjatoucs' is unavailable%
+      }%
+    }{}
+  \else\ifpxhy at etex
+    \def\pxhy at bxjatoucs@failure{%
+      package 'etoolbox' is unavailable%
+    }
+  \else
+    \def\pxhy at bxjatoucs@failure{%
+      e-TeX extension is unavailable%
+    }
+  \fi\fi
+}
+
+\@tempswafalse
+\ifpxhy at uptex\else\ifpxhy at hy@unicode
+  \pxhy at try@load at bxjatoucs
+  \ifx\pxhy at bxjatoucs@failure\relax\else
+    \@tempswatrue
+  \fi
+\fi\fi
+\if at tempswa
+  \PackageError\pxhy at pkgname
+   {The hyperref 'unicode' mode is not supported\MessageBreak
+    because \pxhy at bxjatoucs@failure}%
+   {\pxhy at eh@fatal}%
+  \expandafter\endinput
+\fi
+
 %--------------------------------------- Output 'tounicode' special
 \ifpxhy at tounicode
 
@@ -711,35 +764,11 @@
 %--------------------------------------- Support for 'otfcid'
 \ifpxhy at otfcid
 
-%% \pxhy at otfcid@disabled
-% Holds the message if otfcid/otfmacros is unavailable;
-% otherwise equals to \relax.
-\@onlypreamble\pxhy at otfcid@disabled
-\let\pxhy at otfcid@disabled\relax
-\ifpxhy at etoolbox
-  % check if bxjatoucs is available
-  \IfFileExists{bxjatoucs.sty}{%
-    \let\bxjatoucsCheckAvail=t
-    \RequirePackage{bxjatoucs}[]
-    \undef\bxjatoucsCheckAvail
-  }{}
-  \ifundef\bxjaCidToUcs{%
-    \def\pxhy at otfcid@disabled{%
-      package 'bxjatoucs' is unavailable%
-    }%
-  }{}
-\else\ifpxhy at etex
-  \def\pxhy at otfcid@disabled{%
-    package 'etoolbox' is unavailable%
-  }
-\else
-  \def\pxhy at otfcid@disabled{%
-    e-TeX extension is unavailable%
-  }
-\fi\fi
+%% packages
+\pxhy at try@load at bxjatoucs
 
 %% annihilate the ajmacros's own pdfstring process
-\ifpxhy at otfmacros\ifx\pxhy at otfcid@disabled\relax
+\ifpxhy at otfmacros\ifx\pxhy at bxjatoucs@failure\relax
   \let\ajRedefine at ajCommands\relax
 \fi\fi
 
@@ -773,7 +802,7 @@
 \@onlypreamble\pxhy at dispatch@otfcid
 \def\pxhy at dispatch@otfcid{%
   \global\let\pxhy at dispatch@otfcid\relax
-  \ifx\pxhy at otfcid@disabled\relax % available!
+  \ifx\pxhy at bxjatoucs@failure\relax % available!
     \pdfstringdefDisableCommands{%
       \let\CID\pxhy at CID
     }%
@@ -780,7 +809,7 @@
   \else
     \PackageWarningNoLine\pxhy at pkgname
      {Option 'otfcid'/'otfmacros' is disabled, because\MessageBreak
-      \pxhy at otfcid@disabled}%
+      \pxhy at bxjatoucs@failure}%
     \pxhy at otfcidfalse
   \fi
 }
@@ -789,7 +818,7 @@
 \@onlypreamble\pxhy at dispatch@otfmacros
 \def\pxhy at dispatch@otfmacros{%
   \global\let\pxhy at dispatch@otfmacros\relax
-  \ifx\pxhy at otfcid@disabled\relax % available!
+  \ifx\pxhy at bxjatoucs@failure\relax % available!
       \let\ajRedefine at ajCommands\relax
       \chardef\pxhy at tmp@orgcc=\catcode`\@
       \makeatletter
@@ -989,7 +1018,7 @@
 \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 @@
 %%
 
 %%[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,78 +1349,54 @@
 \fi                             %</unicode>
 %%%%%%%%%%%%%%%%%%%% done
 
-%--------------------------------------- Enable hyperref unicode
-\ifpxhy at hy@unicode
+\ifpxhy at textcmd                 %<*textcmd>
 
-%% check the current meaning
-\def\pxhy at tmpa#1{\@backslashchar 000#1}
-\ifx\HyPsd at Char\pxhy at tmpa
-\PackageInfo\pxhy at pkgname
- {The setup for hyperref 'unicode' is applied.\@gobbletwo}
+  %% \pxhy at disable@tc at commands
+  \def\pxhy at disable@tc at 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 at GlobalPrependToMacro\pdfstringdefPreHook{\pxhy at disable@tc at commands}
 
-%% The following code is taken from hyperref.sty.
-%%%%BEGIN
-  \def\HyPsd at Char#1{%
-    \ifnum`#1<128 %
-      \@backslashchar 000#1%
-    \else
-      \ifnum`#1<65536 %
-        \expandafter\HyPsd at CharTwoByte\number`#1!%
-      \else
-        \expandafter\expandafter\expandafter\HyPsd at CharSurrogate
-        \intcalcSub{`#1}{65536}!%
-      \fi
-    \fi
-  }%
-  \def\HyPsd at CharTwoByte#1!{%
-    \expandafter\expandafter\expandafter\HyPsd at CharOctByte
-    \IntCalcDiv#1!256!!%
-    \expandafter\expandafter\expandafter\HyPsd at CharOctByte
-    \IntCalcMod#1!256!!%
-  }%
-  \def\HyPsd at CharOctByte#1!{%
-    \@backslashchar
-    \IntCalcDiv#1!64!%
-    \intcalcDiv{\IntCalcMod#1!64!}{8}%
-    \IntCalcMod#1!8!%
-  }%
-  \def\HyPsd at CharSurrogate#1!{%
-    \@backslashchar 33%
-    \IntCalcDiv#1!262144!%
-    \expandafter\expandafter\expandafter\HyPsd at CharOctByte
-    \intcalcDiv{\IntCalcMod#1!262144!}{1024}!%
-    \@backslashchar 33%
-    \expandafter\expandafter\expandafter\IntCalcAdd
-    \intcalcDiv{\IntCalcMod#1!1024!}{256}!4!%
-    \expandafter\expandafter\expandafter\HyPsd at CharOctByte
-    \IntCalcMod#1!256!!%
-  }%
-%%%%END
-\fi
+  \ifpxhy at hy@unicode            %<*unicode>
 
-\ifpxhy at uptex\else                      %<*pTeX>
-  \RequirePackage{bxjatoucs}[]
-  \def\HyPsd at Char#1{%
-    \ifnum`#1<128 %
-      \@backslashchar 000#1%
-    \else\ifnum`#1<256 %
-      \expandafter\HyPsd at CharTwoByte\number`#1!%
-    \else
-      \expandafter\HyPsd at CharTwoByte\number\pxhy at to@ucs{`#1}!%
-    \fi\fi
-  }%
-  \def\pxhy at to@ucs#1{"FFFD}
-  \ifnum\jis"2121="8140 % sjis
-    \let\pxhy at to@ucs\bxjaSjisToUcs
-  \else\ifnum\jis"2121="A1A1 % euc
-    \let\pxhy at to@ucs\bxjaEucToUcs
-  \fi\fi
-\fi                                     %</pTeX>
+    %% supplementary definitions
+    \def\pxhy at next#1#2{%
+      \expandafter\ifx\csname PU\string#1\endcsname\relax
+        \DeclareTextCommand{#1}{PU}{#2}\fi}
+    \pxhy at next{\guillemetleft}{\80\253}%00AB
+    \pxhy at next{\guillemetright}{\80\273}%00BB
+    \pxhy at next{\textborn}{\9046\005}%2605
+    \pxhy at next{\textfinalsigma}{\83\302}%03C2
+    \pxhy at next{\textxgeq}{\9042\145}%2265
+    \pxhy at next{\textxleq}{\9042\144}%2264
 
-%% disable the verification of bxjscls
-\let\jsCheckHyperrefUnicode\@empty
+  \fi                           %</unicode>
+\fi                             %</textcmd>
 
+%--------------------------------------- Enable hyperref unicode
+\ifpxhy at hy@unicode
+
+%% load the submodule
+\input{pxjahyper-uni.def}
+\ifx t\pxHyperrefUnicodePatched
+  \PackageInfo\pxhy at pkgname
+   {The setup for hyperref 'unicode' is applied.\@gobbletwo}
+\else
+  \PackageInfo\pxhy at pkgname
+   {The setup for hyperref 'unicode' is NOT applied!\MessageBreak
+    The package might not work properly.\@gobbletwo}
 \fi
+
+\fi
 %--------------------------------------- 'jacommentline'
 \ifpxhy at jacommentline

More information about the tex-live-commits mailing list.