texlive[48722] Master/texmf-dist: platex-tools (21sep18)

commits+karl at tug.org commits+karl at tug.org
Fri Sep 21 23:06:46 CEST 2018 

Revision: 48722
          http://tug.org/svn/texlive?view=revision&revision=48722
Author:   karl
Date:     2018-09-21 23:06:46 +0200 (Fri, 21 Sep 2018)
Log Message:
-----------
platex-tools (21sep18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/platex-tools/README.md
    trunk/Master/texmf-dist/doc/latex/platex-tools/plarray.pdf
    trunk/Master/texmf-dist/doc/latex/platex-tools/plarray.tex
    trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.pdf
    trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex
    trunk/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf
    trunk/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex
    trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
    trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
    trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
    trunk/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty

Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/platex-tools/README.md	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/doc/latex/platex-tools/README.md	2018-09-21 21:06:46 UTC (rev 48722)
@@ -74,6 +74,6 @@
 
 ## Release Date
 
-2018-09-18
+2018-09-21
 
 Hironobu Yamashita

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

Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/plarray.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/platex-tools/plarray.tex	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/doc/latex/platex-tools/plarray.tex	2018-09-21 21:06:46 UTC (rev 48722)
@@ -60,7 +60,7 @@
   \begin{tabular}{|>{$}c<{$}|c|}\hline
     \exp(x) & 指数関数 \\ \hline
     \log(x) & 対数関数 \\ \hline
-  \end{tabular}
+  \end{tabular}%
   終わり
   \end{document}
 \end{verbatim}
@@ -70,7 +70,7 @@
   \begin{tabular}{|>{$}c<{$}|c|}\hline
     \exp(x) & 指数関数 \\ \hline
     \log(x) & 対数関数 \\ \hline
-  \end{tabular}
+  \end{tabular}%
   終わり
 \end{minipage}
 \bigskip

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

Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/doc/latex/platex-tools/plextarray.tex	2018-09-21 21:06:46 UTC (rev 48722)
@@ -38,6 +38,7 @@
 writing direction:
 \begin{verbatim}
   \begin{tabular}<dir>[pos]{table spec} ... \end{tabular}
+  \begin{tabular*}<dir>{width}[pos]{table spec} ... \end{tabular*}
   \begin{array}<dir>[pos]{table spec} ... \end{array}
 \end{verbatim}
 The option \texttt{<dir>} permits one of the following three values.
@@ -91,7 +92,7 @@
   \begin{tabular}<t>{|>{$}c<{$}|c|}\hline
     \exp(x) & 指数関数 \\ \hline
     \log(x) & 対数関数 \\ \hline
-  \end{tabular}
+  \end{tabular}%
   終わり
   \end{document}
 \end{verbatim}
@@ -101,7 +102,7 @@
   \begin{tabular}<t>{|>{$}c<{$}|c|}\hline
     \exp(x) & 指数関数 \\ \hline
     \log(x) & 対数関数 \\ \hline
-  \end{tabular}
+  \end{tabular}%
   終わり
 \end{minipage}
 
@@ -127,7 +128,7 @@
     みかん & 150円 & 和歌山県 \\ \hline
     パイナップル & 400円 & 沖縄県 \\ \hline
     バナナ & 190円 & フィリピン \\ \hline
-  \end{tabular}
+  \end{tabular}%
   終わり
   \end{document}
 \end{verbatim}
@@ -142,7 +143,7 @@
   みかん & 150円 & 和歌山県 \\ \hline
   パイナップル & 400円 & 沖縄県 \\ \hline
   バナナ & 190円 & フィリピン \\ \hline
-\end{tabular}
+\end{tabular}%
 終わり
 \end{minipage}
 \bigskip

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

Modified: trunk/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex	2018-09-21 21:06:46 UTC (rev 48722)
@@ -35,10 +35,12 @@
 Heiko Oberdiek氏による\textsf{atbegshi}パッケージは
 \verb+\AtBeginShipout{...}+というコマンドを提供しますが、これを
 p\LaTeX の縦組クラス（tarticle.clsなど）で使うとエラーが出てしまいます
-\footnote{単に縦組クラスで\textsf{pxatbegshi}パッケージを読み込んだだけ
+\footnote{単に縦組クラスで\textsf{atbegshi}パッケージを読み込んだだけ
 では、エラーは出ないようです。}。
 この\textsf{pxatbegshi}パッケージは、縦組クラスでも
 \textsf{atbegshi}パッケージの機能を使えるようにするためのものです。
+もちろん、横組クラスで\textsf{pxatbegshi}パッケージを使用しても
+問題は起きません。
 
 使いかたは、\textsf{atbegshi}パッケージの代わりに、あるいは
 \textsf{atbegshi}パッケージに追加して、\textsf{pxatbegshi}パッケージを
@@ -58,9 +60,12 @@
 
 \section*{謝辞}
 
-本パッケージの実装は、北川さん(Hironori Kitagawa)さんによる
+本パッケージの実装には、Takayuki Yato (ZR) 氏による
+\textsf{bxpapersize}パッケージを参考にしました
+\footnote{2018/09/21 v0.3までは北川さん (Hironori Kitagawa) による
 「\verb+\AtBegShi at Output+の処理を強引に横組でやらせるコード」
-をベースにしています。
+をベースにしていましたが、v0.4で\verb+\AtBeginShipoutDiscard+へ
+対応させる改修を機に、書き直しました。}。
 
 \section*{References}
 
@@ -70,6 +75,8 @@
 \item \relax[tex-jp-build] [ptex] ページ・数式の組方向
       （※北川さんのコードの初出）\\
   \texttt{https://github.com/texjporg/tex-jp-build/issues/21}
+\item CTAN: Package \textsf{bxpapersize}\\
+  \texttt{https://ctan.org/pkg/bxpapersize}
 \end{itemize}
 
 \end{document}

Modified: trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/tex/latex/platex-tools/plarray.sty	2018-09-21 21:06:46 UTC (rev 48722)
@@ -14,7 +14,7 @@
 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{plarray}
-  [2018/09/18 v0.1f Tabular extension package for pLaTeX/upLaTeX]
+  [2018/09/20 v0.1g Tabular extension package for pLaTeX/upLaTeX]
 \RequirePackage{array}
 
 %% patching internal code for array.sty
@@ -21,8 +21,8 @@
 %
 %% remove extra \xkanjiskip (pLaTeX2e 2016/04/17)
 \@ifl at t@r{\pfmtversion}{2016/04/17}
-  {\expandafter\@firstoftwo}
-  {\expandafter\@secondoftwo}
+  {\expandafter\@firstofone}
+  {\expandafter\@gobble}
 {% = for pLaTeX2e 2016/04/17 or newer
 \def\@tabular{%
   \leavevmode \null
@@ -32,14 +32,11 @@
 \def\endtabular{\endarray $\egroup\null}
 \expandafter \let \csname endtabular*\endcsname = \endtabular
 }% =
-{% = for pLaTeX2e 2006/11/10 or older
-% nothing to be done
-}% =
 %
 %% inhibit JFM glue around tabular cell components (pLaTeX2e 2018/03/09)
 \@ifl at t@r{\pfmtversion}{2017/07/29}
-  {\expandafter\@firstoftwo}
-  {\expandafter\@secondoftwo}
+  {\expandafter\@firstofone}
+  {\expandafter\@gobble}
 {% = for pLaTeX2e 2017/07/29 or newer
 % first, provide old definition; there are some known incompatibility
 % compared to LaTeX, pLaTeX or array
@@ -59,9 +56,6 @@
   \fi
 \fi
 }% =
-{% = for pLaTeX2e 2017/05/05 or older
-% nothing to be done
-}% =
 %
 %% done
 

Modified: trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty	2018-09-21 21:06:46 UTC (rev 48722)
@@ -9,24 +9,30 @@
 %   * array.sty in latex-tools
 %     (2016/10/06 v2.4d -- 2018/09/13 v2.4i)
 %   * plext.sty in platex
-%     (2001/09/26 v1.2  -- 2018/09/09 v1.2i)
+%     (2001/09/26 v1.2  -- 2018/09/20 v1.2j)
 % Largely based on lltjext.sty from LuaTeX-ja project.
 %
 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{plextarray}
-  [2018/09/18 v1.1b Tabular extension package for plext and array]
+  [2018/09/20 v1.1c Tabular extension package for plext and array]
 \RequirePackage{plext}
 \RequirePackage{plarray}
 
 %% save definitions from array.sty
+%  the <dir> option will be handled later in \@tabarray
 \def\array{\col at sep\arraycolsep
   \def\d at llarbegin{$}\let\d at llarend\d at llarbegin\def\@halignto{}%
   \@tabarray}
 \def\tabular{\def\@halignto{}\@tabular}
-\expandafter\def\csname tabular*\endcsname#1{%
-       \setlength\dimen@{#1}%
-       \edef\@halignto{to\the\dimen@}\@tabular}
+%% merged definitions from array.sty and plext.sty
+%  take <dir> option first as in plext.sty,
+%  which will be passed to \@tabarray
+\@namedef{tabular*}{\@ifnextchar<%>
+   {\p at stabular}{\p at stabular<Z>}}
+\def\p at stabular<#1>#2{%
+   \setlength\dimen@{#2}%
+   \edef\@halignto{to\the\dimen@}\@tabular<#1>}
 
 %% patching internal code for array.sty and plext.sty
 %

Modified: trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty	2018-09-21 21:06:46 UTC (rev 48722)
@@ -9,7 +9,7 @@
 %   * delarray.sty in latex-tools
 %     (2014/10/28 v1.01)
 %   * plext.sty in platex
-%     (2001/09/26 v1.2  -- 2018/09/09 v1.2i)
+%     (2001/09/26 v1.2  -- 2018/09/20 v1.2j)
 %
 
 \NeedsTeXFormat{pLaTeX2e}

Modified: trunk/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty	2018-09-21 21:06:30 UTC (rev 48721)
+++ trunk/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty	2018-09-21 21:06:46 UTC (rev 48722)
@@ -1,17 +1,19 @@
 %
 % pxatbegshi.sty
-% based on H. Kitagawa's code on GitHub:texjporg/tex-jp-build#21
-% and modified by Hironobu Yamashita
+% written by Hironobu Yamashita (@aminophen)
 %
-% This package is distributed as part of the platex-tools bundle
-% maintained by Hironobu Yamashita
+% This package is part of the platex-tools bundle.
 % https://github.com/aminophen/platex-tools
 %
+% Largely based on bxpapersize.sty by T. Yato.
+% Previous versions were largely based on H. Kitagawa's
+% code on GitHub:texjporg/tex-jp-build#21.
+%
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{pxatbegshi}
-    [2017/11/04 v0.2 Patch to atbegshi for (u)pLaTeX]
+    [2018/09/21 v0.4 Patch to atbegshi for (u)pLaTeX]
 
 %% preparations
 \def\pxabgs at pkgname{pxatbegshi}
@@ -43,34 +45,56 @@
 
 %---------------------------------------
 
-% concept: execute all hooks inside yoko direction \vbox
-
+%% patch \AtBegShi at Output
+%  concept: execute all hooks in temporary yoko direction,
+%  by prepending \yoko and switching back to the original
+%
 % prepare
 \let\pxabgs at AtBegShi@Output\AtBegShi at Output
-% try first patch
+% first, check hooks inserted by bxpapersize.sty
+% -> if detected, nothing to do
 \pxabgs at patch@cmd\pxabgs at AtBegShi@Output
-  {\let\AtBegShi at OrgProtect\protect}%
-  {\setbox8\vbox\bgroup\yoko\let\AtBegShi at OrgProtect\protect}
-\ifx\pxabgs at fragment\relax % failure
-  \let\pxabgs at AtBegShi@Output\relax
-\else % success, try second patch
+  {\bxpr at ABS@prehook}{\bxpr at ABS@prehook}%
+\ifx\pxabgs at fragment\relax\else % found
   \pxabgs at patch@cmd\pxabgs at AtBegShi@Output
-    {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox}%
-    {\AtBeginShipoutOriginalShipout\box\AtBeginShipoutBox\egroup}
-  \ifx\pxabgs at fragment\relax % failure
+    {\bxpr at ABS@posthook}{\bxpr at ABS@posthook}%
+  \ifx\pxabgs at fragment\relax\else % found
     \let\pxabgs at AtBegShi@Output\relax
   \fi
 \fi
-% commit the change only when successful
-\ifx\pxabgs at AtBegShi@Output\relax
-  \pxabgs at warn{Failed in patching \string\AtBegShi at Output}
-\else
+% -> if not detected, prepend/append hooks
+\ifx\pxabgs at AtBegShi@Output\relax\else
+  \expandafter\def\expandafter\pxabgs at AtBegShi@Output\expandafter{%
+    \expandafter\pxabgs at ABS@prehook
+    \pxabgs at AtBegShi@Output
+    \pxabgs at ABS@posthook
+  }
+  % adjust for atbegshi.sty on non-e-TeX ...
+  % (for e-TeX, this patch should fail but does nothing!)
+  \pxabgs at patch@cmd\pxabgs at AtBegShi@Output
+    {\pxabgs at ABS@prehook\egroup\endgroup}
+    {\egroup\endgroup\pxabgs at ABS@prehook}%
+  % commit the change
   \global\let\AtBegShi at Output\pxabgs at AtBegShi@Output
 \fi
+%
+%% done
 
+%--------------------------------------- done
+
 \endgroup
 %% internal macros are no longer effective
 
-%--------------------------------------- done
+%% hooks
+\let\pxabgs at restore@dir\relax
+\def\pxabgs at ABS@prehook{%
+  \iftdir
+    \yoko
+    \let\pxabgs at restore@dir\tate
+  \else
+    \let\pxabgs at restore@dir\relax
+  \fi}
+\def\pxabgs at ABS@posthook{\pxabgs at restore@dir}
+
 \endinput
 %% EOF

More information about the tex-live-commits mailing list