gentombow (21aug18)

git-svn-id: svn://tug.org/texlive/trunk@48449 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 21 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/gentombow/README.md b/Master/texmf-dist/doc/latex/gentombow/README.md
index b7feff9c7f3..babf2da6f55 100644
--- a/Master/texmf-dist/doc/latex/gentombow/README.md
+++ b/Master/texmf-dist/doc/latex/gentombow/README.md
@@ -44,6 +44,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2018-05-17
+2018-08-20
 
 Hironobu Yamashita
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
index 9ecee0217b8..f2a5eeb2ce6 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
index 2ee1299f156..2e9ab803182 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex
@@ -430,9 +430,11 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以�
                         （\verb+\settombowbanner+,
                           \verb+\settombowbannerfont+,
                           \verb+\settombowwidth+の各命令）
-  \item 2018/03/16 v0.9g \textsf{gentombow}に\textsf{pxgentombow}を統合、
+  \item 2018/05/17 v0.9g \textsf{gentombow}に\textsf{pxgentombow}を統合、
                          \verb+pdfbox+オプションの追加、
                          \verb+\settombowbleed+, \verb+\settombowcolor+の追加
+  \item 2018/08/20 v0.9h 用紙サイズ検出に\texttt{hagaki}を追加、
+                         \textsf{pdfpages}対策の改良
 \end{itemize}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf b/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
index 81cf32523e7..231c356f4d4 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf
diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
index 5e0339de438..73745059211 100644
--- a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
+++ b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex
@@ -287,6 +287,8 @@ or \verb+\topmargin+, or leave it to \textsf{geometry} package.
   \item 2018/05/17 v0.9g Add \verb+pdfbox+ option,
                          \verb+\settombowbleed+ and
                          \verb+\settombowcolor+.
+  \item 2018/08/20 v0.9h Add \texttt{hagaki} size for paper detection,
+                         improve patches for \textsf{pdfpages}.
 \end{itemize}
 
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/gentombow/gentombow.sty b/Master/texmf-dist/tex/latex/gentombow/gentombow.sty
index c8fe79d0849..94f84d3cac7 100644
--- a/Master/texmf-dist/tex/latex/gentombow/gentombow.sty
+++ b/Master/texmf-dist/tex/latex/gentombow/gentombow.sty
@@ -8,7 +8,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gentombow}
-    [2018/05/17 v0.9g Generate crop mark 'tombow']
+    [2018/08/20 v0.9h Generate crop mark 'tombow']
 \def\pxgtmb@pkgname{gentombow}
 \@namedef{ver@pxgentombow.sty}{}% fake
 
@@ -18,7 +18,7 @@
 %% supported engines
 % case 2: pdfLaTeX etc.
 % case 1: pLaTeX2e <2018-04-01>+2 or older
-% case 0: newer pLaTeX2e
+% case 0: pLaTeX2e <2018-05-20> or newer
 \ifx\pfmtversion\@undefined
   \@ifpackageloaded{luatexja}{}{\chardef\pxgtmb@errlevel=\tw@}
 \fi
@@ -430,6 +430,7 @@
 \pxgtmb@addpapersize[a3]{letter}{8.5in}{11in}
 \pxgtmb@addpapersize[a3]{legal}{8.5in}{14in}
 \pxgtmb@addpapersize[a4]{executive}{7.25in}{10.5in}
+\pxgtmb@addpapersize[a5]{hagaki}{100mm}{148mm}
 
 %% package options part 4
 \def\pxgtmb@pdfbox@status{0}
@@ -664,6 +665,10 @@
 
 %% patch internal for pdfpages to work with tombow
 %% (tested on pdfpages 2017/10/31 v0.5l)
+%% Note the code is the same as that of pxpdfpages.sty,
+%% but reserved here since gentombow.sty can be used on
+%% any LaTeX format
+%% (cf. pxpdfpages.sty is restricted to (u)pLaTeX)
 \def\pxgtmb@patch@pdfpages{%
   \RequirePackage{etoolbox}
   \patchcmd{\AM@output}{%
@@ -679,7 +684,14 @@
   }
   {\PackageInfo{\pxgtmb@pkgname}{Patch for pdfpages applied}}
   {\PackageWarningNoLine{\pxgtmb@pkgname}{Patch for pdfpages failed}}%
-  }
+}
+%% however, if running (u)pLaTeX, use pxpdfpages.sty if available
+\ifx\pfmtname\@undefined\else
+  \IfFileExists{pxpdfpages.sty}{%
+    \def\pxgtmb@patch@pdfpages{\RequirePackage{pxpdfpages}}%
+  }{}
+\fi
+%% do it
 \AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb@patch@pdfpages}{}}
 
 \endinput