diff options
Diffstat (limited to 'language')
37 files changed, 216 insertions, 427 deletions
diff --git a/language/japanese/platex-tools/README.md b/language/japanese/platex-tools/README.md index 903bb76ee3..99a92286e7 100644 --- a/language/japanese/platex-tools/README.md +++ b/language/japanese/platex-tools/README.md @@ -7,56 +7,56 @@ and some additional packages are included. ## Bundle contents +All these packages can be used on pLaTeX and upLaTeX. + +- pldocverb.sty: + Patch for doc.sty (latex) to improve + compatibility with `\verb` redefinition in pLaTeX. - plarray.sty: Patch for array.sty (latex-tools) to improve - compatibility with pLaTeX/upLaTeX kernels. - Can be used on pLaTeX/upLaTeX. + compatibility with pLaTeX kernel. - plextarray.sty: Patch for array.sty (latex-tools) to improve compatibility with plext.sty in pLaTeX. - Can be used on pLaTeX/upLaTeX. - plextdelarray.sty: Patch for delarray.sty (latex-tools) to improve compatibility with plext.sty in pLaTeX. - Can be used on pLaTeX/upLaTeX. +- plextcolortbl.sty: + Patch for colortbl.sty (by David Carlisle) to improve + compatibility with plext.sty in pLaTeX. - pxftnright.sty: Patch for ftnright.sty (latex-tools) to support Japanese classes for vertical writing. - Can be used on pLaTeX/upLaTeX. - pxmulticol.sty: Patch for multicol.sty (latex-tools) to support `\footnote` in vertical writing. - Can be used on pLaTeX/upLaTeX. - pxxspace.sty: Patch for xspace.sty (latex-tools) to fix interword spacing with Japanese characters. - Can be used on pLaTeX/upLaTeX. Version 0.2 was written by Takayuki YATO in 2019 (https://gist.github.com/zr-tex8r/7de76036846e149bc28ec6399a683e3a), and incorporated into this bundle by his courtesy. - pxeverysel.sty: Patch for everysel.sty (ms) to improve compatibility with Japanese font selection in pLaTeX. - Can be used on pLaTeX/upLaTeX. Version 0.1 was written by Takayuki YATO in 2015 (https://gist.github.com/zr-tex8r/48c6910bbbe2f41d72de), and incorporated into this bundle by his courtesy. - pxeveryshi.sty: Patch for everyshi.sty (ms) to support Japanese classes for vertical writing. - Can be used on pLaTeX/upLaTeX. Version 0.1 was written by Takayuki YATO in 2012 (https://gist.github.com/zr-tex8r/2702969), and incorporated into this bundle by his courtesy. - pxatbegshi.sty: Patch for atbegshi.sty (oberdiek) to support Japanese classes for vertical writing. - Can be used on pLaTeX/upLaTeX. The essential part of this package was proposed by Hironori Kitagawa in 2017. -The packages "pxgentombow", "gentombow" and "bounddvi" are now distributed -as part of [gentombow](https://github.com/aminophen/gentombow) bundle. +The packages "gentombow" (formerly "pxgentombow") and "bounddvi" +are now distributed as part of +[gentombow](https://github.com/aminophen/gentombow) bundle. ## Character encoding @@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-09-27 +2020-10-14 Hironobu Yamashita diff --git a/language/japanese/platex-tools/plarray.pdf b/language/japanese/platex-tools/plarray.pdf Binary files differindex dfa0afcbf7..27ef3b0f86 100644 --- a/language/japanese/platex-tools/plarray.pdf +++ b/language/japanese/platex-tools/plarray.pdf diff --git a/language/japanese/platex-tools/plarray.sty b/language/japanese/platex-tools/plarray.sty index 52ff536d54..2629e52bca 100644 --- a/language/japanese/platex-tools/plarray.sty +++ b/language/japanese/platex-tools/plarray.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * array.sty in latex-tools -% (2016/10/06 v2.4d -- 2019/08/31 v2.4l) +% (2016/10/06 v2.4d -- 2020/10/01 v2.5c) % * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2020/03/05 v1.3e) +% (2001/09/26 v1.2a -- 2020/09/28 v1.3g) % \NeedsTeXFormat{pLaTeX2e} diff --git a/language/japanese/platex-tools/plarray.tex b/language/japanese/platex-tools/plarray.tex index fdb95faf3e..66ea8f2fb5 100644 --- a/language/japanese/platex-tools/plarray.tex +++ b/language/japanese/platex-tools/plarray.tex @@ -7,8 +7,6 @@ \usepackage{doc} \usepackage{plarray} \GetFileInfo{plarray.sty} -\makeatletter -\makeatother \title{Package \textsf{plarray} \fileversion} \author{Hironobu Yamashita} \date{\filedate} diff --git a/language/japanese/platex-tools/pldocverb.pdf b/language/japanese/platex-tools/pldocverb.pdf Binary files differnew file mode 100644 index 0000000000..480cf59298 --- /dev/null +++ b/language/japanese/platex-tools/pldocverb.pdf diff --git a/language/japanese/plautopatch/pldocverb.sty b/language/japanese/platex-tools/pldocverb.sty index bd1dcb9c84..c3b7ec7050 100644 --- a/language/japanese/plautopatch/pldocverb.sty +++ b/language/japanese/platex-tools/pldocverb.sty @@ -13,9 +13,9 @@ % %% package declaration -\NeedsTeXFormat{LaTeX2e} +\NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pldocverb} - [2018/11/25 v0.2 doc package for pLaTeX/upLaTeX] + [2020/10/08 v0.2a doc package for pLaTeX/upLaTeX] \RequirePackage{doc} % doc.sty conditionally requires multicol.sty without passing options \IfFileExists{pxmulticol.sty}{\RequirePackage{pxmulticol}}{} diff --git a/language/japanese/platex-tools/pldocverb.tex b/language/japanese/platex-tools/pldocverb.tex new file mode 100644 index 0000000000..e590f4a67d --- /dev/null +++ b/language/japanese/platex-tools/pldocverb.tex @@ -0,0 +1,54 @@ +%# -*- coding: utf-8 -*- +\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016) + \epTeXinputencoding utf8 % ensure utf-8 encoding for platex +\fi + +\documentclass[a4paper]{jsarticle}% supports \verb in \footnote +\usepackage{doc} +\usepackage{pldocverb} +\GetFileInfo{pldocverb.sty} +\title{Package \textsf{pldocverb} \fileversion} +\author{Hironobu Yamashita} +\date{\filedate} +\begin{document} + +\maketitle + +This package \textsf{pldocverb} provides small patches to +\textsf{doc} package of \textsf{latex(-base)} for use with +Japanese p\LaTeX/up\LaTeX. +Current package supports re-definition of \verb+\verb+ command. + +This package is part of \textsf{platex-tools} bundle: +\begin{verbatim} + https://github.com/aminophen/platex-tools +\end{verbatim} + +\bigskip + +この\textsf{pldocverb}パッケージは、 +\textsf{latex(-base)}バンドルの\textsf{doc}パッケージによって +上書きされて無効化されてしまうp\LaTeX/up\LaTeX カーネルの修正点を +再有効化します。具体的には、\verb+\verb+コマンドの直前に +\verb+\xkanjiskip+挿入を許可するための修正に対応します。 + +\bigskip +\begin{minipage}{0.6\linewidth} +\noautoxspacing %% on purpose +\begin{verbatim} + \documentclass{jarticle} % if you are using pLaTeX, + \usepackage{pldocverb} % load this! + \usepackage{minijs} + \begin{document} + \setlength{\xkanjiskip}{10pt} + これが\verb+test+で\verb+テスト+です。 + \end{document} +\end{verbatim} +\end{minipage} +\begin{minipage}{0.35\linewidth} + \setlength{\xkanjiskip}{10pt} + これが\verb+test+で\verb+テスト+です。 +\end{minipage} +\bigskip + +\end{document} diff --git a/language/japanese/platex-tools/plextarray.pdf b/language/japanese/platex-tools/plextarray.pdf Binary files differindex 6ebd30fcee..ebf6a7aa51 100644 --- a/language/japanese/platex-tools/plextarray.pdf +++ b/language/japanese/platex-tools/plextarray.pdf diff --git a/language/japanese/platex-tools/plextarray.sty b/language/japanese/platex-tools/plextarray.sty index a1f3805678..24c8d2ca99 100644 --- a/language/japanese/platex-tools/plextarray.sty +++ b/language/japanese/platex-tools/plextarray.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * array.sty in latex-tools -% (2016/10/06 v2.4d -- 2019/08/31 v2.4l) +% (2016/10/06 v2.4d -- 2020/10/01 v2.5c) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % Largely based on lltjext.sty from LuaTeX-ja project. % diff --git a/language/japanese/platex-tools/plextcolortbl.pdf b/language/japanese/platex-tools/plextcolortbl.pdf Binary files differnew file mode 100644 index 0000000000..10e8857f5e --- /dev/null +++ b/language/japanese/platex-tools/plextcolortbl.pdf diff --git a/language/japanese/plautopatch/plextcolortbl.sty b/language/japanese/platex-tools/plextcolortbl.sty index 4519b99e24..a56a3067cf 100644 --- a/language/japanese/plautopatch/plextcolortbl.sty +++ b/language/japanese/platex-tools/plextcolortbl.sty @@ -9,7 +9,7 @@ % * colortbl.sty % (2012/06/21 v1.0b -- 2020/01/04 v1.0e) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % %% package declaration diff --git a/language/japanese/platex-tools/plextcolortbl.tex b/language/japanese/platex-tools/plextcolortbl.tex new file mode 100644 index 0000000000..0cea5c1093 --- /dev/null +++ b/language/japanese/platex-tools/plextcolortbl.tex @@ -0,0 +1,64 @@ +%# -*- coding: utf-8 -*- +\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016) + \epTeXinputencoding utf8 % ensure utf-8 encoding for platex +\fi + +\documentclass[a4paper]{jsarticle} +\usepackage{doc} +\usepackage{colortbl} +\usepackage{plextcolortbl} +\GetFileInfo{plextcolortbl.sty} +\title{Package \textsf{plextcolortbl} \fileversion} +\author{Hironobu Yamashita} +\date{\filedate} +\begin{document} + +\maketitle + +The package \textsf{plextcolortbl} provides a tiny patch to +make \textsf{colortbl} compatible with \textsf{plext}. + +\bigskip + +\textsf{plextcolortbl}パッケージは、David Carlisle氏による +\textsf{colortbl}パッケージと、p\LaTeX の拡張パッケージである +\textsf{plext}パッケージを同時に使えるようにするものです。 + +\section{使いかた} + +\textsf{plext}と\textsf{colortbl}を共存させたいときに、プリアンブルに +\verb+\usepackage{plextcolortbl}+と書きます。 + +以下に例を示します。 + +\bigskip +\begin{minipage}{0.5\linewidth} +\begin{verbatim} + \documentclass{jsarticle} + %\usepackage{plext} + %\usepackage{colortbl} + \usepackage{plextcolortbl} + \begin{document} + \begin{tabular*}<t>{3cm}{% + @{\extracolsep{\fill}} + >{\columncolor{green}[0pt][20mm]}l + >{\columncolor{yellow}[5mm][0pt]}l + @{}} + one & いち \\ + two & に + \end{tabular*} + \end{document} +\end{verbatim} +\end{minipage} +\begin{minipage}{0.4\linewidth} + \begin{tabular*}<t>{3cm}{% + @{\extracolsep{\fill}} + >{\columncolor{green}[0pt][20mm]}l + >{\columncolor{yellow}[5mm][0pt]}l + @{}} + one & いち \\ + two & に + \end{tabular*} +\end{minipage} + +\end{document} diff --git a/language/japanese/platex-tools/plextdelarray.pdf b/language/japanese/platex-tools/plextdelarray.pdf Binary files differindex 81ae06afe0..d45927b87d 100644 --- a/language/japanese/platex-tools/plextdelarray.pdf +++ b/language/japanese/platex-tools/plextdelarray.pdf diff --git a/language/japanese/platex-tools/plextdelarray.sty b/language/japanese/platex-tools/plextdelarray.sty index 03008c193e..fff8dbb64c 100644 --- a/language/japanese/platex-tools/plextdelarray.sty +++ b/language/japanese/platex-tools/plextdelarray.sty @@ -9,7 +9,7 @@ % * delarray.sty in latex-tools % (2014/10/28 v1.01) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % \NeedsTeXFormat{pLaTeX2e} diff --git a/language/japanese/platex-tools/pxatbegshi.pdf b/language/japanese/platex-tools/pxatbegshi.pdf Binary files differindex 6401ed5cf8..f43e6c22f1 100644 --- a/language/japanese/platex-tools/pxatbegshi.pdf +++ b/language/japanese/platex-tools/pxatbegshi.pdf diff --git a/language/japanese/platex-tools/pxeverysel.pdf b/language/japanese/platex-tools/pxeverysel.pdf Binary files differindex 83ab40a82e..01e9e6e09a 100644 --- a/language/japanese/platex-tools/pxeverysel.pdf +++ b/language/japanese/platex-tools/pxeverysel.pdf diff --git a/language/japanese/platex-tools/pxeveryshi.pdf b/language/japanese/platex-tools/pxeveryshi.pdf Binary files differindex d4538ba42c..35418cd977 100644 --- a/language/japanese/platex-tools/pxeveryshi.pdf +++ b/language/japanese/platex-tools/pxeveryshi.pdf diff --git a/language/japanese/platex-tools/pxftnright.pdf b/language/japanese/platex-tools/pxftnright.pdf Binary files differindex 918d40a324..29ee0a1246 100644 --- a/language/japanese/platex-tools/pxftnright.pdf +++ b/language/japanese/platex-tools/pxftnright.pdf diff --git a/language/japanese/platex-tools/pxmulticol.pdf b/language/japanese/platex-tools/pxmulticol.pdf Binary files differindex a82970574c..50a904177e 100644 --- a/language/japanese/platex-tools/pxmulticol.pdf +++ b/language/japanese/platex-tools/pxmulticol.pdf diff --git a/language/japanese/platex-tools/pxxspace.pdf b/language/japanese/platex-tools/pxxspace.pdf Binary files differindex 8dc7a2a4a8..fb9645aa46 100644 --- a/language/japanese/platex-tools/pxxspace.pdf +++ b/language/japanese/platex-tools/pxxspace.pdf diff --git a/language/japanese/plautopatch/README.md b/language/japanese/plautopatch/README.md index 1063a4b9b4..571e2d364d 100644 --- a/language/japanese/plautopatch/README.md +++ b/language/japanese/plautopatch/README.md @@ -15,13 +15,13 @@ similar to those of ordinary LaTeX ones. The following patches are currently registered: -- doc (latex) -> pldocverb (maintained here!) +- doc (latex) -> pldocverb (platex-tools) - tracefnt (latex) -> ptrace/uptrace (platex/uplatex) - fltrace (latex) -> pfltrace (platex) - array (latex-tools) -> plarray (platex-tools) - array (latex-tools) + plext (platex) -> plextarray (platex-tools) - delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -- colortbl + plext (platex) -> plextcolortbl (maintained here!) +- colortbl + plext (platex) -> plextcolortbl (platex-tools) - arydshln -> plarydshln (maintained here!) - arydshln + plext (platex) -> plextarydshln (maintained here!) - siunitx -> plsiunitx (maintained here!) @@ -32,9 +32,9 @@ The following patches are currently registered: - ftnright (latex-tools) -> pxftnright (platex-tools) - multicol (latex-tools) -> pxmulticol (platex-tools) - xspace (latex-tools) -> pxxspace (platex-tools) -- textpos -> pxtextpos (maintained here!) -- eso-pic -> pxesopic (maintained here!) -- pdfpages -> pxpdfpages (maintained here!) +- textpos -> pxtextpos (gentombow) +- eso-pic -> pxesopic (gentombow) +- pdfpages -> pxpdfpages (gentombow) - stfloats (sttools) -> pxstfloats (pxsttools) - hyperref -> pxjahyper (by Takayuki YATO) - pgfrcs (pgf) -> pxpgfrcs (maintained here!) @@ -52,12 +52,6 @@ together with the main package. All packages are meant for use with pLaTeX/upLaTeX. Short information: -- pldocverb.sty: - Patch for doc.sty (latex) to improve - compatibility with `\verb` redefinition in pLaTeX. -- plextcolortbl.sty: - Patch for colortbl.sty (by David Carlisle) to improve - compatibility with plext.sty in pLaTeX. - plarydshln.sty: Patch for arydshln.sty (by Hiroshi Nakashima) to improve compatibility with pLaTeX kernel. @@ -70,15 +64,6 @@ Short information: - plcollcell.sty: Patch for collcell.sty (by Martin Scharrer) to fix conflict with plarray.sty (platex-tools). -- pxtextpos.sty: - Patch for textpos.sty (by Norman Gray) to support - Japanese-style crop marks (called 'tombow' in Japanese). -- pxesopic.sty: - Patch for eso-pic.sty (by Rolf Niepraschk) to support - Japanese-style crop marks (called 'tombow' in Japanese). -- pxpdfpages.sty: - Patch for pdfpages.sty (by Andreas Matthias) to support - Japanese-style crop marks (called 'tombow' in Japanese). - pxpgfrcs.sty: Patch for pgfrcs.sty (part of PGF) to support Japanese classes for vertical writing. @@ -105,6 +90,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-09-27 +2020-10-14 Hironobu Yamashita diff --git a/language/japanese/plautopatch/plautopatch-ja.pdf b/language/japanese/plautopatch/plautopatch-ja.pdf Binary files differindex 418ebd8b87..366bcf438f 100644 --- a/language/japanese/plautopatch/plautopatch-ja.pdf +++ b/language/japanese/plautopatch/plautopatch-ja.pdf diff --git a/language/japanese/plautopatch/plautopatch-ja.tex b/language/japanese/plautopatch/plautopatch-ja.tex index acdb3f5e39..5913374333 100644 --- a/language/japanese/plautopatch/plautopatch-ja.tex +++ b/language/japanese/plautopatch/plautopatch-ja.tex @@ -5,6 +5,9 @@ \documentclass[a4paper]{jsarticle} \usepackage{doc} +\xspcode"5C=3 % \ +\xspcode"3C=3 % < +\xspcode"3E=3 % > \usepackage{plautopatch}% load this here to make \GetFileInfo work \GetFileInfo{plautopatch.sty} \title{Package \textsf{plautopatch} \fileversion} @@ -35,7 +38,11 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \section*{動作条件} -このパッケージは +\LaTeXe~2020-10-01以降の場合は、 +カーネルが提供するフックシステムの +\verb+\AddToHook{package/before/...}+及び +\verb+\AddToHook{package/after/...}+を利用します。 +\LaTeXe{}が古い場合は、 \textsf{filehook}パッケージ（Martin Scharrer氏の作）に依存します。 \section*{使い方} @@ -79,6 +86,9 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \def\ITEMoTx#1 (#2) -> #3 {% \item \textsf{#1} (\textsf{#2})\\ $\rightarrow$ \textsf{#3} } +\def\ITEMxTo#1 -> #2 (#3){% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} (\textsf{#3})} \def\ITEMxTx#1 -> #2 {% \item \textsf{#1}\\ $\rightarrow$ \textsf{#2} } @@ -101,13 +111,13 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの 現在のバージョン (\filedate\space\fileversion) がサポートしているのは 下記のパッケージです。 \begin{itemize} -\ITEMoTo doc (latex) -> pldocverb (maintained here!) +\ITEMoTo doc (latex) -> pldocverb (platex-tools) \ITEMoTo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) \ITEMoTo fltrace (latex) -> pfltrace (platex) \ITEMoTo array (latex-tools) -> plarray (platex-tools) \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools) \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!) +\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (platex-tools) \ITEMxTx arydshln -> plarydshln (maintained here!) \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMxTx siunitx -> plsiunitx (maintained here!) @@ -118,9 +128,9 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) \ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) \ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools) -\ITEMxTx textpos -> pxtextpos (maintained here!) -\ITEMxTx eso-pic -> pxesopic (maintained here!) -\ITEMxTx pdfpages -> pxpdfpages (maintained here!) +\ITEMxTo textpos -> pxtextpos (gentombow) +\ITEMxTo eso-pic -> pxesopic (gentombow) +\ITEMxTo pdfpages -> pxpdfpages (gentombow) \ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) \ITEMxTx hyperref -> pxjahyper (by Takayuki YATO) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) @@ -162,6 +172,7 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの \item 2020/09/13 v0.9h \LaTeXe~2020-10-01では\textsf{filehook}非依存に \item 2020/09/25 v0.9i \textsf{pxeveryshi}と\textsf{pxatbegshi}を不要に \item 2020/09/27 v0.9j \textsf{eso-pic}のサポート（要\LaTeXe~2020-10-01） + \item 2020/10/14 v0.9k トンボ関連パッチを\textsf{gentombow}へ移動 \end{itemize} \end{document} diff --git a/language/japanese/plautopatch/plautopatch.pdf b/language/japanese/plautopatch/plautopatch.pdf Binary files differindex 44aefb55a5..95ac396841 100644 --- a/language/japanese/plautopatch/plautopatch.pdf +++ b/language/japanese/plautopatch/plautopatch.pdf diff --git a/language/japanese/plautopatch/plautopatch.sty b/language/japanese/plautopatch/plautopatch.sty index f77c4e0b8a..5fd92ce617 100644 --- a/language/japanese/plautopatch/plautopatch.sty +++ b/language/japanese/plautopatch/plautopatch.sty @@ -8,10 +8,10 @@ \NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose! \ProvidesPackage{plautopatch} - [2020/09/27 v0.9j Automated patches for pLaTeX/upLaTeX] + [2020/10/14 v0.9k Automated patches for pLaTeX/upLaTeX] \ifx\pfmtname\@undefined - \PackageWarningNoLine{plautopatch}{% + \PackageInfo{plautopatch}{% This package is meant for pLaTeX/upLaTeX,\MessageBreak you will not need it.} \expandafter\endinput @@ -195,7 +195,7 @@ % register patches -\platpc@patch@after{doc}{pldocverb}% (maintained here!) +\platpc@patch@after{doc}{pldocverb}% platex-tools \ifx\enablecjktoken\@undefined \platpc@patch@after{tracefnt}{ptrace}% platex \else @@ -205,7 +205,7 @@ \platpc@patch@after{array}{plarray}% platex-tools \platpc@patch@after@both{array}{plext}{plextarray}% platex-tools \platpc@patch@after@both{delarray}{plext}{plextdelarray}% platex-tools -\platpc@patch@after@both{colortbl}{plext}{plextcolortbl}% (maintained here!) +\platpc@patch@after@both{colortbl}{plext}{plextcolortbl}% platex-tools \platpc@patch@after{arydshln}{plarydshln}% (maintained here!) \platpc@patch@after@both{arydshln}{plext}{plextarydshln}% (maintained here!) \platpc@patch@after{siunitx}{plsiunitx}% (maintained here!) @@ -226,19 +226,20 @@ \platpc@patch@before{ftnright}{pxftnright}% platex-tools \platpc@patch@after{multicol}{pxmulticol}% platex-tools \platpc@patch@after{xspace}{pxxspace}% platex-tools -\platpc@patch@after{textpos}{pxtextpos}% (maintained here!) +\platpc@patch@after{textpos}{pxtextpos}% gentombow % --- until LaTeX2e 2020-10-01, patching eso-pic automatically % --- is not supported by pxesopic \@ifl@t@r{\fmtversion}{2020/10/01}% - {\platpc@patch@before{eso-pic}{pxesopic}}{}% (maintained here!) -\platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!) + {\platpc@patch@before{eso-pic}{pxesopic}}{}% gentombow +\platpc@patch@after{pdfpages}{pxpdfpages}% gentombow \platpc@patch@before{stfloats}{pxstfloats}% pxsttools -- (!!) % --- in most cases, pxjahyper works without explicit options % --- however, in case a user specifies some, delay it % --- [TODO] if \AtBeginDocument{\usepackage{hyperref}} appears, % ---- writing to \jobname.out (= 'jacommentline' feature) % ---- does not work because it's too late. -\AtBeginDocument{\platpc@patch@after{hyperref}{pxjahyper}} +\AtBeginDocument + {\platpc@patch@after{hyperref}{pxjahyper}}% by Takayuki YATO (ZR) % for TikZ/PGF \platpc@patch@after{pgfrcs}{pxpgfrcs}% (maintained here!) diff --git a/language/japanese/plautopatch/plautopatch.tex b/language/japanese/plautopatch/plautopatch.tex index b0e3cda4a5..7e7497f81a 100644 --- a/language/japanese/plautopatch/plautopatch.tex +++ b/language/japanese/plautopatch/plautopatch.tex @@ -3,8 +3,11 @@ \epTeXinputencoding utf8 % ensure utf-8 encoding for platex \fi -\documentclass[a4paper]{jsarticle} +\documentclass[a4paper,english]{jsarticle} \usepackage{doc} +\xspcode"5C=3 % \ +\xspcode"3C=3 % < +\xspcode"3E=3 % > \usepackage{plautopatch}% load this here to make \GetFileInfo work \GetFileInfo{plautopatch.sty} \title{Package \textsf{plautopatch} \fileversion} @@ -34,8 +37,12 @@ The package is maintained on GitHub: \section*{Requirements} -This package depends on \textsf{filehook} package, -written by Martin Scharrer. +If \LaTeXe~2020-10-01 or newer is running, +this package uses the new hook system such as +\verb+\AddToHook{package/before/...}+ and +\verb+\AddToHook{package/after/...}+. +If \LaTeXe\ is older than that, this package depends on +\textsf{filehook} package (written by Martin Scharrer). \section*{Usage} @@ -79,6 +86,9 @@ as a list separated by commas and spaces. \def\ITEMoTx#1 (#2) -> #3 {% \item \textsf{#1} (\textsf{#2})\\ $\rightarrow$ \textsf{#3} } +\def\ITEMxTo#1 -> #2 (#3){% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} (\textsf{#3})} \def\ITEMxTx#1 -> #2 {% \item \textsf{#1}\\ $\rightarrow$ \textsf{#2} } @@ -100,13 +110,13 @@ The legend: Current version (\filedate\space\fileversion) supports the followings: \begin{itemize} -\ITEMoTo doc (latex) -> pldocverb (maintained here!) +\ITEMoTo doc (latex) -> pldocverb (platex-tools) \ITEMoTo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) \ITEMoTo fltrace (latex) -> pfltrace (platex) \ITEMoTo array (latex-tools) -> plarray (platex-tools) \ITEMooTo array (latex-tools) + plext (platex) -> plextarray (platex-tools) \ITEMooTo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) -\ITEMxoTx colortbl + plext (platex) -> plextcolortbl (maintained here!) +\ITEMxoTo colortbl + plext (platex) -> plextcolortbl (platex-tools) \ITEMxTx arydshln -> plarydshln (maintained here!) \ITEMxoTx arydshln + plext (platex) -> plextarydshln (maintained here!) \ITEMxTx siunitx -> plsiunitx (maintained here!) @@ -117,9 +127,9 @@ Current version (\filedate\space\fileversion) supports the followings: \ITEMoTo ftnright (latex-tools) -> pxftnright (platex-tools) \ITEMoTo multicol (latex-tools) -> pxmulticol (platex-tools) \ITEMoTo xspace (latex-tools) -> pxxspace (platex-tools) -\ITEMxTx textpos -> pxtextpos (maintained here!) -\ITEMxTx eso-pic -> pxesopic (maintained here!) -\ITEMxTx pdfpages -> pxpdfpages (maintained here!) +\ITEMxTo textpos -> pxtextpos (gentombow) +\ITEMxTo eso-pic -> pxesopic (gentombow) +\ITEMxTo pdfpages -> pxpdfpages (gentombow) \ITEMoTo stfloats (sttools) -> pxstfloats (pxsttools) \ITEMxTx hyperref -> pxjahyper (by Takayuki YATO) \ITEMoTx pgfrcs (pgf) -> pxpgfrcs (maintained here!) @@ -164,6 +174,7 @@ a comma-separated list of them: \item 2020/09/13 v0.9h No dependency for \textsf{filehook} on \LaTeXe~2020-10-01 \item 2020/09/25 v0.9i Do not require \textsf{pxeveryshi} and \textsf{pxatbegshi} \item 2020/09/27 v0.9j Add support for \textsf{eso-pic} (\LaTeXe~2020-10-01 required) + \item 2020/10/14 v0.9k Move tombow-related patches to \textsf{gentombow} \end{itemize} \end{document} diff --git a/language/japanese/plautopatch/plextarydshln.sty b/language/japanese/plautopatch/plextarydshln.sty index 2ccdc865ed..89a019e639 100644 --- a/language/japanese/plautopatch/plextarydshln.sty +++ b/language/japanese/plautopatch/plextarydshln.sty @@ -9,7 +9,7 @@ % * arydshln.sty % (2004/08/31 v1.71 -- 2019/02/21 v1.76) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) +% (2001/09/26 v1.2 -- 2020/10/07 v1.2m) % %% package declaration diff --git a/language/japanese/plautopatch/pxesopic.sty b/language/japanese/plautopatch/pxesopic.sty deleted file mode 100644 index f020501e94..0000000000 --- a/language/japanese/plautopatch/pxesopic.sty +++ /dev/null @@ -1,177 +0,0 @@ -% -% pxesopic.sty -% written by Hironobu Yamashita (@aminophen) -% -% This package is part of the plautopatch bundle. -% https://github.com/aminophen/plautopatch -% -% This package is expected to be compatible with -% * eso-pic.sty -% ????/??/?? v?.? -- 2018/04/12 v2.0h -% -% -------------------------------------------------------------- -% [Note] -% The package ``pxesopic.sty'' relies heavily on internals -% of ``plautopatch.sty'' -% -------------------------------------------------------------- -% - -%% package declaration -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pxesopic} - [2020/09/27 v0.2a Patch to eso-pic for tombow] - -%% preparations -\def\pxesop@pkgname{pxesopic} -\def\pxesop@error{\PackageError\pxesop@pkgname} -\def\pxesop@warn{\PackageWarningNoLine\pxesop@pkgname} -\let\pxesop@debug\@gobble -\def\pxesop@debug#1{\typeout{\pxesop@pkgname: [DEBUG] #1}}% for debug - -%% hooks -\ifx\declare@file@substitution\@undefined - % LaTeX2e 2020-02-02 PL5 or older - \RequirePackage{filehook} - \let\pxesop@ExecuteAfterPackage=\AtEndOfPackageFile - \let\pxesop@ExecuteBeforePackage=\AtBeginOfPackageFile -\else - % LaTeX2e 2020-10-01 or newer - \def\pxesop@ExecuteAfterPackage#1{\AddToHook{package/after/#1}} - \def\pxesop@ExecuteBeforePackage#1{\AddToHook{package/before/#1}} -\fi - -%% the contents of \AtBeginShipout is dependent on \iftombow; -%% delay execution of \AtBeginShipout inside ``eso-pic.sty'' -%% until \AtBeginDocument, to support both (u)pLaTeX kernel -%% and ``gentombow.sty'' -\RequirePackage{atbegshi}% eso-pic requires atbegshi -\pxesop@ExecuteBeforePackage{eso-pic}{\pxesop@before} -\pxesop@ExecuteAfterPackage{eso-pic}{\pxesop@after} -% -\def\pxesop@before{% - \let\pxesop@AtBeginShipout\AtBeginShipout - \def\AtBeginShipout##1{\def\pxesop@hook{##1}}% hide it - \pxesop@debug{\noexpand\AtBeginShipout disabled}% - \let\pxesop@before\relax -} -\def\pxesop@after{% - \let\AtBeginShipout\pxesop@AtBeginShipout % restore - \let\pxesop@AtBeginShipout\relax - \pxesop@debug{\noexpand\AtBeginShipout restored}% - \let\@unknownoptionerror\relax %% avoid an error - \pxesop@debug{\noexpand\@unknownoptionerror disabled}% - \let\pxesop@after\relax -} -%% - -%% load it; be careful not to cause unknown option error! -\expandafter\ifx\csname @unknownoptionerror\endcsname - \pxesop@error{Failed to save \noexpand\@unknownoptionerror}\@ehc -\fi -\let\pxesop@unknownoptionerror\@unknownoptionerror -% -\chardef\pxesop@status\z@ -\@ifpackageloaded{plautopatch}{% - \expandafter\ifx\csname platpc@begin@eso-pic\endcsname\relax - % ``plautopatch.sty'' is loaded but the macro is \relax - % => means that ``pxesopic.sty'' is automatically loaded - \chardef\pxesop@status\@ne - \fi -}{} -% -%% pass all options to keyval-style ``eso-pic.sty'' -\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{eso-pic}} -\ProcessOptions\relax -\RequirePackage{eso-pic} -% -%% recover the error -\ifnum\pxesop@status>\z@ % auto - \def\pxesop@pkgtohook{eso-pic}% - % note that ``plautopatch.sty'' discards the hook - % on LaTeX2e 2020-02-02 PL5 or older - \ifx\declare@file@substitution\@undefined - \let\pxesop@pkgtohook\pxesop@pkgname - % throw an error for unsupported usage - % [FIXME] the error below is actually unnecessary when - % none of ``eso-pic.sty'' options is used; how to detect that? - \pxesop@error{Try loading \pxesop@pkgname\space by hand}\@ehc - \fi -\else - \let\pxesop@pkgtohook\pxesop@pkgname -\fi -\pxesop@ExecuteAfterPackage\pxesop@pkgtohook{% - \let\@unknownoptionerror\pxesop@unknownoptionerror - \pxesop@debug{\noexpand\@unknownoptionerror restored}% -} -%% - -%% delayed to detect \iftombow status -\AtBeginDocument{% - \ifx\tombowtrue\@undefined - \pxesop@warn{Tombow feature unavailable, aborting}% - \fi - \iftombow \pxesop@new \else \pxesop@orig \fi}% -% -%% for \iftombow is FALSE => restore from ``eso-pic.sty'' -\expandafter\def\expandafter\pxesop@orig\expandafter{% - \expandafter\AtBeginShipout\expandafter{\pxesop@hook}} -% -%% for \iftombow is TRUE => redefine by ``pxesopic.sty'' -\def\pxesop@new{% - %% \AtStockLowerLeft: based on TRUE of \ESO@isMEMOIR - \renewcommand\AtStockLowerLeft[1]{% - \begingroup - \@tempdima=-\stockwidth - \advance\@tempdima\paperwidth - \@tempdimb=-\stockheight - \advance\@tempdimb\paperheight - %% specific BEGIN - \advance\@tempdima 1in\relax - \advance\@tempdimb 1in\relax - %% specific END - \AtPageLowerLeft{% - \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){##1}% - }% - \endgroup - }% === - %% \AtStockUpperLeft: based on TRUE of \ESO@isMEMOIR - \renewcommand\AtStockUpperLeft[1]{% - \AtStockLowerLeft{% - \put(0,\LenToUnit{\stockheight}){##1}% - }% - }% === - %% \AtStockCenter: based on TRUE of \ESO@isMEMOIR - \renewcommand\AtStockCenter[1]{% - \AtStockLowerLeft{% - \put(\LenToUnit{.5\stockwidth},\LenToUnit{.5\stockheight}){##1}% - }% - }% - %% \AtTextUpperLeft: same as FALSE of \ESO@isMEMOIR - % (no change) - % - %% \AtBeginShipout: based on TRUE of \ESO@isMEMOIR - \AtBeginShipout{% - \@tempdima=\dimexpr(\stockwidth-\paperwidth)/2\relax - \@tempdimb=-\dimexpr(\stockheight+\paperheight)/2\relax - \ifESO@texcoord - \advance\@tempdimb\paperheight % [FIXME] not sure! - \fi - \nointerlineskip - \AtBeginShipoutUpperLeft{% - \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){% - \ESO@HookIIIBG\ESO@HookIBG\ESO@HookIIBG - \global\let\ESO@HookIIBG\@empty - }% - }% - \AtBeginShipoutUpperLeftForeground{% - \put(\LenToUnit{\@tempdima},\LenToUnit{\@tempdimb}){% - \ESO@HookIFG\ESO@HookIIFG\ESO@HookIIIFG - \global\let\ESO@HookIIFG\@empty - }% - }% - }% === -} -%% - -\endinput -%% EOF diff --git a/language/japanese/plautopatch/pxpdfpages.sty b/language/japanese/plautopatch/pxpdfpages.sty deleted file mode 100644 index 36b796cf28..0000000000 --- a/language/japanese/plautopatch/pxpdfpages.sty +++ /dev/null @@ -1,51 +0,0 @@ -% -% pxpdfpages.sty -% written by Hironobu Yamashita (@aminophen) -% -% This package is part of the plautopatch bundle. -% https://github.com/aminophen/plautopatch -% -% This package is expected to be compatible with -% * pdfpages.sty -% (2015/07/19 v0.5a -- 2020/01/28 v0.5q) -% * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2020/03/05 v1.3e) -% - -%% package declaration -\NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxpdfpages} - [2018/08/20 v0.1 Patch to pdfpages for (u)pLaTeX] - -%% preparations -\def\pxpdpg@pkgname{pxpdfpages} -\def\pxpdpg@warn{\PackageWarningNoLine\pxpdpg@pkgname} -\def\pxpdpg@info{\PackageInfo\pxpdpg@pkgname} - -%% load it -\RequirePackageWithOptions{pdfpages} -\RequirePackage{pxatbegshi}% pdfpages requires atbegshi - -%% patch internal for pdfpages to work with tombow -%% Note: this code should be copied to gentombow.sty! -\def\pxpdpg@patch@pdfpages{% - \RequirePackage{etoolbox} - \patchcmd{\AM@output}{% - \setlength{\@tempdima}{\AM@xmargin}% - \edef\AM@xmargin{\the\@tempdima}% - \setlength{\@tempdima}{\AM@ymargin}% - \edef\AM@ymargin{\the\@tempdima}% - }{% - \setlength{\@tempdima}{\AM@xmargin\iftombow+1in\fi}% - \edef\AM@xmargin{\the\@tempdima}% - \setlength{\@tempdima}{\AM@ymargin\iftombow-1in\fi}% - \edef\AM@ymargin{\the\@tempdima}% - } - {\pxpdpg@info{Patch for pdfpages applied}} - {\pxpdpg@warn{Patch for pdfpages failed}}% - } -\AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxpdpg@patch@pdfpages}{}} - -%% all done - -\endinput diff --git a/language/japanese/plautopatch/pxpgfrcs.sty b/language/japanese/plautopatch/pxpgfrcs.sty index b5508dcf47..a151a19437 100644 --- a/language/japanese/plautopatch/pxpgfrcs.sty +++ b/language/japanese/plautopatch/pxpgfrcs.sty @@ -9,8 +9,15 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxpgfrcs} - [2018/09/21 v0.1 shadings etc in tate class] -\RequirePackage{pgfrcs} + [2020/10/10 v0.2 shadings etc in tate class] +\RequirePackage{pgfrcs}% pgfutil-latex.def requires everyshi +\ifx\@EveryShipout@Output\@undefined + % LaTeX2e 2020-10-01: an emulation by ``everyshi-ltx.sty'' + % => pLaTeX2e 2020-10-01 natively supports it +\else + % older: the real ``everyshi.sty'' is loaded + \IfFileExists{pxeveryshi.sty}{\RequirePackage{pxeveryshi}}{} +\fi % Note: I chose the name "pxpgfrcs.sty" % (instead of "pgfutil-platex.def") because @@ -20,7 +27,6 @@ % such an interface like \input pgfutil-platex.def. % patch pgfutil-latex.def -\RequirePackage{pxeveryshi}% pgfutil-latex.def requires everyshi \def\pgfutil@insertatbegincurrentpagefrombox#1{% \edef\pgf@temp{\the\wd\pgfutil@abb}% \global\setbox\pgfutil@abb\hbox{% diff --git a/language/japanese/plautopatch/pxtextpos.sty b/language/japanese/plautopatch/pxtextpos.sty deleted file mode 100644 index c6e7cf5fe0..0000000000 --- a/language/japanese/plautopatch/pxtextpos.sty +++ /dev/null @@ -1,85 +0,0 @@ -% -% pxtextpos.sty -% written by Hironobu Yamashita (@aminophen) -% -% This package is part of the plautopatch bundle. -% https://github.com/aminophen/plautopatch -% -% This package is expected to be compatible with -% * textpos.sty -% 2005/10/13 v1.6a -- 2019/04/15 v1.9.1 -% - -%% package declaration -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pxtextpos} - [2019/11/17 v0.2a Patch to textpos for tombow] - -%% preparations -\def\pxtxtpos@pkgname{pxtextpos} -\def\pxtxtpos@warn{\PackageWarningNoLine\pxtxtpos@pkgname} - -%% load it -\RequirePackageWithOptions{textpos} - -%% check if \iftombow ... \fi is available -\ifx\tombowtrue\@undefined - \pxtxtpos@warn{Tombow feature unavailable, aborting} - \expandafter\endinput -\fi - -%% known definition -\def\pxtxtpos@textblockorigin#1#2{% - \ifTP@abspos - \TP@ox=-1in \addtolength\TP@ox{#1} - \TP@oy=-1in \addtolength\TP@oy{#2} - \ifTP@chatter\typeout{TextBlockOrigin set to #1 x #2}\fi - \else - \PackageError{textpos} - {The \protect\textblockorigin\space command\MessageBreak - may only be used if the package was given\MessageBreak - the`absolute' option when it was invoked} - {If you want to use the \protect\textblockorigin\space command, then - \MessageBreak - invoke the package with the syntax\MessageBreak - \protect\usepackage[absolute]{textpos}} - \fi -} -\@onlypreamble\pxtxtpos@textblockorigin - -%% redefine it -\ifx\textblockorigin\pxtxtpos@textblockorigin\else - \pxtxtpos@warn{% - Command \noexpand\textblockorigin is beyond my knowledge.\MessageBreak - I will apply the patch anyway, but it may break:\MessageBreak - Please report to the author of `\pxtxtpos@pkgname.sty'} -\fi -\def\textblockorigin#1#2{% - \ifTP@abspos - \TP@ox=-1in \addtolength\TP@ox{#1} - \TP@oy=-1in \addtolength\TP@oy{#2} - %%% addition - \iftombow - \addtolength\TP@ox{1in}\addtolength\TP@oy{1in} - \fi - %%% - \ifTP@chatter\typeout{TextBlockOrigin set to #1 x #2}\fi - \else - \PackageError{textpos} - {The \protect\textblockorigin\space command\MessageBreak - may only be used if the package was given\MessageBreak - the`absolute' option when it was invoked} - {If you want to use the \protect\textblockorigin\space command, then - \MessageBreak - invoke the package with the syntax\MessageBreak - \protect\usepackage[absolute]{textpos}} - \fi -} - -%% reset -\ifTP@abspos - \textblockorigin{0pt}{0pt}% -\fi - -\endinput -%% EOF diff --git a/language/japanese/pxjahyper/README-ja.md b/language/japanese/pxjahyper/README-ja.md index bacc24b43f..f9126c84ed 100644 --- a/language/japanese/pxjahyper/README-ja.md +++ b/language/japanese/pxjahyper/README-ja.md @@ -49,12 +49,11 @@ pxjahyper-enc パッケージ ー 文字コード設定 ### パッケージオプション -※オプション無しでの読込が望ましい。一応グローバルのドライバオプション -に反応するが、これについても「ドライバ指定が dvipdfmx である場合にのみ -読み込む」のが望ましい。 +※オプション無しでの読込が望ましいが、一応グローバルのドライバオプション +に反応するようにしている。 - * ドライバオプション：`dvipdfmx`/`dvips`/`nodvidriver` があり、`dvips` - はエラーになり、`nodvidriver` はパッケージの機能を無効化する。 + * ドライバオプション：`dvipdfmx`/`dvips`/`nodvidriver` があり、 + `dvipdfmx` 以外を指定した場合はパッケージの機能を無効化する。 ### 機能 @@ -71,6 +70,9 @@ pxjahyper-enc パッケージ ー 文字コード設定 更新履歴 -------- + * Version 0.6a 〈2020/10/10〉 + - pxjahyper-enc：`dvips` 指定時はエラーでなく警告を出す。 + * Version 0.6 〈2020/10/05〉 - pxjahyper-enc パッケージを追加した。 - `otfmacros` オプションを既定で有効にする。 diff --git a/language/japanese/pxjahyper/README.md b/language/japanese/pxjahyper/README.md index c7201e43d6..476d97749e 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.6a 〈2020/10/10〉 * Version 0.6 〈2020/10/05〉 * Version 0.5b 〈2020/10/04〉 * Version 0.5a 〈2020/09/27〉 diff --git a/language/japanese/pxjahyper/pxjahyper-ajm.def b/language/japanese/pxjahyper/pxjahyper-ajm.def index a8897d9c5c..b4b00f5d79 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}[2020/10/04 v0.5b] +\ProvidesFile{pxjahyper-ajm.def}[2020/10/10 v0.6] %% avoid multiple loading \csname pxjahyperajmLoaded\endcsname diff --git a/language/japanese/pxjahyper/pxjahyper-enc.sty b/language/japanese/pxjahyper/pxjahyper-enc.sty index 51468dc23c..3b9583a766 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}[2020/10/05 v0.6-pre] +\ProvidesPackage{pxjahyper-enc}[2020/10/10 v0.6a] \def\pxhe@pkgname{pxjahyper-enc} \providecommand{\bxDebug}[1]{} @@ -61,10 +61,9 @@ %% check \ifx d\pxhe@driver\else - \ifx 0\pxhe@driver\else - \PackageError\pxhe@pkgname - {Bad driver option} - {Package loading is aborted right now.} + \ifx s\pxhe@driver + \PackageWarningNoLine\pxhe@pkgname + {Unsupported driver (dvips)} \fi \let\pxhe@begin@dvi@hook\@gobble \expandafter\endinput\fi\relax diff --git a/language/japanese/pxjahyper/pxjahyper.sty b/language/japanese/pxjahyper/pxjahyper.sty index 0a79f7fe03..9a89a338ef 100644 --- a/language/japanese/pxjahyper/pxjahyper.sty +++ b/language/japanese/pxjahyper/pxjahyper.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper}[2020/10/05 v0.6-pre] +\ProvidesPackage{pxjahyper}[2020/10/10 v0.6a] %% error messages \def\pxhy@pkgname{pxjahyper} @@ -250,13 +250,6 @@ pxhy@driver = \the\pxhy@driver^^J% \def\pxhy@end{\pxhy@end@} \let\pxhy@mk\indent % unexpandable -%% \pxhy@out@special{<text>} -\def\pxhy@out@special#1{% - \edef\pxhy@tmpa{% - \noexpand\pxhy@begin@dvi@enc@hook{\special{#1}}% - }\pxhy@tmpa -} - %% \pxhy@begin@dvi@hook{<text>} %% \pxhy@begin@dvi@enc@hook{<text>} \ifpxhy@new@hook@system @@ -264,19 +257,8 @@ pxhy@driver = \the\pxhy@driver^^J% \AddToHook{shipout/firstpage}{#1}% } \DeclareHookRule{shipout/firstpage}{.}{>}{hyperref} - \def\pxhy@begin@dvi@enc@hook#1{% only once - \AddToHook{shipout/firstpage}[./enc]{#1}% - \DeclareHookRule{shipout/firstpage}{./enc}{<}{hyperref}% - } \else \RequirePackage{atbegshi}[2011/10/05]% v1.16 -\def\pxhy@begin@dvi@enc@hook#1{% - \begingroup - \toks\z@{#1}% - \toks\tw@\expandafter{\AtBegShi@HookFirst}% - \xdef\AtBegShi@HookFirst{\the\toks@\the\toks\tw@}% - \endgroup -} \def\pxhy@begin@dvi@hook#1{% \AtBeginShipoutFirst{#1}% } @@ -331,20 +313,8 @@ pxhy@driver = \the\pxhy@driver^^J% \ifnum\pxhy@driver=\pxhy@driver@dvipdfmx %<*dvipdfmx> %% dvipdfmx - \IfFileExists{pxjahyper-enc.sty}{% FIXME: TRANSIENT CODE \RequirePackage{pxjahyper-enc}[]% \ifpxhy@bigcode\else \suppressbigcode \fi - }{%else - \if e\pxhy@jcode % euc - \pxhy@out@special{pdf:tounicode EUC-UCS2} - \else\if s\pxhy@jcode % sjis - \pxhy@out@special{pdf:tounicode 90ms-RKSJ-UCS2} - \else\ifpxhy@bigcode % ucs, bigcode - \pxhy@out@special{pdf:tounicode UTF8-UTF16} - \else - \pxhy@out@special{pdf:tounicode UTF8-UCS2} - \fi\fi\fi - }% \fi %</dvipdfmx> \fi diff --git a/language/japanese/pxjahyper/pxjahyper.tex b/language/japanese/pxjahyper/pxjahyper.tex index c903300952..87b782970b 100644 --- a/language/japanese/pxjahyper/pxjahyper.tex +++ b/language/japanese/pxjahyper/pxjahyper.tex @@ -6,8 +6,8 @@ \MakeShortVerb{\|} \usepackage{bxtexlogo} \bxtexlogoimport{*} -\newcommand{\PkgVersion}{0.6} -\newcommand{\PkgDate}{2020/10/05} +\newcommand{\PkgVersion}{0.6a} +\newcommand{\PkgDate}{2020/10/10} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} |