texlive[57732] Master/texmf-dist: pxjahyper (13feb21)
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 13 23:17:48 CET 2021
Revision: 57732
http://tug.org/svn/texlive?view=revision&revision=57732
Author: karl
Date: 2021-02-13 23:17:47 +0100 (Sat, 13 Feb 2021)
Log Message:
-----------
pxjahyper (13feb21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/pxjahyper/LICENSE
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.sty
Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/LICENSE 2021-02-13 22:17:34 UTC (rev 57731)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/LICENSE 2021-02-13 22:17:47 UTC (rev 57732)
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md 2021-02-13 22:17:34 UTC (rev 57731)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md 2021-02-13 22:17:47 UTC (rev 57732)
@@ -70,6 +70,10 @@
更新履歴
--------
+ * Version 0.7 〈2021/02/13〉
+ - 「upLaTeX での hyperref の `unicode` 指定への対応」を正式サポート
+ の扱いとする。一部の正常動作しなかった機能についても対応させる。
+
* Version 0.6a 〈2020/10/10〉
- pxjahyper-enc：`dvips` 指定時はエラーでなく警告を出す。
Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md 2021-02-13 22:17:34 UTC (rev 57731)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md 2021-02-13 22:17:47 UTC (rev 57732)
@@ -52,6 +52,7 @@
Revision History
----------------
+ * Version 0.7 〈2021/02/13〉
* Version 0.6a 〈2020/10/10〉
* Version 0.6 〈2020/10/05〉
* Version 0.5b 〈2020/10/04〉
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-02-13 22:17:34 UTC (rev 57731)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex 2021-02-13 22:17:47 UTC (rev 57732)
@@ -6,8 +6,8 @@
\MakeShortVerb{\|}
\usepackage{bxtexlogo}
\bxtexlogoimport{*}
-\newcommand{\PkgVersion}{0.6a}
-\newcommand{\PkgDate}{2020/10/10}
+\newcommand{\PkgVersion}{0.7}
+\newcommand{\PkgDate}{2021/02/13}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def 2021-02-13 22:17:34 UTC (rev 57731)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def 2021-02-13 22:17:47 UTC (rev 57732)
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper-ajm.def'.
%%
-%% Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -11,7 +11,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-ajm.def}[2020/10/10 v0.6]
+\ProvidesFile{pxjahyper-ajm.def}[2021/02/13 v0.7]
%% 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-02-13 22:17:34 UTC (rev 57731)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty 2021-02-13 22:17:47 UTC (rev 57732)
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper-enc.sty'.
%%
-%% Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper-enc}[2020/10/10 v0.6a]
+\ProvidesPackage{pxjahyper-enc}[2021/02/13 v0.7]
\def\pxhe at pkgname{pxjahyper-enc}
\providecommand{\bxDebug}[1]{}
Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty 2021-02-13 22:17:34 UTC (rev 57731)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty 2021-02-13 22:17:47 UTC (rev 57732)
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper.sty'.
%%
-%% Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,34 +10,32 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2020/10/10 v0.6a]
+\ProvidesPackage{pxjahyper}[2021/02/13 v0.7]
+\def\pxhy at pkgname{pxjahyper}
+\providecommand{\bxDebug}[1]{}
+%--------------------------------------- Preparations
+
%% error messages
-\def\pxhy at pkgname{pxjahyper}
-\def\pxhy at warn{\PackageWarningNoLine\pxhy at pkgname}
\def\pxhy at error{\PackageError\pxhy at pkgname}
-\@onlypreamble\pxhy at fatal
-\def\pxhy at fatal#1#2{%
- \PackageError\pxhy at pkgname
- {#1}%
- {#2Package loading is aborted right now.}%
+\@onlypreamble\pxhy at eh@fatal
+\def\pxhy at eh@fatal{%
+ Package loading is aborted right now.\MessageBreak\@ehc
}
-\providecommand{\bxDebug}[1]{}
%% packages
\RequirePackage{ltxcmds}[2011/08/22]% v1.21
-%% globals
+%% variables
\newif\ifpxhy at ptex
\newif\ifpxhy at uptex
\newif\ifpxhy at etex
\newif\ifpxhy at etoolbox
\newif\ifpxhy at new@hook at system
-\let\pxhy at jcode\@undefined
\newif\ifpxhy at tounicode
\newif\ifpxhy at zerox
\newif\ifpxhy at bigcode
-\let\pxhy at bigcode\relax
+\let\pxhy at bigcode@given\relax
\chardef\pxhy at driver@none=0
\chardef\pxhy at driver@dvipdfmx=1
\let\pxhy at driver\@undefined
@@ -76,11 +74,13 @@
\DeclareOption{noout2uni}{%
\pxhy at zeroxfalse
}
+\pxhy at bigcodetrue
\DeclareOption{bigcode}{%
- \let\pxhy at bigcode=t%
+ \pxhy at bigcodetrue
+ \let\pxhy at bigcode@given=t
}
\DeclareOption{nobigcode}{%
- \let\pxhy at bigcode=f%
+ \pxhy at bigcodefalse
}
\DeclareOption{jacommentline}{%
\pxhy at jacommentlinetrue
@@ -119,7 +119,8 @@
%% The hyperref package must be loaded in advance.
\@ifpackageloaded{hyperref}{}{%else
- \pxhy at fatal{'hyperref' not yet loaded}{}%
+ \pxhy at error{Package 'hyperref' is not yet loaded}
+ {\pxhy at eh@fatal}%
\endinput
}
@@ -136,8 +137,8 @@
\fi
\ifnum0\ifpxhy at hy@unicode1\fi\if at tempswa1\fi=1
\PackageError\pxhy at pkgname
- {You must not change the encoding setting (e.g.\MessageBreak
- 'unicode) of hyperref after pxjahyper is loaded}%
+ {You must not change the encoding setting of hyperref\MessageBreak
+ (e.g. 'unicode') after pxjahyper is loaded}%
{\@ehc}%
\fi
}
@@ -166,7 +167,8 @@
\pxhy at check\kanjiskip{\pxhy at ptextrue}
\pxhy at check\forcecjktoken{\pxhy at uptextrue}
\ifpxhy at ptex\else
- \pxhy at fatal{Unknown engine used!!!}{}
+ \pxhy at error{Unknown engine used}%
+ {\pxhy at eh@fatal}
\expandafter\endinput
\fi
@@ -173,41 +175,24 @@
%% Check for the new hook system.
\@ifl at t@r\fmtversion{2020/10/01}{\pxhy at new@hook at systemtrue}{}
-%% Check the internal jcode.
-\ifnum \jis"2121="8140
- \let\pxhy at jcode=s\relax
-\else\ifnum\jis"2121="A1A1
- \let\pxhy at jcode=e\relax
-\else\ifnum\jis"2121="3000
- \let\pxhy at jcode=u\relax
-\fi\fi\fi
-\ifx\pxhy at jcode\@undefined
- \pxhy at fatal{Unknown internal kanji code!!!}{}
- \expandafter\endinput
-\fi
-
%% adjustment
% upTeX not in unicode is not seen as upTeX.
-\if u\pxhy at jcode\else
+\ifnum\jis"2121="3000 \else
\pxhy at uptexfalse
\fi
% out2uni cannot be used with upTeX.
\ifpxhy at uptex \ifpxhy at zerox
- \pxhy at warn{out2uni is invalid in upTeX}
+ \PackageWarningNoLine\pxhy at pkgname
+ {out2uni is invalid in upTeX}
\pxhy at zeroxfalse
\fi\fi
% bigcode cannot be used without upTeX.
-\if t\pxhy at bigcode
- \ifpxhy at uptex
- \pxhy at bigcodetrue
- \else
- \pxhy at warn{bigcode is invalid without upTeX}
+\ifpxhy at bigcode \ifpxhy at uptex\else
+ \pxhy at bigcodefalse
+ \ifx t\pxhy at bigcode@given
+ \PackageWarningNoLine\pxhy at pkgname
+ {bigcode is invalid without upTeX}
\fi
-\else\if f\pxhy at bigcode
-\else
- \ifpxhy at uptex
- \pxhy at bigcodetrue
- \fi
\fi\fi
% out2uni disables tounicode.
\ifpxhy at zerox
@@ -215,7 +200,10 @@
\fi
% hyperref 'unicode' is allowed only on upLaTeX.
\ifnum0\ifpxhy at hy@unicode\ifpxhy at uptex\else1\fi\fi>\z@
- \pxhy at fatal{hyperref 'unicode' mode is not supported}{}%
+ \PackageError\pxhy at pkgname
+ {The hyperref 'unicode' mode is not supported\MessageBreak
+ on the pTeX engine}%
+ {\pxhy at eh@fatal}%
\expandafter\endinput
\fi
% otfmacros forces use of otfcid.
@@ -238,7 +226,8 @@
pxhy at etex = \ifpxhy at etex true\else false\fi^^J%
pxhy at etoolbox = \ifpxhy at etoolbox true\else false\fi^^J%
pxhy at new@hook at system = \ifpxhy at new@hook at system true\else false\fi^^J%
-pxhy at jcode = \meaning\pxhy at jcode^^J%
+ifpxhy at hy@unicode = \ifpxhy at hy@unicode true\else false\fi^^J%
+pxhy at bigcode = \ifpxhy at bigcode true\else false\fi^^J%
pxhy at tounicode = \ifpxhy at tounicode true\else false\fi^^J%
pxhy at zerox = \ifpxhy at zerox true\else false\fi^^J%
pxhy at driver = \the\pxhy at driver^^J%
@@ -248,10 +237,10 @@
%% unique tokens
\def\pxhy at end{\pxhy at end@}
+\def\pxhy at mt{\pxhy at mt@}
\let\pxhy at mk\indent % unexpandable
%% \pxhy at begin@dvi at hook{<text>}
-%% \pxhy at begin@dvi at enc@hook{<text>}
\ifpxhy at new@hook at system
\def\pxhy at begin@dvi at hook#1{%
\AddToHook{shipout/firstpage}{#1}%
@@ -351,10 +340,15 @@
%--------------------------------------- Hooks to pdfstringdef
+%% constants
\def\pxhy at uc@REPL{FFFD}
\def\pxhy at uc@XNAC{FDD1} % not-a-char codepoint used as marker
+
+%% variables
+\let\pxhy at str\relax
+
+%% \pxhy at burst-`>...
\let\pxhy at burst\romannumeral
-\let\pxhy at nxend\indent
%% \pxhy at uchex{<hex>}
% The entity of the code-value input function. If the input
@@ -362,19 +356,19 @@
% \pxhy at uchex@res in 4-6 digits; otherwise passes FFFD to
% \pxhy at uchex@res.
\def\pxhy at uchex#1{%
- \expandafter\pxhy at uchex@a\pxhy at burst-`>#1\pxhy at nxend
+ \expandafter\pxhy at uchex@a\pxhy at burst-`>#1\pxhy at mk
}
\edef\pxhy at uchex@err{%
\noexpand\pxhy at uchex@res{\pxhy at uc@REPL}%
}
-\def\pxhy at uchex@a#1#2\pxhy at nxend{%
+\def\pxhy at uchex@a#1#2\pxhy at mk{%
\ifnum2<"1#1
- \expandafter\pxhy at uchex@b\romannumeral-"#1#2\pxhy at nxend{#1#2}%
+ \expandafter\pxhy at uchex@b\romannumeral-"#1#2\pxhy at mk{#1#2}%
\else \pxhy at uchex@err
\fi
}
-\def\pxhy at uchex@b#1\pxhy at nxend#2{%
- \ifx\pxhy at empty#1\pxhy at empty
+\def\pxhy at uchex@b#1\pxhy at mk#2{%
+ \ifx\pxhy at mt#1\pxhy at mt
\ifnum"#2>"10FFFF
\pxhy at uchex@err
\else\ifnum"#2>"FFF
@@ -408,6 +402,15 @@
\let\UTFT\pxhy at uchex
}
+ \ifpxhy at hy@unicode %<*unicode>
+
+ %% \pxhy at uchex@res
+ \def\pxhy at uchex@res#1{%
+ \unichar{"#1}%
+ }
+
+ \else %<!*unicode>
+
%BEGIN-- in the following block #1 means the marker
\def\pxhy at next#1{% #1=marker
%% \pxhy at uchex@res
@@ -422,7 +425,7 @@
\pxhy at posthook@b##1%
}%
\def\pxhy at posthook@a##1#1##2\pxhy at end{%
- \ifx\pxhy at empty##2\pxhy at empty
+ \ifx\pxhy at mt##2\pxhy at mt
\expandafter\@gobbletwo
\fi
}%
@@ -432,7 +435,7 @@
\global\let##1=\pxhy at str
}%
\def\pxhy at posthook@c##1#1##2>{%
- \ifx\pxhy at empty##2\pxhy at empty
+ \ifx\pxhy at mt##2\pxhy at mt
\edef\pxhy at str{\pxhy at str##1}%
\else
\pxhy at get@jchar{"##2}%
@@ -456,6 +459,8 @@
\pxhy at next
\endgroup
+ \fi %</unicode>
+
\else\ifpxhy at zerox %<*!upTeX>
%% \pxhy at uchex@res
@@ -565,6 +570,11 @@
\fi
%--------------------------------------- Redefine text commands for PD1
+%% \pxhy at pdfenc
+\edef\pxhy at pdfenc{%
+ \ifpxhy at hy@unicode PU\else PD1\fi
+}
+
\ifnum\pxhy at driver=\pxhy at driver@dvipdfmx %<*dvipdfmx>
%%<+> \pxDeclarePdfTextCommand{\CS}{<jis>}{<ucs>}
@@ -571,7 +581,7 @@
\@onlypreamble\pxDeclarePdfTextCommand
\newcommand*\pxDeclarePdfTextCommand[3]{%
\pxhy at decl@pdf at tc{#2}{#3}%
- {\DeclareTextCommand{#1}{PD1}}%
+ {\DeclareTextCommand{#1}{\pxhy at pdfenc}}%
{\pxhy at revoke@pdf at tc{#1}}%
}
@@ -579,7 +589,7 @@
\@onlypreamble\pxDeclarePdfTextComposite
\newcommand*\pxDeclarePdfTextComposite[4]{%
\pxhy at decl@pdf at tc{#3}{#4}%
- {\DeclareTextCompositeCommand{#1}{PD1}{#2}}%
+ {\DeclareTextCompositeCommand{#1}{\pxhy at pdfenc}{#2}}%
{\pxhy at revoke@pdf at tcc{#1}{#2}}%
}
@@ -595,8 +605,8 @@
%% \pxhy at revoke@pdf at tc
\@onlypreamble\pxhy at revoke@pdf at tc
\def\pxhy at revoke@pdf at tc#1{%
- \expandafter\let\csname PD1\string#1\endcsname\@undefined
- \pxhy at make@txtcmd\pxhy at tmpa{PD1}#1%
+ \expandafter\let\csname\pxhy at pdfenc\string#1\endcsname\@undefined
+ \pxhy at make@txtcmd\pxhy at tmpa{\pxhy at pdfenc}#1%
\ifx#1\pxhy at tmpa
\pxhy at make@txtcmd#1?#1%
\fi
@@ -612,8 +622,8 @@
%% \pxhy at revoke@pdf at tcc
\@onlypreamble\pxhy at revoke@pdf at tc
\def\pxhy at revoke@pdf at tcc#1#2{%
- \expandafter\let\csname\string\PD1\string#1-\string#2%
- \endcsname\@undefined
+ \expandafter\let\csname\@backslashchar\pxhy at pdfenc
+ \string#1-\string#2\endcsname\@undefined
}
%% \pxhy at decl@pdf at tc
@@ -663,6 +673,7 @@
\fi %</upTeX>
%%%%%%%%%%%%%%%%%%%% the definitions
+\ifpxhy at hy@unicode\else %<!*unicode>
% JIS X 0213 does not distinguish the following pairs:
% - circumflex(U+02C6) and asciicircum(U+005E)
@@ -831,7 +842,7 @@
\pxDeclarePdfTextCommand{\th}{}{00FE}
\pxDeclarePdfTextComposite{\"}{y}{}{00FF}
\pxDeclarePdfTextCommand{\textcelsius}{216E}{2103}
-%%%%%%%%
+%%
%%[B] Aliases to [A].
%\pxDeclarePdfTextCommand{\copyright}{}{00A9}
@@ -1070,12 +1081,14 @@
\fi
\fi
+\fi %</unicode>
+%%%%%%%%%%%%%%%%%%%% done
+
%--------------------------------------- Enable hyperref unicode
\ifpxhy at hy@unicode
\PackageInfo\pxhy at pkgname
- {The setup for hyperref 'unicode' is applied.\MessageBreak
- (Note that this feature is experimental.)\@gobbletwo}
+ {The setup for hyperref 'unicode' is applied.\@gobbletwo}
%% The following code is taken from hyperref.sty.
%%%%BEGIN
More information about the tex-live-commits
mailing list.