From a4a76e83143e53a7a889c2a18d2d4f82ae48f259 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 2 Jan 2017 23:50:18 +0000 Subject: platex-tools (28dec16) git-svn-id: svn://tug.org/texlive/trunk@42842 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/platex-tools/README.md | 7 ++- .../doc/latex/platex-tools/bounddvi-en.pdf | Bin 34295 -> 43162 bytes .../doc/latex/platex-tools/bounddvi-en.tex | 48 +++++++++++++-------- .../texmf-dist/doc/latex/platex-tools/bounddvi.pdf | Bin 96915 -> 117117 bytes .../texmf-dist/doc/latex/platex-tools/bounddvi.tex | 45 +++++++++++++------ .../doc/latex/platex-tools/pxeverysel.pdf | Bin 46194 -> 47098 bytes .../doc/latex/platex-tools/pxeverysel.tex | 2 +- .../texmf-dist/tex/latex/platex-tools/bounddvi.sty | 14 +++--- .../tex/latex/platex-tools/pxeverysel.sty | 11 +++-- 9 files changed, 80 insertions(+), 47 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/platex-tools/README.md b/Master/texmf-dist/doc/latex/platex-tools/README.md index c288ed09f53..8ef255ed19c 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/README.md +++ b/Master/texmf-dist/doc/latex/platex-tools/README.md @@ -57,7 +57,10 @@ All the document files (.tex) are encoded in UTF-8. ## Repository The bundle is maintained on GitHub: -https://github.com/aminophen/platex-tools + https://github.com/aminophen/platex-tools + +You can also obtain this bundle from CTAN: + https://www.ctan.org/pkg/platex-tools ## License @@ -66,6 +69,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2016-10-25 +2016-12-28 Hironobu Yamashita diff --git a/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.pdf b/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.pdf index d4945baacee..395a6f30551 100644 Binary files a/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.pdf and b/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.pdf differ diff --git a/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.tex b/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.tex index 4899a087808..2e40b3ad0c4 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.tex +++ b/Master/texmf-dist/doc/latex/platex-tools/bounddvi-en.tex @@ -44,22 +44,35 @@ Process the \texttt{.tex} file using \texttt{latex} + \begin{enumerate} \item The compatibility with \textsf{geometry} package may not be -perfect. When \texttt{dvips} is used, the specification which -appears \emph{first} in DVI takes effect. On the other hand, -when \texttt{dvipdfmx} is used, the specification which appears -\emph{at last} in DVI takes effect. For this reason, +perfect, as both \textsf{geometry} and \textsf{bounddvi} embeds +papersize special into a DVI file. The loading order of these +two packages may affect the actual size of output. +\item This package supports ``\textsf{jsclasses}-like employment'' +of \verb+\mag+, because it's more widely used in Japan. This may +be incompatible with some classes or packages which employ +\verb+\mag+ in other ways. +\end{enumerate} +The details are described in the sections below. + +\subsection*{The behavior of multiple papersize specials} + +Sometimes multiple papersize specials may be embedded into a DVI +file. Among these specials, the specification which appears +\emph{at last} in DVI takes effect when \texttt{dvipdfmx} or +\texttt{dvips} (\TeX\ Live 2017 or later) is used\footnote{% +When \texttt{dvips} in \TeX\ Live 2016 or earlier is used, +the specification which appears \emph{first} in DVI took effect, +but the default behavior was changed in \TeX\ Live r42420 to +be compatible with \texttt{dvipdfmx}. The new option \texttt{-L0} +can be used to recover the old behavior.}. For example, when the +following source is processed with \texttt{dvipdfmx}, \begin{verbatim} % latex + dvipdfmx \documentclass{...} \usepackage{bounddvi} \usepackage[dvipdfm]{geometry} \end{verbatim} -can sometimes fail to set proper paper size. -\item This package supports ``\textsf{jsclasses}-like employment'' -of \verb+\mag+, because it's more widely used in Japan. This may -be incompatible with some classes or packages which employ -\verb+\mag+ in other ways (see descriptions below). -\end{enumerate} +the specification by \textsf{geometry} wins. \section*{Note about \texttt{\char92mag} handling} @@ -68,8 +81,8 @@ in terms of \verb+\mag+ employment. It seems that there is no (official or practical) ``standard'' in \verb+\mag+ treatment. When the output is going to the physical size of A4 -($210\,\mathrm{mm} \times 297\,\mathrm{mm}$), -there are two ways: some classes/packages can set +($210\,\mathrm{mm} \times 297\,\mathrm{mm}$) with the setting of +\verb+\mag=2000+, there are two ways: some classes/packages can set \begin{quote} \texttt{\char92mag=2000}\\ \texttt{\char92paperwidth=210mm} ($= 420\,\mathrm{truemm}$)\\ @@ -107,13 +120,14 @@ using \textsf{bounddvi} package. \begin{itemize} \item 2002/03/10 v1.0 (KI) First version - \item 2002/10/30 v2.0 (KI) Add dvipdfm pdf:pagesize special - \item 2003/03/22 v3.2 (KI) Compatibility with hyperref + \item 2002/10/30 v2.0 (KI) Add \texttt{dvipdfm} \texttt{pdf:pagesize} special + \item 2003/03/22 v3.2 (KI) Compatibility with \textsf{hyperref} \item 2004/05/08 v4.0 (KI) Support for $\mathtt{\char92mag} \ne 1000$ - \item 2004/12/08 v5.2 (KI) Compatibility with geometry - \item 2004/12/15 v6.0 (KI) Not to use dvipdfm(x) pdf:pagesize special + \item 2004/12/08 v5.2 (KI) Compatibility with \textsf{geometry} + \item 2004/12/15 v6.0 (KI) Not to use \texttt{dvipdfm(x)} \texttt{pdf:pagesize special} \item 2016/10/25 v7.1 (HY) Support for p\LaTeXe\ tombow option, - compatibility with graphics/color packages + compatibility with \textsf{graphics}/\textsf{color} packages + \item 2016/12/28 v7.2 (HY) Documentation for the new \texttt{dvips} behavior \end{itemize} \end{document} diff --git a/Master/texmf-dist/doc/latex/platex-tools/bounddvi.pdf b/Master/texmf-dist/doc/latex/platex-tools/bounddvi.pdf index 5c7f574c519..9170bfdc12b 100644 Binary files a/Master/texmf-dist/doc/latex/platex-tools/bounddvi.pdf and b/Master/texmf-dist/doc/latex/platex-tools/bounddvi.pdf differ diff --git a/Master/texmf-dist/doc/latex/platex-tools/bounddvi.tex b/Master/texmf-dist/doc/latex/platex-tools/bounddvi.tex index 63afed712d4..5b811e2b197 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/bounddvi.tex +++ b/Master/texmf-dist/doc/latex/platex-tools/bounddvi.tex @@ -21,11 +21,11 @@ DVIファイルは用紙サイズ情報を含みませんが、PostScriptやPDF 用紙サイズを規定するフォーマットへ変換するプログラム(\texttt{dvips}や \texttt{dvipdfmx})は、\verb+\special+命令によってDVIファイルに埋め込ま れた用紙サイズ情報を解釈します。 -% たとえば、幅100mm、高さ200mmの用紙に出力したい場合は -%\begin{verbatim} -% \special{papersize=100mm,200mm} -%\end{verbatim} -% のように指定してやることができます。 +たとえば、幅100mm、高さ200mmの用紙に出力したい場合は +\begin{verbatim} + \special{papersize=100mm,200mm} +\end{verbatim} +のように指定してやることができます。 \textsf{bounddvi}パッケージは、クラスファイルなどが想定している用紙 サイズ情報(\verb+\paperwidth+, \verb+\paperheight+)をDVIファイルに @@ -73,21 +73,24 @@ DVIファイルは用紙サイズ情報を含みませんが、PostScriptやPDF うまくいく可能性があります(付録を参照)。 \end{itemize} -\section*{付録:\texttt{dvips}と\texttt{dvipdfmx}の違い} +\section*{付録:複数の用紙サイズ指定が発行された場合の挙動} 一つのDVIファイルに複数の用紙サイズ指定\verb+\special+命令が -埋め込まれる場合があります。このうち、\texttt{dvips}ではDVIファイル -の\emph{最初}に指定されたものが有効になります。 -逆に\texttt{dvipdfmx}では、DVIファイルの\emph{最後}に指定されたもの -が有効になります。このため、たとえば\textsf{bounddvi}と +埋め込まれる場合があります。このうち、\texttt{dvipdfmx}および +\TeX\ Live 2017以降の\texttt{dvips}では、DVIファイルの\emph{最後}に +指定されたものが有効になります\footnote{\TeX\ Live 2016以前の +\texttt{dvips}では、DVIファイルの\emph{最初}に指定されたものが有効 +でしたが、\TeX\ Live r42420で挙動が変更されました。\texttt{-L0}オプ +ションを指定すると従来の挙動に戻ります。}。たとえば\textsf{bounddvi}と \textsf{geometry}を併用したソース \begin{verbatim} \documentclass{...} \usepackage{bounddvi} \usepackage[dvipdfm]{geometry} \end{verbatim} -を\textsf{dvipdfmx}でPDFに変換すると、用紙サイズの設定が正しくなさ -れない可能性があります。 +を\textsf{dvipdfmx}でPDFに変換すると、\textsf{geometry}パッケージの +指定が優先されます。このとき、用紙サイズの設定が正しいかどうかは +\textsf{geometry}パッケージに依存します。 \section*{付録:\texttt{\char92mag}の扱いについて} @@ -96,8 +99,8 @@ DVIファイルは用紙サイズ情報を含みませんが、PostScriptやPDF しかし、\verb+\mag+の使い方はCTANにある多様なパッケージの中で統一 されておらず、大きく分けて二通りの使い方があるようです。 -たとえば、物理的なA4サイズ($210\,\mathrm{mm}\times297\,\mathrm{mm}$) -の出力を得たい場合 +たとえば、版面を2倍に拡大 (\verb+\mag=2000+) して物理的なA4サイズ +($210\,\mathrm{mm}\times297\,\mathrm{mm}$)の出力を得たい場合 \begin{quote} \texttt{\char92mag=2000}\\ \texttt{\char92paperwidth=210mm} ($= 420\,\mathrm{truemm}$)\\ @@ -126,4 +129,18 @@ DVIファイルは用紙サイズ情報を含みませんが、PostScriptやPDF \texttt{https://www.ma.ns.tcu.ac.jp/Pages/TeX/bounddvi.sty.html} \end{itemize} +\section*{変更履歴} + +\begin{itemize} + \item 2002/03/10 v1.0 (KI) 最初の公開版 + \item 2002/10/30 v2.0 (KI) \texttt{dvipdfm}の\texttt{pdf:pagesize special}を使用 + \item 2003/03/22 v3.2 (KI) \textsf{hyperref}との互換性を改良 + \item 2004/05/08 v4.0 (KI) $\mathtt{\char92mag} \ne 1000$に対応 + \item 2004/12/08 v5.2 (KI) \texttt{dvips}で\textsf{geometry}との互換性を改良 + \item 2004/12/15 v6.0 (KI) \texttt{dvipdfm(x)}の\texttt{pdf:pagesize special}を不使用に + \item 2016/10/25 v7.1 (HY) p\LaTeXe{}のトンボサポート、 + 2016年の新しい\textsf{graphics}/\textsf{color}に対応 + \item 2016/12/28 v7.2 (HY) 新仕様の\texttt{dvips}をドキュメント化 +\end{itemize} + \end{document} diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf index 5cfd02f0e5f..1497538baa6 100644 Binary files a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf and b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf differ diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex index e2d766e09d7..a2f268a6bc5 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex +++ b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex @@ -8,7 +8,7 @@ \usepackage{pxeverysel} \GetFileInfo{pxeverysel.sty} \title{Package \textsf{pxeverysel} \fileversion} -\author{Takayuki Yato} +\author{Takayuki Yato \& Hironobu Yamashita} \date{\filedate} \begin{document} diff --git a/Master/texmf-dist/tex/latex/platex-tools/bounddvi.sty b/Master/texmf-dist/tex/latex/platex-tools/bounddvi.sty index 7e207da447e..08691106b3e 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/bounddvi.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/bounddvi.sty @@ -1,6 +1,6 @@ % % bounddvi.sty -% 2016/10/25 v7.0-v7.1 h.y.acetaminophen@gmail.com +% 2016/12/28 v7.2-v7.0 h.y.acetaminophen@gmail.com % 2004/12/15 v6.0-v1.0 inoue@ma.ns.tcu.ac.jp % % This package, originally written by Koichi Inoue @@ -10,7 +10,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bounddvi}[2016/10/25 v7.1 bounddvi] +\ProvidesPackage{bounddvi}[2016/12/28 v7.2 bounddvi] % catcode trick to hide \iftombow ... \else ... \fi % since \iftombow is defined only in pLaTeX. @@ -53,7 +53,8 @@ Q \fi % following code is almost equivalent to % \AtBeginDocument{\AtBeginDvi{...}} % however, we append the specification to the _beginning_ of -% \@begindocumenthook; this ensures proper papersize on dvips. +% \@begindocumenthook; this ensures proper papersize when +% dvips (TeX Live 2016 or earlier) is used. \begingroup \def\@prependto@begindocumenthook{\global\setbox\@begindvibox \vbox{\csname yoko\endcsname\unvbox\@begindvibox @@ -76,10 +77,9 @@ Q \fi {\expandafter\@prependto@begindocumenthook\@begindocumenthook} \xdef\@begindocumenthook{\the\toks@} % append papersize special again to the _end_ of the -% current \@begindocumenthook; this will be meaningful when -% geometry is loaded before bounddvi and dvipdfm(x) is used. -% (geometry adds \AtBeginDocument{\AtBeginDvi{...}}, but -% `sandwich' specification can inactivate the effect of geometry) +% current \@begindocumenthook; this will be meaningful e.g. when +% geometry is loaded before bounddvi. +% (geometry adds \AtBeginDocument{\AtBeginDvi{...}} specification) \expandafter\g@addto@macro\expandafter\@begindocumenthook \expandafter{\@prependto@begindocumenthook} \endgroup diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty index c73a8c4b657..b2cc13f916b 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty @@ -12,12 +12,10 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxeverysel} - [2016/09/09 v0.4 Patch to everysel for (u)pLaTeX] + [2016/12/28 v0.5 Patch to everysel for (u)pLaTeX] -%% if ctex classes/packages are already loaded, exit silently -\ifdefined\CTEXoptions % defined at least CTeX 2007/05/06 - \expandafter\endinput -\fi +%% previous code for ctex support has been removed in v0.5, +%% as ctex has depended on pxeverysel since 2016/12/27 v2.4.7 %% preparations \def\pxys@pkgname{pxeverysel} @@ -89,7 +87,7 @@ \pxys@patch@cmd\pxys@selectfont {\pickup@font\font@name}{\size@update\pxys@term}% % plfonts/ptrace {\pickup@font\font@name\pxys@self@hook\pxys@everysel@hook - \size@update\enc@update}% + \size@update}% \ifx\pxys@fragment\relax \let\pxys@selectfont\pxys@org@selectfont % extract "pre-\enc@update" insertion @@ -107,6 +105,7 @@ \fi \let\pxys@new@selectfont\pxys@selectfont % prepare for everysel routine + \let\pxys@CheckCommand\CheckCommand \let\CheckCommand\@gobble % hack for disabling duplicate font info \expandafter\let\expandafter\pxys@ver@tracefnt -- cgit v1.2.3