From 0b3d9db604000b68a210e43cff73d6a7b61b8fc0 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Jul 2019 20:51:18 +0000 Subject: gentombow (21jul19) git-svn-id: svn://tug.org/texlive/trunk@51697 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/gentombow/LICENSE | 2 +- Master/texmf-dist/doc/latex/gentombow/Makefile | 36 ------------------ Master/texmf-dist/doc/latex/gentombow/README.md | 2 +- .../doc/latex/gentombow/gentombow-ja.pdf | Bin 204758 -> 212291 bytes .../doc/latex/gentombow/gentombow-ja.tex | 4 ++ .../texmf-dist/doc/latex/gentombow/gentombow.pdf | Bin 145506 -> 145247 bytes .../texmf-dist/doc/latex/gentombow/gentombow.tex | 4 ++ Master/texmf-dist/source/latex/gentombow/Makefile | 36 ++++++++++++++++++ .../texmf-dist/tex/latex/gentombow/gentombow.sty | 42 ++++++++++++++++----- 9 files changed, 78 insertions(+), 48 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/gentombow/Makefile create mode 100644 Master/texmf-dist/source/latex/gentombow/Makefile (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/gentombow/LICENSE b/Master/texmf-dist/doc/latex/gentombow/LICENSE index 99a0c323d19..c463b620a91 100644 --- a/Master/texmf-dist/doc/latex/gentombow/LICENSE +++ b/Master/texmf-dist/doc/latex/gentombow/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2018 Hironobu Yamashita +Copyright (c) 2016-2019 Hironobu Yamashita All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/latex/gentombow/Makefile b/Master/texmf-dist/doc/latex/gentombow/Makefile deleted file mode 100644 index f376d1ade0b..00000000000 --- a/Master/texmf-dist/doc/latex/gentombow/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -KANJI = -kanji=utf8 -FONTMAP = -f ipaex.map -f ptex-ipaex.map -TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) - -all: bounddvi.pdf bounddvi-en.pdf \ - gentombow.pdf gentombow-ja.pdf #pxgentombow.pdf - -.SUFFIXES: .tex .dvi .pdf -.tex.dvi: - platex $(KANJI) $< - platex $(KANJI) $< - rm *.aux *.log -.dvi.pdf: - dvipdfmx $(FONTMAP) $< - -bounddvi-en.dvi: bounddvi-en.tex - latex $< - latex $< - rm *.aux *.log -gentombow.pdf: gentombow.tex - pdflatex $< - pdflatex $< - rm *.aux *.log - -.PHONY: install clean -install: - mkdir -p ${TEXMF}/doc/latex/gentombow - cp ./Makefile ${TEXMF}/doc/latex/gentombow/ - cp ./LICENSE ${TEXMF}/doc/latex/gentombow/ - cp ./README.md ${TEXMF}/doc/latex/gentombow/ - cp ./*.pdf ${TEXMF}/doc/latex/gentombow/ - cp ./*.tex ${TEXMF}/doc/latex/gentombow/ - mkdir -p ${TEXMF}/tex/latex/gentombow - cp ./*.sty ${TEXMF}/tex/latex/gentombow/ -clean: - rm -f *.dvi *.pdf diff --git a/Master/texmf-dist/doc/latex/gentombow/README.md b/Master/texmf-dist/doc/latex/gentombow/README.md index b9f5aad6a77..82fc0584d5f 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-08-30 +2019-07-21 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 39b9af65aae..7d26cf32e71 100644 Binary files a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf and b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf differ diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex index d3135878c79..ce0d6e767e1 100644 --- a/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex +++ b/Master/texmf-dist/doc/latex/gentombow/gentombow-ja.tex @@ -291,6 +291,9 @@ CMYKの版ごとにトンボを作成する場合や、特色のトンボが必 \item \verb+/BleedBox+: 裁ち落とし領域を含んだサイズ。 \item \verb+/CropBox+, \verb+/ArtBox+: 明示しない。 \end{itemize} +注意：\textsf{pdfx}パッケージがPDF/Xモードで読み込まれていれば、 +このオプション機能は自動的に有効化されます。 +また、\verb+/CropBox+も明示します。 \section{その他の注意点} @@ -444,6 +447,7 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以 \verb+pdfbox+オプションが正常動作するように改良、 \verb+\settombowbleed+が\verb+/TrimBox+に反映されな かったバグの修正 + \item 2019/07/21 v0.9k \textsf{pdfx}パッケージとの整合性をとる改良 \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 0c0ea28b5d7..b346075d67b 100644 Binary files a/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf and b/Master/texmf-dist/doc/latex/gentombow/gentombow.pdf differ diff --git a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex index ed7c134f3bf..3f6a1ada649 100644 --- a/Master/texmf-dist/doc/latex/gentombow/gentombow.tex +++ b/Master/texmf-dist/doc/latex/gentombow/gentombow.tex @@ -252,6 +252,9 @@ The paper size (\verb+/MediaBox+) is also corrected. \item \verb+/BleedBox+: paper size plus bleed margin. \item \verb+/CropBox+ and \verb+/ArtBox+ are not set. \end{itemize} +Note: if the package \textsf{pdfx} is loaded with PDF/X mode, +this optional feature is automatically enabled. +Also, \verb+/CropBox+ is set explicitly. \section{Additional Notes} @@ -293,6 +296,7 @@ or \verb+\topmargin+, or leave it to \textsf{geometry} package. also with \verb+pdfbox+ option. Fix a bug that \verb+\settombowbleed+ is not considered by \verb+/TrimBox+. + \item 2019/07/21 v0.9k Support \textsf{pdfx} package. \end{itemize} \end{document} diff --git a/Master/texmf-dist/source/latex/gentombow/Makefile b/Master/texmf-dist/source/latex/gentombow/Makefile new file mode 100644 index 00000000000..f376d1ade0b --- /dev/null +++ b/Master/texmf-dist/source/latex/gentombow/Makefile @@ -0,0 +1,36 @@ +KANJI = -kanji=utf8 +FONTMAP = -f ipaex.map -f ptex-ipaex.map +TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) + +all: bounddvi.pdf bounddvi-en.pdf \ + gentombow.pdf gentombow-ja.pdf #pxgentombow.pdf + +.SUFFIXES: .tex .dvi .pdf +.tex.dvi: + platex $(KANJI) $< + platex $(KANJI) $< + rm *.aux *.log +.dvi.pdf: + dvipdfmx $(FONTMAP) $< + +bounddvi-en.dvi: bounddvi-en.tex + latex $< + latex $< + rm *.aux *.log +gentombow.pdf: gentombow.tex + pdflatex $< + pdflatex $< + rm *.aux *.log + +.PHONY: install clean +install: + mkdir -p ${TEXMF}/doc/latex/gentombow + cp ./Makefile ${TEXMF}/doc/latex/gentombow/ + cp ./LICENSE ${TEXMF}/doc/latex/gentombow/ + cp ./README.md ${TEXMF}/doc/latex/gentombow/ + cp ./*.pdf ${TEXMF}/doc/latex/gentombow/ + cp ./*.tex ${TEXMF}/doc/latex/gentombow/ + mkdir -p ${TEXMF}/tex/latex/gentombow + cp ./*.sty ${TEXMF}/tex/latex/gentombow/ +clean: + rm -f *.dvi *.pdf diff --git a/Master/texmf-dist/tex/latex/gentombow/gentombow.sty b/Master/texmf-dist/tex/latex/gentombow/gentombow.sty index 6433b6da9cb..396a8f3405b 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/08/30 v0.9j Generate crop mark 'tombow'] + [2019/07/21 v0.9k Generate crop mark 'tombow'] \def\pxgtmb@pkgname{gentombow} \@namedef{ver@pxgentombow.sty}{}% fake @@ -290,6 +290,7 @@ %% prepare flag \newif\ifpxgtmb@switch \pxgtmb@switchfalse \newif\ifpxgtmb@landscape \pxgtmb@landscapefalse +\newif\ifpxgtmb@pdfx@x \pxgtmb@pdfx@xfalse %% passed from class options %% should be declared first inside this package (least priority) @@ -507,7 +508,7 @@ %% pdf "digital tombo" (driver-dependent) % the box size calculation is delayed until \AtBeginDocument % to allow users to change \@tombowbleed in the preamble -\if 1\pxgtmb@pdfbox@status + % convert pt -> bp \def\pxgtmb@PDF@setbp#1#2{% \@tempdima=.996264#2\relax % 0.996264 = 72/72.27 (cf. 1in = 72.27pt = 72bp) @@ -521,8 +522,8 @@ \def\pxgtmb@magscale{1}% \fi % set pdf boxes in bp unit - %\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@x\stockwidth - %\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@y\stockheight + \pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@x\stockwidth + \pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@y\stockheight \pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@x{\dimexpr(\stockwidth-\paperwidth)/2}% \pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@y{\dimexpr(\stockheight-\paperheight)/2}% \pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ur@x{\dimexpr(\stockwidth+\paperwidth)/2}% @@ -532,8 +533,14 @@ \pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@x{\dimexpr(\stockwidth+\paperwidth)/2+\@tombowbleed}% \pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@y{\dimexpr(\stockheight+\paperheight)/2+\@tombowbleed}% \xdef\pxgtmb@PDF@CTM{% - %% CropBox: implicit (same as MediaBox, large paper size) - %/CropBox [0 0 \pxgtmb@PDF@crop@ur@x\space \pxgtmb@PDF@crop@ur@y] + %% CropBox: normally implicit (same as MediaBox, large paper size) + %% however, pdfx.sty in PDF/X mode sets /CropBox explicitly, so I need to override it! + \ifpxgtmb@pdfx@x + \noexpand\pxgtmb@PDF@begin + /CropBox [0 0 + \pxgtmb@PDF@crop@ur@x\space + \pxgtmb@PDF@crop@ur@y] \noexpand\pxgtmb@PDF@end + \fi %% BleedBox: explicit (final paper size + surrounding \@tombowbleed) \noexpand\pxgtmb@PDF@begin /BleedBox [\pxgtmb@PDF@bleed@ll@x\space @@ -547,9 +554,20 @@ \pxgtmb@PDF@trim@ur@x\space \pxgtmb@PDF@trim@ur@y] \noexpand\pxgtmb@PDF@end %% ArtBox: implicit + %% [Note] PDF/X requires /TrimBox or /ArtBox but not both! }% \endgroup } + +% do it +\AtBeginDocument{\pxgtmb@PDF@emit} +\def\pxgtmb@PDF@emit{% + % handle compatibility with pdfx.sty here; + % if pdfx.sty with PDF/X mode detected, force [pdfbox] option! + \pxgtmb@handle@pdfx + \ifpxgtmb@pdfx@x\def\pxgtmb@pdfbox@status{1}\fi + % start actual procedure for [pdfbox] option + \if 1\pxgtmb@pdfbox@status %% supported drivers: dvips, dvipdfmx, XeTeX, pdfTeX, LuaTeX \ifnum0\ifx\pdfvariable\@undefined\else\the\outputmode\fi=0\relax \ifnum0\ifx\pdfpageattr\@undefined\else\the\pdfoutput\fi=0\relax @@ -666,8 +684,7 @@ \def\pxgtmb@PDF@begin{}\def\pxgtmb@PDF@end{}% \edef\pxgtmb@PDF@CTM{{\pxgtmb@PDF@CTM}}% \expandafter\pdfpageattr\pxgtmb@PDF@CTM} -\fi -\else +\fi\else %% for LuaTeX \def\pxgtmb@driver{l} % force paper size @@ -679,7 +696,8 @@ \edef\pxgtmb@PDF@CTM{pageattr{\pxgtmb@PDF@CTM}}% \expandafter\pdfvariable\pxgtmb@PDF@CTM} \fi -\fi + \fi +} %% make visible tombow box according to the current status of %% \@bannerfont, \@bannertoken, \@tombowwidth & \@tombowbleed @@ -713,7 +731,7 @@ % because pdf boxes are calculated only inside \AtBeginDocument \@onlypreamble\settombowbleed -%% patch internal for pdfpages to work with tombow +%% patch internal of pdfpages.sty 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 @@ -744,4 +762,8 @@ %% do it \AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb@patch@pdfpages}{}} +%% patch pdfx.sty +%% (tested on pdfx 2019/02/27 v1.6.3) +\def\pxgtmb@handle@pdfx{\@ifpackageloaded{pdfx}{\let\ifpxgtmb@pdfx@x\ifpdfx@x}{}} + \endinput -- cgit v1.2.3